Convert various menus to easymenu
* lisp/emacs-lisp/lisp-mode.el (lisp-mode-map): Move menu from here... (lisp-mode-menu): ...to here, and convert to easymenu. * lisp/progmodes/elisp-mode.el (lisp-interaction-mode-map): Move menu definition from here... (lisp-interaction-mode-menu): ...to here, and convert to easymenu. * lisp/replace.el (occur-menu-map): Convert to easymenu.
This commit is contained in:
Stefan Kangas
parent
8bdaac3457
commit
5684f7995d
3 changed files with 60 additions and 77 deletions
|
|
@ -740,25 +740,24 @@ font-lock keywords will not be case sensitive."
|
|||
;;; Generic Lisp mode.
|
||||
|
||||
(defvar lisp-mode-map
|
||||
(let ((map (make-sparse-keymap))
|
||||
(menu-map (make-sparse-keymap "Lisp")))
|
||||
(let ((map (make-sparse-keymap)))
|
||||
(set-keymap-parent map lisp-mode-shared-map)
|
||||
(define-key map "\e\C-x" 'lisp-eval-defun)
|
||||
(define-key map "\C-c\C-z" 'run-lisp)
|
||||
(bindings--define-key map [menu-bar lisp] (cons "Lisp" menu-map))
|
||||
(bindings--define-key menu-map [run-lisp]
|
||||
'(menu-item "Run inferior Lisp" run-lisp
|
||||
:help "Run an inferior Lisp process, input and output via buffer `*inferior-lisp*'"))
|
||||
(bindings--define-key menu-map [ev-def]
|
||||
'(menu-item "Eval defun" lisp-eval-defun
|
||||
:help "Send the current defun to the Lisp process made by M-x run-lisp"))
|
||||
(bindings--define-key menu-map [ind-sexp]
|
||||
'(menu-item "Indent sexp" indent-sexp
|
||||
:help "Indent each line of the list starting just after point"))
|
||||
map)
|
||||
"Keymap for ordinary Lisp mode.
|
||||
All commands in `lisp-mode-shared-map' are inherited by this map.")
|
||||
|
||||
(easy-menu-define lisp-mode-menu lisp-mode-map
|
||||
"Menu for ordinary Lisp mode."
|
||||
'("Lisp"
|
||||
["Indent sexp" indent-sexp
|
||||
:help "Indent each line of the list starting just after point"]
|
||||
["Eval defun" lisp-eval-defun
|
||||
:help "Send the current defun to the Lisp process made by M-x run-lisp"]
|
||||
["Run inferior Lisp" run-lisp
|
||||
:help "Run an inferior Lisp process, input and output via buffer `*inferior-lisp*'"]))
|
||||
|
||||
(define-derived-mode lisp-mode lisp-data-mode "Lisp"
|
||||
"Major mode for editing Lisp code for Lisps other than GNU Emacs Lisp.
|
||||
Commands:
|
||||
|
|
|
|||
|
|
@ -893,35 +893,31 @@ non-nil result supersedes the xrefs produced by
|
|||
;;; Elisp Interaction mode
|
||||
|
||||
(defvar lisp-interaction-mode-map
|
||||
(let ((map (make-sparse-keymap))
|
||||
(menu-map (make-sparse-keymap "Lisp-Interaction")))
|
||||
(let ((map (make-sparse-keymap)))
|
||||
(set-keymap-parent map lisp-mode-shared-map)
|
||||
(define-key map "\e\C-x" 'eval-defun)
|
||||
(define-key map "\e\C-q" 'indent-pp-sexp)
|
||||
(define-key map "\e\t" 'completion-at-point)
|
||||
(define-key map "\n" 'eval-print-last-sexp)
|
||||
(bindings--define-key map [menu-bar lisp-interaction]
|
||||
(cons "Lisp-Interaction" menu-map))
|
||||
(bindings--define-key menu-map [eval-defun]
|
||||
'(menu-item "Evaluate Defun" eval-defun
|
||||
:help "Evaluate the top-level form containing point, or after point"))
|
||||
(bindings--define-key menu-map [eval-print-last-sexp]
|
||||
'(menu-item "Evaluate and Print" eval-print-last-sexp
|
||||
:help "Evaluate sexp before point; print value into current buffer"))
|
||||
(bindings--define-key menu-map [edebug-defun-lisp-interaction]
|
||||
'(menu-item "Instrument Function for Debugging" edebug-defun
|
||||
:help "Evaluate the top level form point is in, stepping through with Edebug"
|
||||
:keys "C-u C-M-x"))
|
||||
(bindings--define-key menu-map [indent-pp-sexp]
|
||||
'(menu-item "Indent or Pretty-Print" indent-pp-sexp
|
||||
:help "Indent each line of the list starting just after point, or prettyprint it"))
|
||||
(bindings--define-key menu-map [complete-symbol]
|
||||
'(menu-item "Complete Lisp Symbol" completion-at-point
|
||||
:help "Perform completion on Lisp symbol preceding point"))
|
||||
map)
|
||||
"Keymap for Lisp Interaction mode.
|
||||
All commands in `lisp-mode-shared-map' are inherited by this map.")
|
||||
|
||||
(easy-menu-define lisp-interaction-mode-menu lisp-interaction-mode-map
|
||||
"Menu for Lisp Interaction mode."
|
||||
'("Lisp-Interaction"
|
||||
["Complete Lisp Symbol" completion-at-point
|
||||
:help "Perform completion on Lisp symbol preceding point"]
|
||||
["Indent or Pretty-Print" indent-pp-sexp
|
||||
:help "Indent each line of the list starting just after point, or prettyprint it"]
|
||||
["Instrument Function for Debugging" edebug-defun
|
||||
:help "Evaluate the top level form point is in, stepping through with Edebug"
|
||||
:keys "C-u C-M-x"]
|
||||
["Evaluate and Print" eval-print-last-sexp
|
||||
:help "Evaluate sexp before point; print value into current buffer"]
|
||||
["Evaluate Defun" eval-defun
|
||||
:help "Evaluate the top-level form containing point, or after point"]))
|
||||
|
||||
(define-derived-mode lisp-interaction-mode emacs-lisp-mode "Lisp Interaction"
|
||||
"Major mode for typing and evaluating Lisp forms.
|
||||
Like Lisp mode except that \\[eval-print-last-sexp] evals the Lisp expression
|
||||
|
|
|
|||
|
|
@ -1104,51 +1104,39 @@ a previously found match."
|
|||
count)))
|
||||
|
||||
|
||||
(defvar occur-menu-map
|
||||
(let ((map (make-sparse-keymap)))
|
||||
(bindings--define-key map [next-error-follow-minor-mode]
|
||||
'(menu-item "Auto Occurrence Display"
|
||||
next-error-follow-minor-mode
|
||||
:help "Display another occurrence when moving the cursor"
|
||||
:button (:toggle . (and (boundp 'next-error-follow-minor-mode)
|
||||
next-error-follow-minor-mode))))
|
||||
(bindings--define-key map [separator-1] menu-bar-separator)
|
||||
(bindings--define-key map [kill-this-buffer]
|
||||
'(menu-item "Kill Occur Buffer" kill-this-buffer
|
||||
:help "Kill the current *Occur* buffer"))
|
||||
(bindings--define-key map [quit-window]
|
||||
'(menu-item "Quit Occur Window" quit-window
|
||||
:help "Quit the current *Occur* buffer. Bury it, and maybe delete the selected frame"))
|
||||
(bindings--define-key map [revert-buffer]
|
||||
'(menu-item "Revert Occur Buffer" revert-buffer
|
||||
:help "Replace the text in the *Occur* buffer with the results of rerunning occur"))
|
||||
(bindings--define-key map [clone-buffer]
|
||||
'(menu-item "Clone Occur Buffer" clone-buffer
|
||||
:help "Create and return a twin copy of the current *Occur* buffer"))
|
||||
(bindings--define-key map [occur-rename-buffer]
|
||||
'(menu-item "Rename Occur Buffer" occur-rename-buffer
|
||||
:help "Rename the current *Occur* buffer to *Occur: original-buffer-name*."))
|
||||
(bindings--define-key map [occur-edit-buffer]
|
||||
'(menu-item "Edit Occur Buffer" occur-edit-mode
|
||||
:help "Edit the *Occur* buffer and apply changes to the original buffers."))
|
||||
(bindings--define-key map [separator-2] menu-bar-separator)
|
||||
(bindings--define-key map [occur-mode-goto-occurrence-other-window]
|
||||
'(menu-item "Go To Occurrence Other Window" occur-mode-goto-occurrence-other-window
|
||||
:help "Go to the occurrence the current line describes, in another window"))
|
||||
(bindings--define-key map [occur-mode-goto-occurrence]
|
||||
'(menu-item "Go To Occurrence" occur-mode-goto-occurrence
|
||||
:help "Go to the occurrence the current line describes"))
|
||||
(bindings--define-key map [occur-mode-display-occurrence]
|
||||
'(menu-item "Display Occurrence" occur-mode-display-occurrence
|
||||
:help "Display in another window the occurrence the current line describes"))
|
||||
(bindings--define-key map [occur-next]
|
||||
'(menu-item "Move to Next Match" occur-next
|
||||
:help "Move to the Nth (default 1) next match in an Occur mode buffer"))
|
||||
(bindings--define-key map [occur-prev]
|
||||
'(menu-item "Move to Previous Match" occur-prev
|
||||
:help "Move to the Nth (default 1) previous match in an Occur mode buffer"))
|
||||
map)
|
||||
"Menu keymap for `occur-mode'.")
|
||||
(easy-menu-define occur-menu-map nil
|
||||
"Menu for `occur-mode'."
|
||||
'("Occur"
|
||||
["Move to Previous Match" occur-prev
|
||||
:help "Move to the Nth (default 1) previous match in an Occur mode buffer"]
|
||||
["Move to Next Match" occur-next
|
||||
:help "Move to the Nth (default 1) next match in an Occur mode buffer"]
|
||||
["Display Occurrence" occur-mode-display-occurrence
|
||||
:help "Display in another window the occurrence the current line describes"]
|
||||
["Go To Occurrence" occur-mode-goto-occurrence
|
||||
:help "Go to the occurrence the current line describes"]
|
||||
["Go To Occurrence Other Window" occur-mode-goto-occurrence-other-window
|
||||
:help "Go to the occurrence the current line describes, in another window"]
|
||||
"---"
|
||||
["Edit Occur Buffer" occur-edit-mode
|
||||
:help "Edit the *Occur* buffer and apply changes to the original buffers."]
|
||||
["Rename Occur Buffer" occur-rename-buffer
|
||||
:help "Rename the current *Occur* buffer to *Occur: original-buffer-name*."]
|
||||
["Clone Occur Buffer" clone-buffer
|
||||
:help "Create and return a twin copy of the current *Occur* buffer"]
|
||||
["Revert Occur Buffer" revert-buffer
|
||||
:help "Replace the text in the *Occur* buffer with the results of rerunning occur"]
|
||||
["Quit Occur Window" quit-window
|
||||
:help "Quit the current *Occur* buffer. Bury it, and maybe delete the selected frame"]
|
||||
["Kill Occur Buffer" kill-this-buffer
|
||||
:help "Kill the current *Occur* buffer"]
|
||||
"---"
|
||||
["Auto Occurrence Display"
|
||||
next-error-follow-minor-mode
|
||||
:help "Display another occurrence when moving the cursor"
|
||||
:style toggle
|
||||
:selected (and (boundp 'next-error-follow-minor-mode)
|
||||
next-error-follow-minor-mode)]))
|
||||
|
||||
(defvar occur-mode-map
|
||||
(let ((map (make-sparse-keymap)))
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue