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

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 84-85)

   - Merge from emacs--devo--0
   - Update from CVS

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4a17525cac0843ae131f6a244ac46f94033e7aa5..991d91a11123ecb7063c2a881c407587de8a0fe7 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,13 @@
+2006-04-12  Ralf Angeli  <angeli@iwi.uni-sb.de>
+
+       * flow-fill.el (fill-flowed): Remove trailing space from blank
+       quoted lines.
+
+2006-04-12  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-art.el (gnus-article-mode): Set
+       cursor-in-non-selected-windows to nil.
+
 2006-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-mime-view-part-as-charset): Ignore charset

diff --git a/lisp/gnus/flow-fill.el b/lisp/gnus/flow-fill.el
index 98697439106ac0ba37b53c8c0e77ecc9e3896d8e..b47e9ba8365aa8f9e595aadf1c42217bffdb2931 100644 (file)
--- a/lisp/gnus/flow-fill.el
+++ b/lisp/gnus/flow-fill.el
@@ -114,7 +114,7 @@ RFC 2646 suggests 66 characters for readability."
     (set-buffer (or (current-buffer) buffer))
     (goto-char (point-min))
     ;; Remove space stuffing.
-    (while (re-search-forward "^ " nil t)
+    (while (re-search-forward "^\\( \\|>+ $\\)" nil t)
       (delete-char -1)
       (forward-line 1))
     (goto-char (point-min))

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index a4da4ae85f3ae004b429ad387211ae3e6897b445..7e3b843d500085a5a6a712da26311e23013d1a12 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -3809,6 +3809,7 @@ commands:
   (make-local-variable 'gnus-article-ignored-charsets)
   ;; Prevent recent Emacsen from displaying non-break space as "\ ".
   (set (make-local-variable 'nobreak-char-display) nil)
+  (setq cursor-in-non-selected-windows nil)
   (gnus-set-default-directory)
   (buffer-disable-undo)
   (setq buffer-read-only t)