aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/emacs-lisp/lisp-mode.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 73633e7bfe7..d248479cdb3 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -148,8 +148,8 @@ All commands in `shared-lisp-mode-map' are inherited by this map.")
148(if emacs-lisp-mode-map 148(if emacs-lisp-mode-map
149 () 149 ()
150 (let ((map (make-sparse-keymap "Emacs-Lisp"))) 150 (let ((map (make-sparse-keymap "Emacs-Lisp")))
151 (setq emacs-lisp-mode-map 151 (setq emacs-lisp-mode-map (make-sparse-keymap))
152 (nconc (make-sparse-keymap) shared-lisp-mode-map)) 152 (set-keymap-parent emacs-lisp-mode-map shared-lisp-mode-map)
153 (define-key emacs-lisp-mode-map "\e\t" 'lisp-complete-symbol) 153 (define-key emacs-lisp-mode-map "\e\t" 'lisp-complete-symbol)
154 (define-key emacs-lisp-mode-map "\e\C-x" 'eval-defun) 154 (define-key emacs-lisp-mode-map "\e\C-x" 'eval-defun)
155 (define-key emacs-lisp-mode-map [menu-bar] (make-sparse-keymap)) 155 (define-key emacs-lisp-mode-map [menu-bar] (make-sparse-keymap))
@@ -221,8 +221,8 @@ All commands in `shared-lisp-mode-map' are inherited by this map.")
221 221
222(if lisp-mode-map 222(if lisp-mode-map
223 () 223 ()
224 (setq lisp-mode-map 224 (setq lisp-mode-map (make-sparse-keymap))
225 (nconc (make-sparse-keymap) shared-lisp-mode-map)) 225 (set-keymap-parent lisp-mode-map shared-lisp-mode-map)
226 (define-key lisp-mode-map "\e\C-x" 'lisp-eval-defun) 226 (define-key lisp-mode-map "\e\C-x" 'lisp-eval-defun)
227 (define-key lisp-mode-map "\C-c\C-z" 'run-lisp)) 227 (define-key lisp-mode-map "\C-c\C-z" 'run-lisp))
228 228
@@ -259,8 +259,8 @@ All commands in `shared-lisp-mode-map' are inherited by this map.")
259 259
260(if lisp-interaction-mode-map 260(if lisp-interaction-mode-map
261 () 261 ()
262 (setq lisp-interaction-mode-map 262 (setq lisp-interaction-mode-map (make-sparse-keymap))
263 (nconc (make-sparse-keymap) shared-lisp-mode-map)) 263 (set-keymap-parent lisp-interaction-mode-map shared-lisp-mode-map)
264 (define-key lisp-interaction-mode-map "\e\C-x" 'eval-defun) 264 (define-key lisp-interaction-mode-map "\e\C-x" 'eval-defun)
265 (define-key lisp-interaction-mode-map "\e\t" 'lisp-complete-symbol) 265 (define-key lisp-interaction-mode-map "\e\t" 'lisp-complete-symbol)
266 (define-key lisp-interaction-mode-map "\n" 'eval-print-last-sexp)) 266 (define-key lisp-interaction-mode-map "\n" 'eval-print-last-sexp))