Merge from gnus--devo--0

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

Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1141
f8a29505 · Miles Bader · 3eb20677 · f8a29505 · f8a29505
Commit f8a29505 authored May 04, 2008 by Miles Bader
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

lisp/gnus/ChangeLog lisp/gnus/ChangeLog +4 -0

lisp/gnus/gnus-sum.el lisp/gnus/gnus-sum.el +1 -1

No files found.
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
+2008-05-03  Reiner Steib  <reiner.steib@gmx.de>
+
+	* gnus-sum.el (gnus-propagate-marks): Fix custom version.
+
 2008-05-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>

 	* gnus-sum.el (gnus-summary-save-parts): Inhibit even more treatment

--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1210,7 +1210,7 @@ For example: ((1 . cn-gb-2312) (2 . big5))."

 (defcustom gnus-propagate-marks t
  "If non-nil, do not propagate marks to the backends."
-  :version "21.1"
+  :version "23.1" ;; No Gnus
  :type 'boolean
  :group 'gnus-summary-marks)