Merge from gnus--devo--0

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

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 965815ddb5ba83e2ff0ee924930822ff3a9747c6..b3c0544ab080681640d3835e3d278178eb8505f2 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -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 --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 91811b5d20e878ddefe656ff2b1203860cd10c3b..98df2c3bba60bb0cdb2863d25d10f74ed76ac31a 100644 (file)
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -10763,6 +10763,13 @@ buffers.  For example:
 @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 --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9f6b8d5aa3255121800393e15ec1ee3005336f07..3e0948a4aeaebcb640d1a0ff6359798931d6e714 100644 (file)
--- 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 6b9f9c65f2209157b233fc9c1e9f01be75ee0af1..fd6ea06e8f80eb42e94eba6a2f48f921fbe72c4d 100644 (file)
--- 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)