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

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 86)

   - Update from CVS

diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index b47839bad4a55cf95024309c4db18f0763147038..51af7d48d9c8e38068756fcc67334953f6e90b07 100644 (file)
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -1009,7 +1009,7 @@ Pre-defined symbols include `gnus-group-tool-bar-gnome' and
                 (const :tag "Retro look" gnus-group-tool-bar-retro)
                 (repeat :tag "User defined list" gmm-tool-bar-item)
                 (symbol))
-  :version "23.0" ;; No Gnus
+  :version "22.1" ;; Gnus 5.10.9
   :initialize 'custom-initialize-default
   :set 'gnus-group-tool-bar-update
   :group 'gnus-group)
@@ -1050,7 +1050,7 @@ Pre-defined symbols include `gnus-group-tool-bar-gnome' and
 
 See `gmm-tool-bar-from-list' for the format of the list."
   :type '(repeat gmm-tool-bar-item)
-  :version "23.0" ;; No Gnus
+  :version "22.1" ;; Gnus 5.10.9
   :initialize 'custom-initialize-default
   :set 'gnus-group-tool-bar-update
   :group 'gnus-group)
@@ -1069,7 +1069,7 @@ See `gmm-tool-bar-from-list' for the format of the list."
 
 See `gmm-tool-bar-from-list' for the format of the list."
   :type '(repeat gmm-tool-bar-item)
-  :version "23.0" ;; No Gnus
+  :version "22.1" ;; Gnus 5.10.9
   :initialize 'custom-initialize-default
   :set 'gnus-group-tool-bar-update
   :group 'gnus-group)
@@ -1080,7 +1080,7 @@ These items are not displayed in the Gnus group mode tool bar.
 
 See `gmm-tool-bar-from-list' for the format of the list."
   :type 'gmm-tool-bar-zap-list
-  :version "23.0" ;; No Gnus
+  :version "22.1" ;; Gnus 5.10.9
   :initialize 'custom-initialize-default
   :set 'gnus-group-tool-bar-update
   :group 'gnus-group)
@@ -1480,11 +1480,10 @@ if it is a string, only list groups matching REGEXP."
                seen))))))
 
 ;; Moving through the Group buffer (in topic mode) e.g. with C-n doesn't
-;; update the state (enabled/disabled) of the icon
-;; `gnus-group-describe-group'.  After `C-l' the state is correct.  See the
-;; following report on emacs-devel
+;; update the state (enabled/disabled) of the icon `gnus-group-describe-group'
+;; automatically.  After `C-l' the state is correct.  See the following report
+;; on emacs-devel
 ;; <http://thread.gmane.org/v9acdmrcse.fsf@marauder.physik.uni-ulm.de>:
-
 ;; From: Reiner Steib
 ;; Subject: tool bar icons not updated according to :active condition
 ;; Newsgroups: gmane.emacs.devel

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 9873c766758448779f5cab4fefdaf29a44f3dd25..0de73bc879abb19cbff478964bb39cc193634887 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -2576,7 +2576,7 @@ Pre-defined symbols include `gnus-summary-tool-bar-gnome' and
                 (const :tag "Retro look"  gnus-summary-tool-bar-retro)
                 (repeat :tag "User defined list" gmm-tool-bar-item)
                 (symbol))
-  :version "23.0" ;; No Gnus
+  :version "22.1" ;; Gnus 5.10.9
   :initialize 'custom-initialize-default
   :set 'gnus-summary-tool-bar-update
   :group 'gnus-summary)
@@ -2627,7 +2627,7 @@ Pre-defined symbols include `gnus-summary-tool-bar-gnome' and
 
 See `gmm-tool-bar-from-list' for the format of the list."
   :type '(repeat gmm-tool-bar-item)
-  :version "23.0" ;; No Gnus
+  :version "22.1" ;; Gnus 5.10.9
   :initialize 'custom-initialize-default
   :set 'gnus-summary-tool-bar-update
   :group 'gnus-summary)
@@ -2662,7 +2662,7 @@ See `gmm-tool-bar-from-list' for the format of the list."
 
 See `gmm-tool-bar-from-list' for the format of the list."
   :type '(repeat gmm-tool-bar-item)
-  :version "23.0" ;; No Gnus
+  :version "22.1" ;; Gnus 5.10.9
   :initialize 'custom-initialize-default
   :set 'gnus-summary-tool-bar-update
   :group 'gnus-summary)
@@ -2673,7 +2673,7 @@ These items are not displayed in the Gnus summary mode tool bar.
 
 See `gmm-tool-bar-from-list' for the format of the list."
   :type 'gmm-tool-bar-zap-list
-  :version "23.0" ;; No Gnus
+  :version "22.1" ;; Gnus 5.10.9
   :initialize 'custom-initialize-default
   :set 'gnus-summary-tool-bar-update
   :group 'gnus-summary)

diff --git a/man/ChangeLog b/man/ChangeLog
index a37d6fab7f848e6f099398b5155543b5cc83c629..b62d987dc5169b8e8ab1a9d51442c264c585f7b2 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-17  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus.texi (Emacsen): Don't support Emacs 20.7 and XEmacs 21.1.
+
 2006-04-17  Bill Wohler  <wohler@newt.com>
 
        * mh-e.texi (Folders): Updated mh-before-quit-hook and

diff --git a/man/gnus.texi b/man/gnus.texi
index c5857f40ab4026ac3e56f9e70a9f14bdc7fe83d7..75e6243ba5e8e23e9e588c482df7226e0c8bbd7b 100644 (file)
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -24870,16 +24870,17 @@ Gnus should work on:
 @itemize @bullet
 
 @item
-Emacs 20.7 and up.
+Emacs 21.1 and up.
 
 @item
-XEmacs 21.1 and up.
+XEmacs 21.4 and up.
 
 @end itemize
 
 This Gnus version will absolutely not work on any Emacsen older than
 that.  Not reliably, at least.  Older versions of Gnus may work on older
-Emacs versions.
+Emacs versions.  Particularly, Gnus 5.10.8 should also work on Emacs
+20.7 and XEmacs 21.1.
 
 There are some vague differences between Gnus on the various
 platforms---XEmacs features more graphics (a logo and a toolbar)---but