From 30866274e21c5f0a1c5f60cfe290743e7d482349 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Tue, 1 Sep 2015 23:41:42 -0400 Subject: [PATCH] * 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 --- etc/NEWS | 1 + lisp/vc/vc-hooks.el | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index e50e7a79173..c664e026d47 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -310,6 +310,7 @@ standards. * 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 bae991936b5..e674f0e4d4e 100644 --- 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." -- 2.39.2