Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-230

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 53-55)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

2005-04-03  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-sum.el (gnus-summary-make-menu-bar): Fix an
   "unrecognised menu descriptor" error.

diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index a4acb8b92917f61944fc508ccb49bc0c1128774a..7160d26ef420c43a497ba4bafa8e7946866db0bf 100644 (file)
--- a/lisp/calendar/time-date.el
+++ b/lisp/calendar/time-date.el
@@ -1,5 +1,5 @@
-;;; time-date.el --- date and time handling functions
-;; Copyright (C) 1998, 1999, 2000, 2004, 2005 Free Software Foundation, Inc.
+;;; time-date.el --- Date and time handling functions
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;     Masanobu Umeda <umerin@mse.kyutech.ac.jp>

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index fe2fcab6643fc05567740fca1f6c439f406e652a..b19598eb3ab36eb2177105057da14af9d84e2f12 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-sum.el (gnus-summary-make-menu-bar): Fix an
+       "unrecognised menu descriptor" error.
+
 2005-03-25  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * message.el (message-resend): Bind rfc2047-encode-encoded-words.

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index ea8f7e063fe39e8e3bb0ad12e9b49e0ef956488f..8d6a5f951b5a708687b603b00b9a57677a8a396f 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -2250,7 +2250,7 @@ gnus-summary-show-article-from-menu-as-charset-%s" cs))))
               ,@(if (featurep 'xemacs) '(t)
                   '(:help "Generate and print a PostScript image"))])
             ("Copy, move,... (Backend)"
-             ,@(if (featurep 'xemacs) '(t)
+             ,@(if (featurep 'xemacs) nil
                  '(:help "Copying, moving, expiring articles..."))
              ["Respool article..." gnus-summary-respool-article t]
              ["Move article..." gnus-summary-move-article