aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/menu-bar.el12
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 @@
12009-11-14 Glenn Morris <rgm@gnu.org> 12009-11-14 Glenn Morris <rgm@gnu.org>
2 2
3 * menu-bar.el (menu-bar-tools-menu): Read and send mail entries are not
4 constants. (Bug#4913)
5
3 * emacs-lisp/elint.el (elint-standard-variables): Doc fix. 6 * emacs-lisp/elint.el (elint-standard-variables): Doc fix.
4 7
52009-11-14 Shigeru Fukaya <shigeru.fukaya@gmail.com> 82009-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 @@
1;;; menu-bar.el --- define a default menu bar 1;;; menu-bar.el --- define a default menu bar
2 2
3;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004, 3;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004, 2005,
4;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 4;; 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
5 5
6;; Author: RMS 6;; Author: RMS
7;; Maintainer: FSF 7;; Maintainer: FSF
@@ -1283,12 +1283,14 @@ mail status in mode line"))
1283(define-key menu-bar-tools-menu [directory-search] 1283(define-key menu-bar-tools-menu [directory-search]
1284 `(menu-item ,(purecopy "Directory Search") eudc-tools-menu)) 1284 `(menu-item ,(purecopy "Directory Search") eudc-tools-menu))
1285(define-key menu-bar-tools-menu [compose-mail] 1285(define-key menu-bar-tools-menu [compose-mail]
1286 `(menu-item ,(purecopy (format "Send Mail (with %s)" (send-mail-item-name))) compose-mail 1286 `(menu-item (format "Send Mail (with %s)" (send-mail-item-name)) compose-mail
1287 :visible (and mail-user-agent (not (eq mail-user-agent 'ignore))) 1287 :visible (and mail-user-agent (not (eq mail-user-agent 'ignore)))
1288 :help ,(purecopy "Send a mail message"))) 1288 :help ,(purecopy "Send a mail message")))
1289(define-key menu-bar-tools-menu [rmail] 1289(define-key menu-bar-tools-menu [rmail]
1290 `(menu-item ,(purecopy (format "Read Mail (with %s)" (read-mail-item-name))) menu-bar-read-mail 1290 `(menu-item (format "Read Mail (with %s)" (read-mail-item-name))
1291 :visible (and read-mail-command (not (eq read-mail-command 'ignore))) 1291 menu-bar-read-mail
1292 :visible (and read-mail-command
1293 (not (eq read-mail-command 'ignore)))
1292 :help ,(purecopy "Read your mail and reply to it"))) 1294 :help ,(purecopy "Read your mail and reply to it")))
1293 1295
1294(defun menu-bar-read-mail () 1296(defun menu-bar-read-mail ()