From: Miles Bader Date: Tue, 15 May 2007 07:11:09 +0000 (+0000) Subject: Merge from gnus--rel--5.10 X-Git-Tag: emacs-pretest-23.0.90~12674 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9fff44d50016108a350c90c39b68e302277080d7;p=emacs.git Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 221) - Update from CVS 2007-05-10 Reiner Steib * 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 89cfbc3cc7a..e605ed51193 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2007-05-10 Reiner Steib + + * gnus-art.el (gnus-article-mode): Fix comment about displaying + non-break space. + 2007-05-09 Didier Verna * 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 6ae52b5eedd..013bf48110d 100644 --- 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)