diff options
| author | Vasilij Schneidermann | 2017-07-12 17:42:12 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2017-07-12 17:42:12 +0000 |
| commit | 7dd72d76effad5198c0d43a2b68aafbfe34b5ee7 (patch) | |
| tree | 4765fa0da1dfd57ce90d34f585c0bc5c89af2e20 | |
| parent | 125a8a62db96c5e3c3e93c34fdb1429098b0d3f6 (diff) | |
| download | emacs-7dd72d76effad5198c0d43a2b68aafbfe34b5ee7.tar.gz emacs-7dd72d76effad5198c0d43a2b68aafbfe34b5ee7.zip | |
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.
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 2 |
1 files changed, 2 insertions, 0 deletions
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." | |||
| 265 | nil | 265 | nil |
| 266 | 266 | ||
| 267 | (setq c-mode-base-map (make-sparse-keymap)) | 267 | (setq c-mode-base-map (make-sparse-keymap)) |
| 268 | (when (boundp 'prog-mode-map) | ||
| 269 | (c-set-keymap-parent c-mode-base-map prog-mode-map)) | ||
| 268 | 270 | ||
| 269 | ;; Separate M-BS from C-M-h. The former should remain | 271 | ;; Separate M-BS from C-M-h. The former should remain |
| 270 | ;; backward-kill-word. | 272 | ;; backward-kill-word. |