diff options
author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/vc/vc-hooks.el | |
parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
download | emacs-25-merge.tar.gz |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/vc/vc-hooks.el')
-rw-r--r-- | lisp/vc/vc-hooks.el | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 3e6d2a95051..93d2dc0ee89 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -243,12 +243,12 @@ if that doesn't exist either, return nil." "Call for BACKEND the implementation of FUNCTION-NAME with the given ARGS. Calls - (apply 'vc-BACKEND-FUN ARGS) + (apply \\='vc-BACKEND-FUN ARGS) if vc-BACKEND-FUN exists (after trying to find it in vc-BACKEND.el) and else calls - (apply 'vc-default-FUN BACKEND ARGS) + (apply \\='vc-default-FUN BACKEND ARGS) It is usually called via the `vc-call' macro." (let ((f (assoc function-name (get backend 'vc-functions)))) @@ -791,7 +791,11 @@ current, and kill the buffer that visits the link." nil) (defun vc-refresh-state () - "Activate or deactivate VC mode as appropriate." + "Refresh the VC state of the current buffer's file. + +This command is more thorough than `vc-state-refresh', in that it +also supports switching a back-end or removing the file from VC. +In the latter case, VC mode is deactivated for this buffer." (interactive) ;; Recompute whether file is version controlled, ;; if user has killed the buffer and revisited. |