* lisp/vc/vc-hooks.el (vc-refresh-state): New command

(vc-refresh-state): Rename from vc-find-file-hook and make interactive.
(vc-find-file-hook): Redefine as obsolete alias.

Copyright-paperwork-exempt: yes

diff --git a/etc/NEWS b/etc/NEWS
index e50e7a79173676c859ce46beffd2ed35ae6cc8ab..c664e026d4730639852052d570aaafdb1354244c 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -310,6 +310,7 @@ standards.
 \f
 * Changes in Specialized Modes and Packages in Emacs 25.1
 
+** You can recompute the VC state of a file buffer with `M-x vc-refresh-state'
 ** Prog mode has some support for multi-mode indentation.
 See `prog-indentation-context' and `prog-widen'.
 

diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index bae991936b5faed70b9ddae95f069b6932e73d79..e674f0e4d4e2c9d82994dbea57cfdf64c023a768 100644 (file)
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -790,8 +790,9 @@ current, and kill the buffer that visits the link."
 (defun vc-default-find-file-hook (_backend)
   nil)
 
-(defun vc-find-file-hook ()
-  "Function for `find-file-hook' activating VC mode if appropriate."
+(defun vc-refresh-state ()
+  "Activate or deactivate VC mode as appropriate."
+  (interactive)
   ;; Recompute whether file is version controlled,
   ;; if user has killed the buffer and revisited.
   (when vc-mode
@@ -838,18 +839,19 @@ current, and kill the buffer that visits the link."
 
                 (vc-follow-link)
                 (message "Followed link to %s" buffer-file-name)
-                (vc-find-file-hook))
+                (vc-refresh-state))
                (t
                 (if (yes-or-no-p (format
                                   "Symbolic link to %s-controlled source file; follow link? " link-type))
                     (progn (vc-follow-link)
                            (message "Followed link to %s" buffer-file-name)
-                           (vc-find-file-hook))
+                           (vc-refresh-state))
                   (message
                    "Warning: editing through the link bypasses version control")
                   )))))))))
 
-(add-hook 'find-file-hook 'vc-find-file-hook)
+(add-hook 'find-file-hook #'vc-refresh-state)
+(define-obsolete-function-alias 'vc-find-file-hook 'vc-refresh-state "25.1")
 
 (defun vc-kill-buffer-hook ()
   "Discard VC info about a file when we kill its buffer."