# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1145262988 0
# Node ID 027c07dcdee5b8fb7727c4b4daa07fdea064b390
# Parent  cec61a0fff335f4cd58a358d00b1b9e80162ece0
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 -r cec61a0fff33 -r 027c07dcdee5 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Mon Apr 17 03:51:30 2006 +0000
+++ b/lisp/gnus/ChangeLog	Mon Apr 17 08:36:28 2006 +0000
@@ -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 -r cec61a0fff33 -r 027c07dcdee5 lisp/gnus/flow-fill.el
--- a/lisp/gnus/flow-fill.el	Mon Apr 17 03:51:30 2006 +0000
+++ b/lisp/gnus/flow-fill.el	Mon Apr 17 08:36:28 2006 +0000
@@ -114,7 +114,7 @@
     (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 -r cec61a0fff33 -r 027c07dcdee5 lisp/gnus/gnus-art.el
--- a/lisp/gnus/gnus-art.el	Mon Apr 17 03:51:30 2006 +0000
+++ b/lisp/gnus/gnus-art.el	Mon Apr 17 08:36:28 2006 +0000
@@ -3809,6 +3809,7 @@
   (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)