Changeset 4091 for trunk/lisp/menu-bar.el

Timestamp:

05/27/06 10:35:24 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/menu-bar.el (modified) (18 diffs)

trunk/lisp/menu-bar.el

@@ -301 +301 @@
-
-(define-key menu-bar-search-menu [i-search]
-
-
+
-(define-key menu-bar-search-menu [separator-tag-isearch]
-  '(menu-item "--"))
@@ -370 +369 @@
-;;; Assemble the top-level Edit menu items.
-(define-key menu-bar-edit-menu [props]
-
-
+
-
-(define-key menu-bar-edit-menu [fill]
@@ -383 +381 @@
-
-(define-key menu-bar-edit-menu [bookmark]
-
-
+
-
-(defvar menu-bar-goto-menu (make-sparse-keymap "Go To"))
@@ -468 +465 @@
-(define-key menu-bar-edit-menu [select-paste]
-  '(menu-item "Select and Paste" yank-menu
-
-
+
-(define-key menu-bar-edit-menu [paste]
-  '(menu-item "Paste" yank
@@ -642 +638 @@
-;;; Assemble all the top-level items of the "Options" menu
-(define-key menu-bar-options-menu [customize]
-
-
+
-
-(defun menu-bar-options-save ()
@@ -881 +876 @@
-(define-key menu-bar-showhide-menu [showhide-fringe]
-  (list 'menu-item "Fringe" menu-bar-showhide-fringe-menu
-
-
+
-
-(defvar menu-bar-showhide-scroll-bar-menu (make-sparse-keymap "Scroll-bar"))
@@ -926 +920 @@
-(define-key menu-bar-showhide-menu [showhide-scroll-bar]
-  (list 'menu-item "Scroll-bar" menu-bar-showhide-scroll-bar-menu
-
-
+
-
-(define-key menu-bar-showhide-menu [showhide-tooltip-mode]
@@ -947 +940 @@
-
-(define-key menu-bar-options-menu [showhide]
-
-
+
-
-(define-key menu-bar-options-menu [showhide-separator]
@@ -961 +953 @@
-;; e.g. language selection.
-;;;     ':visible 'default-enable-multibyte-characters
-':help "Default language, encodings, input method"
+
-;(setq menu-bar-final-items (cons 'mule menu-bar-final-items))
-;(define-key menu-bar-options-menu [preferences]
@@ -1138 +1130 @@
-              :help "Invoke the Emacs built-in full scientific calculator"))
-(define-key menu-bar-tools-menu [calendar]
-Display 
+
-
-(define-key menu-bar-tools-menu [separator-net]
@@ -1144 +1136 @@
-
-(define-key menu-bar-tools-menu [directory-search]
-
-
+
-(define-key menu-bar-tools-menu [compose-mail]
-  (list
@@ -1173 +1164 @@
-(defvar vc-menu-map (make-sparse-keymap "Version Control"))
-(define-key menu-bar-tools-menu [pcl-cvs]
-
-
+
-(define-key menu-bar-tools-menu [vc]
-
-
+
-
-(define-key menu-bar-tools-menu [separator-compare]
@@ -1183 +1172 @@
-
-(define-key menu-bar-tools-menu [ediff-misc]
-
-
+
-(define-key menu-bar-tools-menu [epatch]
-  '(menu-item "Apply Patch" menu-bar-epatch-menu))
-(define-key menu-bar-tools-menu [ediff-merge]
-
-
+
-(define-key menu-bar-tools-menu [compare]
-
-
-
+
-
-(define-key menu-bar-tools-menu [separator-spell]
@@ -1243 +1228 @@
-(define-key menu-bar-describe-menu [describe-language-environment]
-  (list 'menu-item "Describe Language Environment"
-
-
+
-
-(define-key menu-bar-describe-menu [separator-desc-mule]
@@ -1319 +1303 @@
-(define-key menu-bar-apropos-menu [sep1]
-  '("--"))
+(define-key menu-bar-apropos-menu [emacs-command-node]
+  '(menu-item "Look Up Command in User Manual..." Info-goto-emacs-command-node
+              :help "Display manual section that describes a command"))
+(define-key menu-bar-apropos-menu [emacs-key-command-node]
+  '(menu-item "Look Up Key in User Manual..." Info-goto-emacs-key-command-node
+              :help "Display manual section that describes a key"))
-(define-key menu-bar-apropos-menu [elisp-index-search]
-  '(menu-item "Look Up Subject in ELisp Manual..." elisp-index-search
@@ -1339 +1329 @@
-  '(menu-item "Ordering Manuals" view-order-manuals
-              :help "How to order manuals from the Free Software Foundation"))
+(define-key menu-bar-manuals-menu [info-apropos]
+  '(menu-item "Lookup Subject in all manuals..." info-apropos
+              :help "Find description of a subject in all installed manuals"))
-(define-key menu-bar-manuals-menu [info]
-  '(menu-item "All Other Manuals (Info)" Info-directory
@@ -1348 +1341 @@
-  '(menu-item "Introduction to Emacs Lisp" menu-bar-read-lispintro
-              :help "Read the Introduction to Emacs Lisp Programming"))
-(define-key menu-bar-manuals-menu [sep3]
-  '("--"))
-(define-key menu-bar-manuals-menu [command]
-  '(menu-item "Find Command in Manual..." Info-goto-emacs-command-node
-              :help "Display manual section that describes a command"))
-(define-key menu-bar-manuals-menu [key]
-  '(menu-item "Find Key in Manual..." Info-goto-emacs-key-command-node
-              :help "Display manual section that describes a key"))
-
-(define-key menu-bar-help-menu [eliza]
@@ -1390 +1375 @@
-              :help "Find packages and features by keyword"))
-(define-key menu-bar-help-menu [manuals]
-
-
+
-(define-key menu-bar-help-menu [emacs-manual]
-  '(menu-item "Read the Emacs Manual" info-emacs-manual
-              :help "Full documentation of Emacs features"))
-(define-key menu-bar-help-menu [describe]
-
-
+
-(define-key menu-bar-help-menu [apropos]
-
-
+
-(define-key menu-bar-help-menu [sep1]
-  '("--"))