* lisp/emacs-lisp/lisp-mode.el (lisp-mode-shared-map): Inherit from

prog-mode-map.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3fa1ffe40a717fa1c0085d2909d4a1f5ee2f53cc..9c050fa5a0151dede41a542812755da1ef0bb1b3 100644 (file)
--- 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 8d74afac2850a75a66edb51669aaddcdf21d08b1..ae8550525244d24fc851762afb3b443b7426a7ab 100644 (file)
--- 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