summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/lisp-mode.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1998-03-08 23:40:28 +0000
committerRichard M. Stallman <rms@gnu.org>1998-03-08 23:40:28 +0000
commitb8bc6df2ee9537bc601dff9f26634407ef80cfea (patch)
treea3f9a53fd5a282f0204af13acebb5f23a0aef551 /lisp/emacs-lisp/lisp-mode.el
parentbe456a1d880859543f0cd731eeb362c5d4f797f3 (diff)
downloademacs-b8bc6df2ee9537bc601dff9f26634407ef80cfea.tar.gz
emacs-b8bc6df2ee9537bc601dff9f26634407ef80cfea.tar.bz2
emacs-b8bc6df2ee9537bc601dff9f26634407ef80cfea.zip
(lisp-interaction-mode-map)
(emacs-lisp-mode-map, lisp-mode-map): Use set-keymap-parent.
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
-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.")
(if emacs-lisp-mode-map
()
(let ((map (make-sparse-keymap "Emacs-Lisp")))
- (setq emacs-lisp-mode-map
- (nconc (make-sparse-keymap) shared-lisp-mode-map))
+ (setq emacs-lisp-mode-map (make-sparse-keymap))
+ (set-keymap-parent emacs-lisp-mode-map shared-lisp-mode-map)
(define-key emacs-lisp-mode-map "\e\t" 'lisp-complete-symbol)
(define-key emacs-lisp-mode-map "\e\C-x" 'eval-defun)
(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.")
(if lisp-mode-map
()
- (setq lisp-mode-map
- (nconc (make-sparse-keymap) shared-lisp-mode-map))
+ (setq lisp-mode-map (make-sparse-keymap))
+ (set-keymap-parent lisp-mode-map shared-lisp-mode-map)
(define-key lisp-mode-map "\e\C-x" 'lisp-eval-defun)
(define-key lisp-mode-map "\C-c\C-z" 'run-lisp))
@@ -259,8 +259,8 @@ All commands in `shared-lisp-mode-map' are inherited by this map.")
(if lisp-interaction-mode-map
()
- (setq lisp-interaction-mode-map
- (nconc (make-sparse-keymap) shared-lisp-mode-map))
+ (setq lisp-interaction-mode-map (make-sparse-keymap))
+ (set-keymap-parent lisp-interaction-mode-map shared-lisp-mode-map)
(define-key lisp-interaction-mode-map "\e\C-x" 'eval-defun)
(define-key lisp-interaction-mode-map "\e\t" 'lisp-complete-symbol)
(define-key lisp-interaction-mode-map "\n" 'eval-print-last-sexp))