diff options
| author | Xue Fuqiao | 2013-07-30 08:29:09 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-07-30 08:29:09 +0800 |
| commit | d2067333246b676fcf98567d34eec79ed4648d5f (patch) | |
| tree | ad6543d8e7f1db50226907f7278373eef544d252 /lisp/vc | |
| parent | 7aa7fff0c8860b72a2c7cdc7d4d0845245754d43 (diff) | |
| parent | 86b192c1479d167c13edb9cdaa026c231c8a0442 (diff) | |
| download | emacs-d2067333246b676fcf98567d34eec79ed4648d5f.tar.gz emacs-d2067333246b676fcf98567d34eec79ed4648d5f.zip | |
Merge from mainline.
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/vc-dir.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el index 4920e85c351..6f03cba1f75 100644 --- a/lisp/vc/vc-dir.el +++ b/lisp/vc/vc-dir.el | |||
| @@ -237,9 +237,11 @@ See `run-hooks'." | |||
| 237 | ;; VC commands | 237 | ;; VC commands |
| 238 | (define-key map "v" 'vc-next-action) ;; C-x v v | 238 | (define-key map "v" 'vc-next-action) ;; C-x v v |
| 239 | (define-key map "=" 'vc-diff) ;; C-x v = | 239 | (define-key map "=" 'vc-diff) ;; C-x v = |
| 240 | (define-key map "D" 'vc-root-diff) ;; C-x v D | ||
| 240 | (define-key map "i" 'vc-register) ;; C-x v i | 241 | (define-key map "i" 'vc-register) ;; C-x v i |
| 241 | (define-key map "+" 'vc-update) ;; C-x v + | 242 | (define-key map "+" 'vc-update) ;; C-x v + |
| 242 | (define-key map "l" 'vc-print-log) ;; C-x v l | 243 | (define-key map "l" 'vc-print-log) ;; C-x v l |
| 244 | (define-key map "L" 'vc-print-root-log) ;; C-x v L | ||
| 243 | ;; More confusing than helpful, probably | 245 | ;; More confusing than helpful, probably |
| 244 | ;;(define-key map "R" 'vc-revert) ;; u is taken by vc-dir-unmark. | 246 | ;;(define-key map "R" 'vc-revert) ;; u is taken by vc-dir-unmark. |
| 245 | ;;(define-key map "A" 'vc-annotate) ;; g is taken by revert-buffer | 247 | ;;(define-key map "A" 'vc-annotate) ;; g is taken by revert-buffer |