Mercurial > emacs
diff lisp/menu-bar.el @ 90729:6588c6259dfb
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 545-562)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- erc-iswitchb: Temporarily enable iswitchb mode
* gnus--rel--5.10 (patch 172-176)
- Merge from emacs--devo--0
- Update from CVS
- Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sat, 16 Dec 2006 01:29:26 +0000 |
| parents | f1d13e615070 d6ae3d33ac22 |
| children | 95d0cdf160ea |
line wrap: on
line diff
--- a/lisp/menu-bar.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/menu-bar.el Sat Dec 16 01:29:26 2006 +0000 @@ -924,13 +924,13 @@ (define-key menu-bar-showhide-menu [showhide-tooltip-mode] (list 'menu-item "Tooltips" 'tooltip-mode - :help "Toggle tooltips on/off" + :help "Turn tooltips on/off" :visible `(and (display-graphic-p) (fboundp 'x-show-tip)) :button `(:toggle . tooltip-mode))) (define-key menu-bar-showhide-menu [menu-bar-mode] '(menu-item "Menu-bar" menu-bar-mode - :help "Toggle menu-bar on/off" + :help "Turn menu-bar on/off" :button (:toggle . menu-bar-mode))) (define-key menu-bar-showhide-menu [showhide-tool-bar] @@ -1127,7 +1127,8 @@ '(menu-item "Programmable Calculator" calc :help "Invoke the Emacs built-in full scientific calculator")) (define-key menu-bar-tools-menu [calendar] - '(menu-item "Calendar" calendar)) + '(menu-item "Calendar" calendar + :help "Invoke the Emacs built-in calendar")) (define-key menu-bar-tools-menu [separator-net] '("--")) @@ -1386,12 +1387,14 @@ '(menu-item "Send Bug Report..." report-emacs-bug :help "Send e-mail to Emacs maintainers")) (define-key menu-bar-help-menu [emacs-problems] - '(menu-item "Emacs Known Problems" view-emacs-problems)) + '(menu-item "Emacs Known Problems" view-emacs-problems + :help "Read about known problems with Emacs")) (define-key menu-bar-help-menu [emacs-news] '(menu-item "Emacs News" view-emacs-news :help "New features of this version")) (define-key menu-bar-help-menu [emacs-faq] - '(menu-item "Emacs FAQ" view-emacs-FAQ)) + '(menu-item "Emacs FAQ" view-emacs-FAQ + :help "Frequently asked (and answered) questions about Emacs")) (defun help-with-tutorial-spec-language () "Use the Emacs tutorial, specifying which language you want."