aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-04-30 16:10:05 +0000
committerDan Nicolaescu2008-04-30 16:10:05 +0000
commit458c4642c55b5920ec0a678d1aa9541e11f534fe (patch)
tree4f8c2be97cabc0dd29538b52467ce7cbe4cd47f2
parent5d8137abac262ce380105a6d2c38783e07c2f4e1 (diff)
downloademacs-458c4642c55b5920ec0a678d1aa9541e11f534fe.tar.gz
emacs-458c4642c55b5920ec0a678d1aa9541e11f534fe.zip
(lisp-mode-map): Add menu.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/lisp-mode.el13
2 files changed, 16 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1ccaa792ef3..cce6cee7a71 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-04-30 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * emacs-lisp/lisp-mode.el (lisp-mode-map): Add menu.
4
12008-04-30 Stefan Monnier <monnier@iro.umontreal.ca> 52008-04-30 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * progmodes/octave-mod.el (octave-help): New function. 7 * progmodes/octave-mod.el (octave-help): New function.
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 48f0b9b7860..9faef35d610 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -431,10 +431,21 @@ if that value is non-nil."
431(put 'emacs-lisp-mode 'custom-mode-group 'lisp) 431(put 'emacs-lisp-mode 'custom-mode-group 'lisp)
432 432
433(defvar lisp-mode-map 433(defvar lisp-mode-map
434 (let ((map (make-sparse-keymap))) 434 (let ((map (make-sparse-keymap))
435 (menu-map (make-sparse-keymap "Lisp")))
435 (set-keymap-parent map lisp-mode-shared-map) 436 (set-keymap-parent map lisp-mode-shared-map)
436 (define-key map "\e\C-x" 'lisp-eval-defun) 437 (define-key map "\e\C-x" 'lisp-eval-defun)
437 (define-key map "\C-c\C-z" 'run-lisp) 438 (define-key map "\C-c\C-z" 'run-lisp)
439 (define-key map [menu-bar lisp] (cons "Lisp" menu-map))
440 (define-key menu-map [run-lisp]
441 '(menu-item "Run inferior Lisp" run-lisp
442 :help "Run an inferior Lisp process, input and output via buffer `*inferior-lisp*'"))
443 (define-key menu-map [ev-def]
444 '(menu-item "Eval defun" lisp-eval-defun
445 :help "Send the current defun to the Lisp process made by M-x run-lisp"))
446 (define-key menu-map [ind-sexp]
447 '(menu-item "Indent sexp" indent-sexp
448 :help "Indent each line of the list starting just after point"))
438 map) 449 map)
439 "Keymap for ordinary Lisp mode. 450 "Keymap for ordinary Lisp mode.
440All commands in `lisp-mode-shared-map' are inherited by this map.") 451All commands in `lisp-mode-shared-map' are inherited by this map.")