Mercurial > emacs
comparison lisp/diff-mode.el @ 83034:759de0673597
Merged in changes from CVS HEAD
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-70
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-74
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Tue, 03 Feb 2004 11:25:07 +0000 |
| parents | 12d228ede0dd |
| children | 32e20bdb34c9 |
comparison
equal
deleted
inserted
replaced
| 83033:3fed8a60d18c | 83034:759de0673597 |
|---|---|
| 125 ;; Our very own bindings. | 125 ;; Our very own bindings. |
| 126 ("A" . diff-ediff-patch) | 126 ("A" . diff-ediff-patch) |
| 127 ("r" . diff-restrict-view) | 127 ("r" . diff-restrict-view) |
| 128 ("R" . diff-reverse-direction) | 128 ("R" . diff-reverse-direction) |
| 129 ("U" . diff-context->unified) | 129 ("U" . diff-context->unified) |
| 130 ("C" . diff-unified->context)) | 130 ("C" . diff-unified->context) |
| 131 ("q" . quit-window)) | |
| 131 "Basic keymap for `diff-mode', bound to various prefix keys.") | 132 "Basic keymap for `diff-mode', bound to various prefix keys.") |
| 132 | 133 |
| 133 (easy-mmode-defmap diff-mode-map | 134 (easy-mmode-defmap diff-mode-map |
| 134 `(("\e" . ,diff-mode-shared-map) | 135 `(("\e" . ,diff-mode-shared-map) |
| 135 ;; From compilation-minor-mode. | 136 ;; From compilation-minor-mode. |