diff options
| -rw-r--r-- | lisp/vc.el | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 663c45fd466..3f562905280 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -646,9 +646,6 @@ List of factors, used to expand/compress the time scale. See `vc-annotate'." | |||
| 646 | :group 'vc) | 646 | :group 'vc) |
| 647 | 647 | ||
| 648 | ;; vc-annotate functionality (CVS only). | 648 | ;; vc-annotate functionality (CVS only). |
| 649 | (defvar vc-annotate-mode nil | ||
| 650 | "Variable indicating if VC-Annotate mode is active.") | ||
| 651 | |||
| 652 | (defvar vc-annotate-mode-map | 649 | (defvar vc-annotate-mode-map |
| 653 | (let ((m (make-sparse-keymap))) | 650 | (let ((m (make-sparse-keymap))) |
| 654 | (define-key m [menu-bar] (make-sparse-keymap "VC-Annotate")) | 651 | (define-key m [menu-bar] (make-sparse-keymap "VC-Annotate")) |
| @@ -3004,7 +3001,7 @@ use; you may override this using the second optional arg MODE." | |||
| 3004 | (when buffer | 3001 | (when buffer |
| 3005 | (set-buffer buffer) | 3002 | (set-buffer buffer) |
| 3006 | (display-buffer buffer)) | 3003 | (display-buffer buffer)) |
| 3007 | (if (not vc-annotate-mode) ; Turn on vc-annotate-mode if not done | 3004 | (if (not vc-annotate-parent-ref) |
| 3008 | (vc-annotate-mode)) | 3005 | (vc-annotate-mode)) |
| 3009 | (cond ((null vc-annotate-display-mode) | 3006 | (cond ((null vc-annotate-display-mode) |
| 3010 | (vc-annotate-display-default vc-annotate-ratio)) | 3007 | (vc-annotate-display-default vc-annotate-ratio)) |