# HG changeset patch # User Miles Bader # Date 1112591084 0 # Node ID ae865a366a88f1c7d95b34fd2b75e15027d4e151 # Parent 811e71c0ba12cf14b9419f7df0d95552fe8f944a 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 * lisp/gnus/gnus-sum.el (gnus-summary-make-menu-bar): Fix an "unrecognised menu descriptor" error. diff -r 811e71c0ba12 -r ae865a366a88 lisp/calendar/time-date.el --- a/lisp/calendar/time-date.el Mon Apr 04 04:55:09 2005 +0000 +++ b/lisp/calendar/time-date.el Mon Apr 04 05:04:44 2005 +0000 @@ -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 ;; Masanobu Umeda diff -r 811e71c0ba12 -r ae865a366a88 lisp/gnus/ChangeLog --- a/lisp/gnus/ChangeLog Mon Apr 04 04:55:09 2005 +0000 +++ b/lisp/gnus/ChangeLog Mon Apr 04 05:04:44 2005 +0000 @@ -1,3 +1,8 @@ +2005-04-03 Katsumi Yamaoka + + * gnus-sum.el (gnus-summary-make-menu-bar): Fix an + "unrecognised menu descriptor" error. + 2005-03-25 Katsumi Yamaoka * message.el (message-resend): Bind rfc2047-encode-encoded-words. diff -r 811e71c0ba12 -r ae865a366a88 lisp/gnus/gnus-sum.el --- a/lisp/gnus/gnus-sum.el Mon Apr 04 04:55:09 2005 +0000 +++ b/lisp/gnus/gnus-sum.el Mon Apr 04 05:04:44 2005 +0000 @@ -2250,7 +2250,7 @@ ,@(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