[Emacs-diffs] Changes to emacs/lisp/vc.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/vc.el
diff -c emacs/lisp/vc.el:1.359.2.4 emacs/lisp/vc.el:1.359.2.5
*** emacs/lisp/vc.el:1.359.2.4  Fri Sep 17 14:31:02 2004
--- emacs/lisp/vc.el    Thu Oct 14 08:49:59 2004
***************
*** 646,654 ****
    :group 'vc)
  
  ;; vc-annotate functionality (CVS only).
- (defvar vc-annotate-mode nil
-   "Variable indicating if VC-Annotate mode is active.")
- 
  (defvar vc-annotate-mode-map
    (let ((m (make-sparse-keymap)))
      (define-key m [menu-bar] (make-sparse-keymap "VC-Annotate"))
--- 646,651 ----
***************
*** 3004,3010 ****
    (when buffer
      (set-buffer buffer)
      (display-buffer buffer))
!   (if (not vc-annotate-mode)          ; Turn on vc-annotate-mode if not done
        (vc-annotate-mode))
    (cond ((null vc-annotate-display-mode)
         (vc-annotate-display-default vc-annotate-ratio))
--- 3001,3007 ----
    (when buffer
      (set-buffer buffer)
      (display-buffer buffer))
!   (if (not vc-annotate-parent-rev)
        (vc-annotate-mode))
    (cond ((null vc-annotate-display-mode)
         (vc-annotate-display-default vc-annotate-ratio))