aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2016-04-24 17:21:18 +0200
committerLars Magne Ingebrigtsen2016-04-24 17:21:18 +0200
commit12846626bfae795a173fdedf2850dfbd24065534 (patch)
treeae80fdaaad7aa8ad3546cdea3051a10831af9ea5
parentb7a21984cc4543139c69d8ff8c2430913fc0e6fc (diff)
downloademacs-12846626bfae795a173fdedf2850dfbd24065534.tar.gz
emacs-12846626bfae795a173fdedf2850dfbd24065534.zip
Call `make-composed-keymap' correctly
* lisp/image-mode.el (image-mode-map): Call `make-composed-keymap' correctly.
-rw-r--r--lisp/image-mode.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index f4a17b2a28a..a18b07ebe6a 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -371,7 +371,7 @@ call."
371 "Internal variable to keep the previous non-image major mode.") 371 "Internal variable to keep the previous non-image major mode.")
372 372
373(defvar image-mode-map 373(defvar image-mode-map
374 (let ((map (make-composed-keymap image-map special-mode-map))) 374 (let ((map (make-sparse-keymap)))
375 (define-key map "\C-c\C-c" 'image-toggle-display) 375 (define-key map "\C-c\C-c" 'image-toggle-display)
376 (define-key map "\C-c\C-x" 'image-toggle-hex-display) 376 (define-key map "\C-c\C-x" 'image-toggle-hex-display)
377 (define-key map (kbd "SPC") 'image-scroll-up) 377 (define-key map (kbd "SPC") 'image-scroll-up)
@@ -476,7 +476,7 @@ call."
476 ["Goto Frame..." image-goto-frame :active image-multi-frame 476 ["Goto Frame..." image-goto-frame :active image-multi-frame
477 :help "Show a specific frame of this image"] 477 :help "Show a specific frame of this image"]
478 )) 478 ))
479 map) 479 (make-composed-keymap (list map image-map) special-mode-map))
480 "Mode keymap for `image-mode'.") 480 "Mode keymap for `image-mode'.")
481 481
482(defvar image-minor-mode-map 482(defvar image-minor-mode-map