aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2007-09-09 12:28:36 +0000
committerJuri Linkov2007-09-09 12:28:36 +0000
commit3a155dd6a57edf1a446a192d362f1e41c8d71a91 (patch)
tree4d773314bda027b15a1ad95efb4ef8243513c3de
parent490a1ad61db35906ed0947f43dd97d818e6f0d25 (diff)
downloademacs-3a155dd6a57edf1a446a192d362f1e41c8d71a91.tar.gz
emacs-3a155dd6a57edf1a446a192d362f1e41c8d71a91.zip
(menu-bar-help-menu):
Move "About Emacs" and "About GNU" to the end of the Help menu. Move "Emacs Psychotherapist" after "Send Bug Report...". Move "External Packages" after "Find Emacs Packages".
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/menu-bar.el24
2 files changed, 17 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a1a570544d3..940c2db64f8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -24,6 +24,11 @@
24 (normal-splash-screen): Remove duplicate empty lines. 24 (normal-splash-screen): Remove duplicate empty lines.
25 (normal-about-screen): Add links "Authors" and "Contributing". 25 (normal-about-screen): Add links "Authors" and "Contributing".
26 26
27 * menu-bar.el (menu-bar-help-menu):
28 Move "About Emacs" and "About GNU" to the end of the Help menu.
29 Move "Emacs Psychotherapist" after "Send Bug Report...".
30 Move "External Packages" after "Find Emacs Packages".
31
272007-09-09 Michael Albinus <michael.albinus@gmx.de> 322007-09-09 Michael Albinus <michael.albinus@gmx.de>
28 33
29 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols, 34 * net/tramp.el (top): Remove declarations of `tramp-gw-*' symbols,
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 0c59c052369..9a4e25ce4ef 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1338,9 +1338,12 @@ key, a click, or a menu-item"))
1338 '(menu-item "Introduction to Emacs Lisp" menu-bar-read-lispintro 1338 '(menu-item "Introduction to Emacs Lisp" menu-bar-read-lispintro
1339 :help "Read the Introduction to Emacs Lisp Programming")) 1339 :help "Read the Introduction to Emacs Lisp Programming"))
1340 1340
1341(define-key menu-bar-help-menu [eliza] 1341(define-key menu-bar-help-menu [describe-project]
1342 '(menu-item "Emacs Psychotherapist" doctor 1342 '(menu-item "About GNU" describe-project
1343 :help "Our doctor will help you feel better")) 1343 :help "About the GNU System, GNU Project, and GNU/Linux"))
1344(define-key menu-bar-help-menu [about]
1345 '(menu-item "About Emacs" about-emacs
1346 :help "Display version number, copyright info, and basic help"))
1344(define-key menu-bar-help-menu [sep4] 1347(define-key menu-bar-help-menu [sep4]
1345 '("--")) 1348 '("--"))
1346(define-key menu-bar-help-menu [describe-no-warranty] 1349(define-key menu-bar-help-menu [describe-no-warranty]
@@ -1349,15 +1352,9 @@ key, a click, or a menu-item"))
1349(define-key menu-bar-help-menu [describe-copying] 1352(define-key menu-bar-help-menu [describe-copying]
1350 '(menu-item "Copying Conditions" describe-copying 1353 '(menu-item "Copying Conditions" describe-copying
1351 :help "Show the Emacs license (GPL)")) 1354 :help "Show the Emacs license (GPL)"))
1352(define-key menu-bar-help-menu [describe-project]
1353 '(menu-item "About GNU" describe-project
1354 :help "About the GNU System, GNU Project, and GNU/Linux"))
1355(define-key menu-bar-help-menu [describe-distribution] 1355(define-key menu-bar-help-menu [describe-distribution]
1356 '(menu-item "Getting New Versions" describe-distribution 1356 '(menu-item "Getting New Versions" describe-distribution
1357 :help "How to get latest versions of Emacs")) 1357 :help "How to get latest versions of Emacs"))
1358(define-key menu-bar-help-menu [more]
1359 '(menu-item "External Packages" menu-bar-help-extra-packages
1360 :help "Lisp packages distributed separately for use in Emacs"))
1361(defun menu-bar-help-extra-packages () 1358(defun menu-bar-help-extra-packages ()
1362 "Display help about some additional packages available for Emacs." 1359 "Display help about some additional packages available for Emacs."
1363 (interactive) 1360 (interactive)
@@ -1365,11 +1362,11 @@ key, a click, or a menu-item"))
1365 (view-file (expand-file-name "MORE.STUFF" 1362 (view-file (expand-file-name "MORE.STUFF"
1366 data-directory)) 1363 data-directory))
1367 (goto-address))) 1364 (goto-address)))
1368(define-key menu-bar-help-menu [about]
1369 '(menu-item "About Emacs" about-emacs
1370 :help "Display version number, copyright info, and basic help"))
1371(define-key menu-bar-help-menu [sep2] 1365(define-key menu-bar-help-menu [sep2]
1372 '("--")) 1366 '("--"))
1367(define-key menu-bar-help-menu [more]
1368 '(menu-item "External Packages" menu-bar-help-extra-packages
1369 :help "Lisp packages distributed separately for use in Emacs"))
1373(define-key menu-bar-help-menu [finder-by-keyword] 1370(define-key menu-bar-help-menu [finder-by-keyword]
1374 '(menu-item "Find Emacs Packages" finder-by-keyword 1371 '(menu-item "Find Emacs Packages" finder-by-keyword
1375 :help "Find packages and features by keyword")) 1372 :help "Find packages and features by keyword"))
@@ -1384,6 +1381,9 @@ key, a click, or a menu-item"))
1384 (list 'menu-item "Search Documentation" menu-bar-apropos-menu)) 1381 (list 'menu-item "Search Documentation" menu-bar-apropos-menu))
1385(define-key menu-bar-help-menu [sep1] 1382(define-key menu-bar-help-menu [sep1]
1386 '("--")) 1383 '("--"))
1384(define-key menu-bar-help-menu [eliza]
1385 '(menu-item "Emacs Psychotherapist" doctor
1386 :help "Our doctor will help you feel better"))
1387(define-key menu-bar-help-menu [report-emacs-bug] 1387(define-key menu-bar-help-menu [report-emacs-bug]
1388 '(menu-item "Send Bug Report..." report-emacs-bug 1388 '(menu-item "Send Bug Report..." report-emacs-bug
1389 :help "Send e-mail to Emacs maintainers")) 1389 :help "Send e-mail to Emacs maintainers"))