diff options
| author | Glenn Morris | 2013-06-10 23:36:06 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-06-10 23:36:06 -0700 |
| commit | 56602a4bfcc63d2fc2460d10e9c32ea75162ee61 (patch) | |
| tree | ad803e2aa09e6807efe69ffbc6b838cbffae0b73 | |
| parent | 05e3e4125d3c2b19eba1cf86ac4a84011b83efb8 (diff) | |
| download | emacs-56602a4bfcc63d2fc2460d10e9c32ea75162ee61.tar.gz emacs-56602a4bfcc63d2fc2460d10e9c32ea75162ee61.zip | |
* vc/log-view.el (log-view-mode-map): Inherit from special-mode-map,
although define-derived-mode was doing this anyway.
Fixes: debbugs:14583
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc/log-view.el | 11 |
2 files changed, 6 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4a8c5225e31..f3e6eb18d69 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-06-11 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * vc/log-view.el (log-view-mode-map): Inherit from special-mode-map, | ||
| 4 | although define-derived-mode was doing this anyway. (Bug#14583) | ||
| 5 | |||
| 1 | 2013-06-10 Juanma Barranquero <lekktu@gmail.com> | 6 | 2013-06-10 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 7 | ||
| 3 | * allout.el (allout-encryption-plaintext-sanitization-regexps): | 8 | * allout.el (allout-encryption-plaintext-sanitization-regexps): |
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el index f20785966cd..de103c0cdb6 100644 --- a/lisp/vc/log-view.el +++ b/lisp/vc/log-view.el | |||
| @@ -123,8 +123,6 @@ | |||
| 123 | 123 | ||
| 124 | (easy-mmode-defmap log-view-mode-map | 124 | (easy-mmode-defmap log-view-mode-map |
| 125 | '( | 125 | '( |
| 126 | ;; FIXME: (copy-keymap special-mode-map) instead | ||
| 127 | (" " . scroll-up-command) | ||
| 128 | ("-" . negative-argument) | 126 | ("-" . negative-argument) |
| 129 | ("0" . digit-argument) | 127 | ("0" . digit-argument) |
| 130 | ("1" . digit-argument) | 128 | ("1" . digit-argument) |
| @@ -136,14 +134,6 @@ | |||
| 136 | ("7" . digit-argument) | 134 | ("7" . digit-argument) |
| 137 | ("8" . digit-argument) | 135 | ("8" . digit-argument) |
| 138 | ("9" . digit-argument) | 136 | ("9" . digit-argument) |
| 139 | ("<" . beginning-of-buffer) | ||
| 140 | (">" . end-of-buffer) | ||
| 141 | ("?" . describe-mode) | ||
| 142 | ("h" . describe-mode) | ||
| 143 | ("" . scroll-down-command) | ||
| 144 | (33554464 . scroll-down-command) | ||
| 145 | ("q" . quit-window) | ||
| 146 | ("g" . revert-buffer) | ||
| 147 | 137 | ||
| 148 | ("\C-m" . log-view-toggle-entry-display) | 138 | ("\C-m" . log-view-toggle-entry-display) |
| 149 | ("m" . log-view-toggle-mark-entry) | 139 | ("m" . log-view-toggle-mark-entry) |
| @@ -162,6 +152,7 @@ | |||
| 162 | ("\M-n" . log-view-file-next) | 152 | ("\M-n" . log-view-file-next) |
| 163 | ("\M-p" . log-view-file-prev)) | 153 | ("\M-p" . log-view-file-prev)) |
| 164 | "Log-View's keymap." | 154 | "Log-View's keymap." |
| 155 | :inherit special-mode-map | ||
| 165 | :group 'log-view) | 156 | :group 'log-view) |
| 166 | 157 | ||
| 167 | (easy-menu-define log-view-mode-menu log-view-mode-map | 158 | (easy-menu-define log-view-mode-menu log-view-mode-map |