[Emacs-diffs] /srv/bzr/emacs/trunk r112770: * lisp/emacs-lisp/lisp-mode.el (lisp-mode-shared-map): Inherit from

[Stefan Monnier]

------------------------------------------------------------
revno: 112770
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2013-05-29 10:14:16 -0400
message:
  * lisp/emacs-lisp/lisp-mode.el (lisp-mode-shared-map): Inherit from
  prog-mode-map.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/lisp-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-29 07:18:09 +0000
+++ b/lisp/ChangeLog    2013-05-29 14:14:16 +0000
@@ -1,3 +1,8 @@
+2013-05-29  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/lisp-mode.el (lisp-mode-shared-map): Inherit from
+       prog-mode-map.
+
 2013-05-29  Leo Liu  <address@hidden>
 
        * progmodes/octave.el (octave-indent-comment): Tweak regexps.
@@ -24,8 +29,7 @@
 2013-05-28  Alan Mackenzie  <address@hidden>
 
        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  <address@hidden>
 

=== modified file 'lisp/emacs-lisp/lisp-mode.el'
--- a/lisp/emacs-lisp/lisp-mode.el      2013-05-06 20:23:40 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el      2013-05-29 14:14:16 +0000
@@ -266,6 +266,7 @@
 
 (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