Merge from gnus--devo--0

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

2 files changed, 20 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9f6b8d5aa32..3e0948a4aea 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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 --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 6b9f9c65f22..fd6ea06e8f8 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1208,6 +1208,12 @@ For example: ((1 . cn-gb-2312) (2 . big5))."
   :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 @@ If REVERSE, save parts that do not match TYPE."
          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 @@ UNREAD is a sorted list."
         (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)