summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/emacs-lisp/lisp-mode.el1
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3fa1ffe40a7..9c050fa5a01 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-29 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * emacs-lisp/lisp-mode.el (lisp-mode-shared-map): Inherit from
+ prog-mode-map.
+
2013-05-29 Leo Liu <sdl.web@gmail.com>
* progmodes/octave.el (octave-indent-comment): Tweak regexps.
@@ -24,8 +29,7 @@
2013-05-28 Alan Mackenzie <acm@muc.de>
Handle "capitalised keywords" correctly.
- * progmodes/cc-mode.el (c-after-change): bind case-fold-search to
- nil.
+ * progmodes/cc-mode.el (c-after-change): Bind case-fold-search to nil.
2013-05-28 Aidan Gauland <aidalgol@amuri.net>
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 8d74afac285..ae855052524 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -266,6 +266,7 @@ font-lock keywords will not be case sensitive."
(defvar lisp-mode-shared-map
(let ((map (make-sparse-keymap)))
+ (set-keymap-parent map prog-mode-map)
(define-key map "\e\C-q" 'indent-sexp)
(define-key map "\177" 'backward-delete-char-untabify)
;; This gets in the way when viewing a Lisp file in view-mode. As