diff options
Diffstat (limited to 'lisp/vc/vc-dispatcher.el')
| -rw-r--r-- | lisp/vc/vc-dispatcher.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el index 5ae300bf09b..932b9158f2b 100644 --- a/lisp/vc/vc-dispatcher.el +++ b/lisp/vc/vc-dispatcher.el @@ -138,7 +138,9 @@ preserve the setting." ;; Variables the user doesn't need to know about. (defvar vc-log-operation nil) -(defvar vc-log-after-operation-hook nil) +(defvar vc-log-after-operation-hook nil + "Name of the hook run at the end of `vc-finish-logentry'. +BEWARE: Despite its name, this variable is not itself a hook!") (defvar vc-log-fileset) ;; In a log entry buffer, this is a local variable @@ -691,7 +693,6 @@ BACKEND, if non-nil, specifies a VC backend for the Log Edit buffer." (message "%s Type C-c C-c when done" msg) (vc-finish-logentry (eq comment t))))) -(declare-function vc-dir-move-to-goal-column "vc-dir" ()) ;; vc-finish-logentry is typically called from a log-edit buffer (see ;; vc-start-logentry). (defun vc-finish-logentry (&optional nocomment) @@ -740,13 +741,12 @@ the buffer contents as a comment." (mapc (lambda (file) (vc-resynch-buffer file t t)) log-fileset)) - (when (vc-dispatcher-browsing) - (vc-dir-move-to-goal-column)) (run-hooks after-hook 'vc-finish-logentry-hook))) (defun vc-dispatcher-browsing () "Are we in a directory browser buffer?" - (derived-mode-p 'vc-dir-mode)) + (or (derived-mode-p 'vc-dir-mode) + (derived-mode-p 'dired-mode))) ;; These are unused. ;; (defun vc-dispatcher-in-fileset-p (fileset) |