From: Miles Bader <miles@gnu.org>
Date: Mon, 4 Apr 2005 05:04:44 +0000 (+0000)
Subject: Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-230
X-Git-Tag: ttn-vms-21-2-B4~1252
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=707f2b38c093e253a23d55c713e0e1423abe1b09;p=emacs.git

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 a4acb8b9291..7160d26ef42 100644
--- 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 fe2fcab6643..b19598eb3ab 100644
--- 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 ea8f7e063fe..8d6a5f951b5 100644
--- 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