Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-31

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-61
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-82
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-13
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-14
   Merge from emacs--cvs-trunk--0

2005-01-30  Stefan Monnier  <monnier@iro.umontreal.ca>

   * lisp/gnus-art.el (gnus-article-mode): Turn off the "\ " non-break space.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2752f7d..d1237a4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -24,6 +24,10 @@
 
        * nntp.el (nntp-request-update-info): Always return nil.
 
+2005-01-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * gnus-art.el (gnus-article-mode): Turn off the "\ " non-break space.
+
 2005-01-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * message.el (message-beginning-of-line): Change the behavior when
@@ -37,8 +41,8 @@
 
 2005-01-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-       * gnus-art.el (gnus-article-prepare): Remove
-       message-strip-forbidden-properties from the local hook.
+       * gnus-art.el (gnus-article-prepare):
+       Remove message-strip-forbidden-properties from the local hook.
 
 2005-01-27  Simon Josefsson  <jas@extundo.com>
 
@@ -188,9 +192,9 @@
 
 2004-12-27  Simon Josefsson  <jas@extundo.com>
 
-       * mm-bodies.el (mm-body-encoding): Don't permit 7-bit to be used
-       when mm-use-ultra-safe-encoding is enabled (e.g., for PGP/MIME)
-       and we have trailing white space.  Reported by Werner Koch <wk@gnupg.org>.
+       * mm-bodies.el (mm-body-encoding): Don't permit 7-bit to be used when
+       mm-use-ultra-safe-encoding is enabled (e.g., for PGP/MIME) and we have
+       trailing white space.  Reported by Werner Koch <wk@gnupg.org>.
 
 2004-12-17  Kim F. Storm  <storm@cua.dk>
 

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 4068ae0..1965d55 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -3741,6 +3741,8 @@ commands:
   (make-local-variable 'gnus-article-image-alist)
   (make-local-variable 'gnus-article-charset)
   (make-local-variable 'gnus-article-ignored-charsets)
+  ;; Prevent recent Emacsen from displaying non-break space as "\ ".
+  (set (make-local-variable 'show-nonbreak-escape) nil)
   (gnus-set-default-directory)
   (buffer-disable-undo)
   (setq buffer-read-only t