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

[Andre Spiegel]

Index: emacs/lisp/vc-hooks.el
diff -c emacs/lisp/vc-hooks.el:1.137 emacs/lisp/vc-hooks.el:1.138
*** emacs/lisp/vc-hooks.el:1.137        Fri Dec 14 02:58:33 2001
--- emacs/lisp/vc-hooks.el      Thu Feb 21 15:56:58 2002
***************
*** 5,11 ****
  ;; Author:     FSF (see vc.el for full credits)
  ;; Maintainer: Andre Spiegel <address@hidden>
  
! ;; $Id: vc-hooks.el,v 1.137 2001/12/14 07:58:33 spiegel Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 5,11 ----
  ;; Author:     FSF (see vc.el for full credits)
  ;; Maintainer: Andre Spiegel <address@hidden>
  
! ;; $Id: vc-hooks.el,v 1.138 2002/02/21 20:56:58 spiegel Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 544,550 ****
  The value is set in the current buffer, which should be the buffer
  visiting FILE."
    (interactive (list buffer-file-name))
!   (unless (not (vc-backend file))
      (setq vc-mode (concat " " (if vc-display-status
                                  (vc-call mode-line-string file)
                                (symbol-name (vc-backend file)))))
--- 544,551 ----
  The value is set in the current buffer, which should be the buffer
  visiting FILE."
    (interactive (list buffer-file-name))
!   (if (not (vc-backend file))
!       (setq vc-mode nil)
      (setq vc-mode (concat " " (if vc-display-status
                                  (vc-call mode-line-string file)
                                (symbol-name (vc-backend file)))))
***************
*** 610,615 ****
--- 611,618 ----
    "Function for `find-file-hooks' activating VC mode if appropriate."
    ;; Recompute whether file is version controlled,
    ;; if user has killed the buffer and revisited.
+   (if vc-mode
+       (setq vc-mode nil))
    (when buffer-file-name
      (vc-file-clearprops buffer-file-name)
      (cond