From: Vasilij Schneidermann <mail@vasilij.de>
Date: Wed, 12 Jul 2017 17:42:12 +0000 (+0000)
Subject: Make prog-mode-map the parent of c-mode-base-map.  Fixes bug #26658.
X-Git-Tag: emacs-26.0.90~518^2~122^2~3
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7dd72d76effad5198c0d43a2b68aafbfe34b5ee7;p=emacs.git

Make prog-mode-map the parent of c-mode-base-map.  Fixes bug #26658.

* lisp/progmodes/cc-mode.el (top level): Make prog-mode-map the parent of
c-mode-base-map if possible.
---

diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 1150ebd33b5..23044b1f4f4 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -265,6 +265,8 @@ control).  See \"cc-mode.el\" for more info."
     nil
 
   (setq c-mode-base-map (make-sparse-keymap))
+  (when (boundp 'prog-mode-map)
+    (c-set-keymap-parent c-mode-base-map prog-mode-map))
 
   ;; Separate M-BS from C-M-h.  The former should remain
   ;; backward-kill-word.