# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1209730364 0
# Node ID 24dae001519e6659c724e932959ff65d5d9fa4e3
# Parent  a6cf032f251a90146b4dd55e0fe504577fec8a02
Merge from gnus--devo--0

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

diff -r a6cf032f251a -r 24dae001519e doc/misc/ChangeLog
--- a/doc/misc/ChangeLog	Fri May 02 09:54:25 2008 +0000
+++ b/doc/misc/ChangeLog	Fri May 02 12:12:44 2008 +0000
@@ -1,3 +1,8 @@
+2008-05-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus.texi (Various Summary Stuff): Add gnus-propagate-marks.
+	(Various Summary Stuff): Fix typo in last xref.
+
 2008-05-02  Juanma Barranquero  <lekktu@gmail.com>
 
 	* org.texi (Moving subtrees): Fix typo.
diff -r a6cf032f251a -r 24dae001519e doc/misc/gnus.texi
--- a/doc/misc/gnus.texi	Fri May 02 09:54:25 2008 +0000
+++ b/doc/misc/gnus.texi	Fri May 02 12:12:44 2008 +0000
@@ -10763,6 +10763,13 @@
 @end lisp
 
 Also @pxref{Group Parameters}.
+
+@vindex gnus-propagate-marks
+@item gnus-propagate-marks
+If non-@code{nil}, propagate marks to the backends for possible
+storing.  @xref{NNTP marks}, and friends, for a more fine-grained
+sieve.
+
 @end table
 
 
diff -r a6cf032f251a -r 24dae001519e lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Fri May 02 09:54:25 2008 +0000
+++ b/lisp/gnus/ChangeLog	Fri May 02 12:12:44 2008 +0000
@@ -1,3 +1,11 @@
+2008-05-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-sum.el (gnus-summary-save-parts): Inhibit even more treatment
+	hooks.
+	(gnus-update-read-articles): Speed up non-marks-using users.
+	(gnus-use-marks): Define gnus-use-marks.
+	(gnus-propagate-marks): Rename variable to something more sensible.
+
 2008-05-02  Juanma Barranquero  <lekktu@gmail.com>
 
 	* gmm-utils.el (gmm, gmm-verbose, gmm-lazy, gmm-customize-mode)
diff -r a6cf032f251a -r 24dae001519e lisp/gnus/gnus-sum.el
--- a/lisp/gnus/gnus-sum.el	Fri May 02 09:54:25 2008 +0000
+++ b/lisp/gnus/gnus-sum.el	Fri May 02 12:12:44 2008 +0000
@@ -1208,6 +1208,12 @@
   :type 'boolean
   :group 'gnus-summary-marks)
 
+(defcustom gnus-propagate-marks t
+  "If non-nil, do not propagate marks to the backends."
+  :version "21.1"
+  :type 'boolean
+  :group 'gnus-summary-marks)
+
 (defcustom gnus-alter-articles-to-read-function nil
   "Function to be called to alter the list of articles to be selected."
   :type '(choice (const nil) function)
@@ -11818,6 +11824,10 @@
 	 current-prefix-arg))
   (gnus-summary-iterate n
     (let ((gnus-display-mime-function nil)
+	  gnus-article-prepare-hook
+	  gnus-article-decode-hook
+	  gnus-display-mime-function
+	  gnus-break-pages
 	  (gnus-inhibit-treatment t))
       (gnus-summary-select-article))
     (with-current-buffer gnus-article-buffer
@@ -12151,7 +12161,8 @@
 	(save-excursion
 	  (let (setmarkundo)
 	    ;; Propagate the read marks to the backend.
-	    (when (gnus-check-backend-function 'request-set-mark group)
+	    (when (and gnus-propagate-marks
+		       (gnus-check-backend-function 'request-set-mark group))
 	      (let ((del (gnus-remove-from-range (gnus-info-read info) read))
 		    (add (gnus-remove-from-range read (gnus-info-read info))))
 		(when (or add del)