From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Sun, 24 Apr 2016 15:11:23 +0000 (+0200)
Subject: Use `make-composed-keymap' instead of copying the keymap
X-Git-Tag: emacs-26.0.90~2166
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b7a21984cc4543139c69d8ff8c2430913fc0e6fc;p=emacs.git

Use `make-composed-keymap' instead of copying the keymap

* lisp/image-mode.el (image-mode-map): Use
`make-composed-keymap' instead of copying the keymap.
---

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index e887e296308..f4a17b2a28a 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -371,8 +371,7 @@ call."
   "Internal variable to keep the previous non-image major mode.")
 
 (defvar image-mode-map
-  (let ((map (copy-keymap image-map)))
-    (set-keymap-parent map special-mode-map)
+  (let ((map (make-composed-keymap image-map special-mode-map)))
     (define-key map "\C-c\C-c" 'image-toggle-display)
     (define-key map "\C-c\C-x" 'image-toggle-hex-display)
     (define-key map (kbd "SPC")       'image-scroll-up)