Mercurial > emacs

comparison lisp/vc/diff-mode.el @ 109793:b60dcdd855f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sun, 08 Aug 2010 22:52:25 +0000
parents 25b707510762 b7f3d45194f6
children
comparison
equal deleted inserted replaced
109649:1f8f03cfcd2b 109793:b60dcdd855f0
139 ;; Standard M-a is useful, so don't change M-A. 139 ;; Standard M-a is useful, so don't change M-A.
140 ;;("A" . diff-ediff-patch) 140 ;;("A" . diff-ediff-patch)
141 ;; Standard M-r is useful, so don't change M-r or M-R. 141 ;; Standard M-r is useful, so don't change M-r or M-R.
142 ;;("r" . diff-restrict-view) 142 ;;("r" . diff-restrict-view)
143 ;;("R" . diff-reverse-direction) 143 ;;("R" . diff-reverse-direction)
144 ("g" . revert-buffer)
144 ("q" . quit-window)) 145 ("q" . quit-window))
145 "Basic keymap for `diff-mode', bound to various prefix keys.") 146 "Basic keymap for `diff-mode', bound to various prefix keys.")
146 147
147 (easy-mmode-defmap diff-mode-map 148 (easy-mmode-defmap diff-mode-map
148 `(("\e" . ,diff-mode-shared-map) 149 `(("\e" . ,diff-mode-shared-map)