diff options
| author | Lars Magne Ingebrigtsen | 2016-04-24 16:22:31 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2016-04-24 16:22:31 +0200 |
| commit | 43cc5d8bdf614aeb79acf691efe7e883112ddac9 (patch) | |
| tree | 8c1dc312f9ee3494b7025104b0f1cdeea32f8581 | |
| parent | d1c75d827b3628c864384d35fe03b2415a766aae (diff) | |
| download | emacs-43cc5d8bdf614aeb79acf691efe7e883112ddac9.tar.gz emacs-43cc5d8bdf614aeb79acf691efe7e883112ddac9.zip | |
Make `q' etc work in image mode again
* lisp/image-mode.el (image-mode-map): Restore
special-mode-map as the parent keymap of image-mode-map (bug#23167).
| -rw-r--r-- | lisp/image-mode.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 3334d6a823e..e887e296308 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el | |||
| @@ -371,9 +371,8 @@ 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-sparse-keymap))) | 374 | (let ((map (copy-keymap image-map))) |
| 375 | (set-keymap-parent map special-mode-map) | 375 | (set-keymap-parent map special-mode-map) |
| 376 | (set-keymap-parent map image-map) | ||
| 377 | (define-key map "\C-c\C-c" 'image-toggle-display) | 376 | (define-key map "\C-c\C-c" 'image-toggle-display) |
| 378 | (define-key map "\C-c\C-x" 'image-toggle-hex-display) | 377 | (define-key map "\C-c\C-x" 'image-toggle-hex-display) |
| 379 | (define-key map (kbd "SPC") 'image-scroll-up) | 378 | (define-key map (kbd "SPC") 'image-scroll-up) |