summaryrefslogtreecommitdiff
path: root/lisp/image-mode.el
diff options
context:
space:
mode:
authorSam Steingold <sds@gnu.org>2011-02-01 16:22:21 -0500
committerSam Steingold <sds@gnu.org>2011-02-01 16:22:21 -0500
commitabef340a0c5304054a2a5e6d95e1d825501f0e7a (patch)
tree652d4929d112a5a646e127b660e22953f2624a4f /lisp/image-mode.el
parent3082f6173c4d06d0d1b9d860f656a1e1c08f3c65 (diff)
downloademacs-abef340a0c5304054a2a5e6d95e1d825501f0e7a.tar.gz
* lisp/simple.el (special-mode-map): Bind "h" to `describe-mode';
bind "z" to `kill-this-buffer'. (completion-list-mode-map): Bind "z" to `kill-this-buffer'. * lisp/apropos.el (apropos-mode-map): Inherit from `special-mode-map'. (apropos-mode): Inherit from `special-mode'. * lisp/arc-mode.el (archive-mode-map): Inherit from `special-mode-map'. * lisp/bookmark.el (bookmark-bmenu-mode): Define using `define-derived-mode' inheriting from `special-mode'. * lisp/dired.el (dired-mode-map): Inherit from `special-mode-map'. * lisp/image-mode.el (image-mode-map): Ditto. * lisp/replace.el (occur-mode): Define using `define-derived-mode' inheriting from `special-mode'. * lisp/tar-mode.el (tar-mode): Inherit from `special-mode'. * lisp/calendar/diary-lib.el (diary-fancy-display-mode): Inherit from `special-mode-map'. * lisp/emacs-lisp/ert.el (ert-simple-view-mode, ert-results-mode): Inherit from `special-mode'. * lisp/emacs-lisp/package.el (package-menu-mode-map): Copy from `special-mode-map'. (package-menu-mode): Define using `define-derived-mode' inheriting from `special-mode'. * erc/erc-list.el (erc-list-menu-mode): Inherit from `special-mode'. * lisp/net/xesam.el (xesam-mode): Inherit from `special-mode'. (xesam-mode-map): Define separately. * lisp/play/solitaire.el (solitaire-mode): Inherit from `special-mode'. * lisp/progmodes/compile.el (compilation-minor-mode-map) (compilation-mode-map): Inherit from `special-mode-map'. * lisp/vc/diff-mode.el (diff-mode-shared-map): Inherit from `special-mode-map'. * lisp/vc/log-view.el (log-view-mode-map): Add a comment.
Diffstat (limited to 'lisp/image-mode.el')
-rw-r--r--lisp/image-mode.el4
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 74fd96e8ade..190ca08722b 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -305,8 +305,7 @@ This variable is used to display the current image type in the mode line.")
(defvar image-mode-map
(let ((map (make-sparse-keymap)))
- (suppress-keymap map)
- (define-key map "q" 'quit-window)
+ (set-keymap-parent map special-mode-map)
(define-key map "\C-c\C-c" 'image-toggle-display)
(define-key map (kbd "SPC") 'image-scroll-up)
(define-key map (kbd "DEL") 'image-scroll-down)
@@ -385,7 +384,6 @@ to toggle between display as an image and display as text."
(funcall
(if (called-interactively-p 'any) 'error 'message)
"Cannot display image: %s" (cdr err)))))
-
;;;###autoload
(define-minor-mode image-minor-mode
"Toggle Image minor mode.