procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace my recent change to vc-start-logentry

Browse source 
* lisp/vc/vc-dispatcher.el (vc-start-logentry): Restore previous
logic for determining the parent buffer from before my recent
change to this function.  If the attempt to determine the parent
buffer fails, signal an error immediately.
(vc-dispatcher-browsing): Consider derived modes of
log-view-mode, too, as indicating that we are in a directory
browser.
This commit is contained in:
Sean Whitton 2024-10-18 17:08:53 +08:00
parent 5f22c090b1
commit 5c59ab56e6
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lisp/vc/vc-dispatcher.el
View file

@ -741,11 +741,12 @@ MODE, defaulting to `log-edit-mode' if MODE is nil.
AFTER-HOOK specifies the local value for `vc-log-after-operation-hook'.
BACKEND, if non-nil, specifies a VC backend for the Log Edit buffer.
PATCH-STRING is a patch to check in."
(let ((parent (or (and (not (vc-dispatcher-browsing))
(length= files 1)
(not (file-directory-p (car files)))
(get-file-buffer (car files)))
(current-buffer))))
(let ((parent (if (and (length= files 1)
(not (vc-dispatcher-browsing)))
(get-file-buffer (car files))
(current-buffer))))
(unless parent
(error "Unable to determine VC parent buffer"))
(if (and comment (not initial-contents))
(set-buffer (get-buffer-create logbuf))
(pop-to-buffer (get-buffer-create logbuf)))
@ -824,7 +825,8 @@ the buffer contents as a comment."
"Are we in a directory browser buffer?"
(or (derived-mode-p 'vc-dir-mode)
(derived-mode-p 'dired-mode)
(derived-mode-p 'diff-mode)))
(derived-mode-p 'diff-mode)
(derived-mode-p 'log-view-mode)))
;; These are unused.
;; (defun vc-dispatcher-in-fileset-p (fileset)