diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/menu-bar.el | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index aa3ea918e58..7f6b73be406 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2009-11-14 Glenn Morris <rgm@gnu.org> + * menu-bar.el (menu-bar-tools-menu): Read and send mail entries are not + constants. (Bug#4913) + * emacs-lisp/elint.el (elint-standard-variables): Doc fix. 2009-11-14 Shigeru Fukaya <shigeru.fukaya@gmail.com> diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index fbafd9077a0..21495b32f5d 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -1,7 +1,7 @@ ;;; menu-bar.el --- define a default menu bar -;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004, 2005, +;; 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ;; Author: RMS ;; Maintainer: FSF @@ -1283,12 +1283,14 @@ mail status in mode line")) (define-key menu-bar-tools-menu [directory-search] `(menu-item ,(purecopy "Directory Search") eudc-tools-menu)) (define-key menu-bar-tools-menu [compose-mail] - `(menu-item ,(purecopy (format "Send Mail (with %s)" (send-mail-item-name))) compose-mail + `(menu-item (format "Send Mail (with %s)" (send-mail-item-name)) compose-mail :visible (and mail-user-agent (not (eq mail-user-agent 'ignore))) :help ,(purecopy "Send a mail message"))) (define-key menu-bar-tools-menu [rmail] - `(menu-item ,(purecopy (format "Read Mail (with %s)" (read-mail-item-name))) menu-bar-read-mail - :visible (and read-mail-command (not (eq read-mail-command 'ignore))) + `(menu-item (format "Read Mail (with %s)" (read-mail-item-name)) + menu-bar-read-mail + :visible (and read-mail-command + (not (eq read-mail-command 'ignore))) :help ,(purecopy "Read your mail and reply to it"))) (defun menu-bar-read-mail () |