Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 221)

   - Update from CVS

2007-05-10  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-art.el (gnus-article-mode): Fix comment about displaying
   non-break space.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-749

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 89cfbc3cc7a3c9736cf769687b1e5107fcffa47d..e605ed51193f7d0a1a015e2cbd030d144a49c27f 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-10  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-art.el (gnus-article-mode): Fix comment about displaying
+       non-break space.
+
 2007-05-09  Didier Verna  <didier@xemacs.org>
 
        * gnus-diary.el, nndiary.el: Remove the description comment (nndiary is

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 6ae52b5eeddd83027acf4e203ebfb430a12ca60b..013bf48110d102a0a26c1a9fbb5068b2d7f4f2d2 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -3925,7 +3925,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 "\ ".
+  ;; Prevent Emacs 22 from displaying non-break space with `nobreak-space'
+  ;; face.
   (set (make-local-variable 'nobreak-char-display) nil)
   (setq cursor-in-non-selected-windows nil)
   (gnus-set-default-directory)