Commit 04991a1c authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

* net/eudc.el (eudc-tools-menu):

* international/mule-cmds.el (set-coding-system-map)
(mule-menu-keymap):
* emacs-lisp/lisp-mode.el (emacs-lisp-mode-map):
* vc-hooks.el (vc-menu-map): Use menu-bar-separator.
parent a3c20c83
2009-11-11 Dan Nicolaescu <dann@ics.uci.edu>
* subr.el (menu-bar-separator): New defconst.
* net/eudc.el (eudc-tools-menu):
* international/mule-cmds.el (set-coding-system-map)
(mule-menu-keymap):
* emacs-lisp/lisp-mode.el (emacs-lisp-mode-map):
* vc-hooks.el (vc-menu-map):
* replace.el (occur-mode-map):
* menu-bar.el (menu-bar-file-menu, menu-bar-search-menu)
(menu-bar-edit-menu, menu-bar-goto-menu, menu-bar-edit-menu)
......
......@@ -301,7 +301,7 @@ font-lock keywords will not be case sensitive."
(define-key tracing-map [tr-uf]
`(menu-item ,(purecopy "Untrace function...") untrace-function
:help ,(purecopy "Untrace function, and possibly activate all remaining advice")))
(define-key tracing-map [tr-sep] '("--"))
(define-key tracing-map [tr-sep] menu-bar-separator)
(define-key tracing-map [tr-q]
`(menu-item ,(purecopy "Trace function quietly...") trace-function-background
:help ,(purecopy "Trace the function with trace output going quietly to a buffer")))
......@@ -316,7 +316,7 @@ font-lock keywords will not be case sensitive."
`(menu-item ,(purecopy "Remove Instrumentation for Function...") elp-restore-function
:help ,(purecopy "Restore an instrumented function to its original definition")))
(define-key prof-map [sep-rem] '("--"))
(define-key prof-map [sep-rem] menu-bar-separator)
(define-key prof-map [prof-resall]
`(menu-item ,(purecopy "Reset Counters for All Functions") elp-reset-all
:help ,(purecopy "Reset the profiling information for all functions being profiled")))
......@@ -349,7 +349,7 @@ font-lock keywords will not be case sensitive."
`(menu-item ,(purecopy "Instrument Function for Debugging") edebug-defun
:help ,(purecopy "Evaluate the top level form point is in, stepping through with Edebug")
:keys ,(purecopy "C-u C-M-x")))
(define-key menu-map [separator-byte] '("--"))
(define-key menu-map [separator-byte] menu-bar-separator)
(define-key menu-map [disas]
`(menu-item ,(purecopy "Disassemble byte compiled object...") disassemble
:help ,(purecopy "Print disassembled code for OBJECT in a buffer")))
......@@ -362,7 +362,7 @@ font-lock keywords will not be case sensitive."
(define-key menu-map [byte-compile]
`(menu-item ,(purecopy "Byte-compile This File") emacs-lisp-byte-compile
:help ,(purecopy "Byte compile the file containing the current buffer")))
(define-key menu-map [separator-eval] '("--"))
(define-key menu-map [separator-eval] menu-bar-separator)
(define-key menu-map [ielm]
`(menu-item ,(purecopy "Interactive Expression Evaluation") ielm
:help ,(purecopy "Interactively evaluate Emacs Lisp expressions")))
......@@ -376,7 +376,7 @@ font-lock keywords will not be case sensitive."
(define-key menu-map [eval-sexp]
`(menu-item ,(purecopy "Evaluate Last S-expression") eval-last-sexp
:help ,(purecopy "Evaluate sexp before point; print value in minibuffer")))
(define-key menu-map [separator-format] '("--"))
(define-key menu-map [separator-format] menu-bar-separator)
(define-key menu-map [comment-region]
`(menu-item ,(purecopy "Comment Out Region") comment-region
:help ,(purecopy "Comment or uncomment each line in the region")
......@@ -385,7 +385,8 @@ font-lock keywords will not be case sensitive."
`(menu-item ,(purecopy "Indent Region") indent-region
:help ,(purecopy "Indent each nonblank line in the region")
:enable mark-active))
(define-key menu-map [indent-line] '("Indent Line" . lisp-indent-line))
(define-key menu-map [indent-line]
`(menu-item ,(purecopy "Indent Line") lisp-indent-line))
map)
"Keymap for Emacs Lisp mode.
All commands in `lisp-mode-shared-map' are inherited by this map.")
......
......@@ -76,7 +76,7 @@
(define-key-after map [universal-coding-system-argument]
`(menu-item ,(purecopy "For Next Command") universal-coding-system-argument
:help ,(purecopy "Coding system to be used by next command")))
(define-key-after map [separator-1] '("--"))
(define-key-after map [separator-1] menu-bar-separator)
(define-key-after map [set-buffer-file-coding-system]
`(menu-item ,(purecopy "For Saving This Buffer") set-buffer-file-coding-system
:help ,(purecopy "How to encode this buffer when saved")))
......@@ -88,7 +88,7 @@
(define-key-after map [set-file-name-coding-system]
`(menu-item ,(purecopy "For File Name") set-file-name-coding-system
:help ,(purecopy "How to decode/encode file names")))
(define-key-after map [separator-2] '("--"))
(define-key-after map [separator-2] menu-bar-separator)
(define-key-after map [set-keyboard-coding-system]
`(menu-item ,(purecopy "For Keyboard") set-keyboard-coding-system
......@@ -97,7 +97,7 @@
`(menu-item ,(purecopy "For Terminal") set-terminal-coding-system
:enable (null (memq initial-window-system '(x w32 ns)))
:help ,(purecopy "How to encode terminal output")))
(define-key-after map [separator-3] '("--"))
(define-key-after map [separator-3] menu-bar-separator)
(define-key-after map [set-selection-coding-system]
`(menu-item ,(purecopy "For X Selections/Clipboard") set-selection-coding-system
......@@ -118,7 +118,7 @@
(let ((map (make-sparse-keymap "Mule (Multilingual Environment)")))
(define-key-after map [set-language-environment]
`(menu-item ,(purecopy "Set Language Environment") ,setup-language-environment-map))
(define-key-after map [separator-mule] '("--"))
(define-key-after map [separator-mule] menu-bar-separator)
(define-key-after map [toggle-input-method]
`(menu-item ,(purecopy "Toggle Input Method") toggle-input-method))
......@@ -126,7 +126,7 @@
`(menu-item ,(purecopy "Select Input Method...") set-input-method))
(define-key-after map [describe-input-method]
`(menu-item ,(purecopy "Describe Input Method") describe-input-method))
(define-key-after map [separator-input-method] '("--"))
(define-key-after map [separator-input-method] menu-bar-separator)
(define-key-after map [set-various-coding-system]
`(menu-item ,(purecopy "Set Coding Systems") ,set-coding-system-map
......@@ -136,7 +136,7 @@
:enable (file-readable-p
(expand-file-name "HELLO" data-directory))
:help ,(purecopy "Display file which says HELLO in many languages")))
(define-key-after map [separator-coding-system] '("--"))
(define-key-after map [separator-coding-system] menu-bar-separator)
(define-key-after map [describe-language-environment]
`(menu-item ,(purecopy "Describe Language Environment")
......
......@@ -1246,14 +1246,14 @@ This does nothing except loading eudc by autoload side-effect."
(define-key map [email]
`(menu-item ,(purecopy "Get Email") eudc-get-email
:help ,(purecopy "Get the email field of NAME from the directory server")))
(define-key map [separator-eudc-email] '("--"))
(define-key map [separator-eudc-email] menu-bar-separator)
(define-key map [expand-inline]
`(menu-item ,(purecopy "Expand Inline Query") eudc-expand-inline
:help ,(purecopy "Query the directory server, and expand the query string before point")))
(define-key map [query]
`(menu-item ,(purecopy "Query with Form") eudc-query-form
:help ,(purecopy "Display a form to query the directory server")))
(define-key map [separator-eudc-query] '("--"))
(define-key map [separator-eudc-query] menu-bar-separator)
(define-key map [new]
`(menu-item ,(purecopy "New Server") eudc-set-server
:help ,(purecopy "Set the directory server to SERVER using PROTOCOL")))
......
......@@ -967,7 +967,7 @@ current, and kill the buffer that visits the link."
(define-key map [vc-create-tag]
`(menu-item ,(purecopy "Create Tag") vc-create-tag
:help ,(purecopy "Create version tag")))
(define-key map [separator1] '("----"))
(define-key map [separator1] menu-bar-separator)
(define-key map [vc-annotate]
`(menu-item ,(purecopy "Annotate") vc-annotate
:help ,(purecopy "Display the edit history of the current file using colors")))
......@@ -992,7 +992,7 @@ current, and kill the buffer that visits the link."
(define-key map [vc-print-root-log]
`(menu-item ,(purecopy "Show Top of the Tree History ") vc-print-root-log
:help ,(purecopy "List the change log for the current tree in a window")))
(define-key map [separator2] '("----"))
(define-key map [separator2] menu-bar-separator)
(define-key map [vc-insert-header]
`(menu-item ,(purecopy "Insert Header") vc-insert-headers
:help ,(purecopy "Insert headers into a file for use with a version control system.
......@@ -1036,7 +1036,7 @@ current, and kill the buffer that visits the link."
(if (null ext-binding)
orig-binding
(append orig-binding
'((ext-menu-separator "---"))
'((ext-menu-separator "--"))
ext-binding))))
(defun vc-default-extra-menu (backend)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment