Mercurial > emacs
changeset 61260:ae865a366a88
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.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 04 Apr 2005 05:04:44 +0000 |
parents | 811e71c0ba12 |
children | 964fd9156409 |
files | lisp/calendar/time-date.el lisp/gnus/ChangeLog lisp/gnus/gnus-sum.el |
diffstat | 3 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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 <larsi@gnus.org> ;; Masanobu Umeda <umerin@mse.kyutech.ac.jp>
--- 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 <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.
--- 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