(gnus-use-backend-marks): Removed, since it duplicates gnus-propagate-marks.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4a64eb2..dd6a344 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2011-02-14  Lars Ingebrigtsen  <larsi@gnus.org>
 
+       * gnus-sum.el (gnus-propagate-marks): Default to nil.
+
+       * gnus-start.el (gnus-use-backend-marks): Removed, since it duplicates
+       (gnus-summary-exit): Ditto.gnus-propagate-marks.
+
        * gnus-sum.el (gnus-summary-exit-no-update): Restore the group conf
        before killing the buffers so that a non-full window conf gets handled
        correctly.

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index b8a6be8..b493a93 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -380,13 +380,6 @@ disc."
   :group 'gnus-newsrc
   :type 'boolean)
 
-(defcustom gnus-use-backend-marks nil
-  "If non-nil, Gnus will store and retrieve marks from the backends.
-This means that marks will be stored both in .newsrc.eld and in
-the backend, and will slow operation down somewhat."
-  :group 'gnus-newsrc
-  :type 'boolean)
-
 (defcustom gnus-check-bogus-groups-hook nil
   "A hook run after removing bogus groups."
   :group 'gnus-start-server
@@ -1509,7 +1502,7 @@ If SCAN, request a scan of that group as well."
       (gnus-activate-group (gnus-info-group info) nil t))
 
     ;; Allow backends to update marks,
-    (when gnus-use-backend-marks
+    (when gnus-propagate-marks
       (let ((method (inline (gnus-find-method-for-group
                             (gnus-info-group info)))))
        (when (gnus-check-backend-function 'request-marks (car method))

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 5cda693..af1cd66 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1234,9 +1234,11 @@ 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 "23.1" ;; No Gnus
+(defcustom gnus-propagate-marks nil
+  "If non-nil, Gnus will store and retrieve marks from the backends.
+This means that marks will be stored both in .newsrc.eld and in
+the backend, and will slow operation down somewhat."
+  :version "24.1"
   :type 'boolean
   :group 'gnus-summary-marks)