mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 16:51:06 -07:00
Code Issues Projects Releases Wiki Activity

Don't call vc-buffer-sync-fileset when committing a patch

Browse source 
* lisp/vc/vc-dispatcher.el (vc-finish-logentry): Move call to
vc-buffer-sync-fileset from here ...
* lisp/vc/vc.el (vc-checkin): ... to here, and conditionalize so
as not to call when committing a patch.  Also fix comment.
This commit is contained in:
Sean Whitton 2025-07-05 09:49:13 +01:00
parent cbd4616ae2
commit 45d1486803
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -858,9 +858,6 @@ the buffer contents as a comment."
;; Check and record the comment, if any.
(unless nocomment
(run-hooks 'vc-logentry-check-hook))
;; Must pass NOT-ESSENTIAL non-nil because we later call
;; `vc-resynch-buffer' with NOQUERY non-nil.
(vc-buffer-sync-fileset (list log-edit-vc-backend vc-log-fileset))
(unless vc-log-operation
(error "No log operation is pending"))

5
lisp/vc/vc.el
View file

@ -1957,6 +1957,11 @@ Runs the normal hooks `vc-before-checkin-hook' and `vc-checkin-hook'."
;; RCS 5.7 gripes about whitespace-only comments too.
(unless (and comment (string-match "[^\t\n ]" comment))
(setq comment "*** empty log message ***"))
(unless patch-string
;; Must not pass non-nil NOT-ESSENTIAL because we will shortly
;; call (in `vc-finish-logentry') `vc-resynch-buffer' with its
;; NOQUERY parameter non-nil.
(vc-buffer-sync-fileset (list backend files)))
(when register (vc-register (list backend register)))
(cl-labels ((do-it ()
;; We used to change buffers to get local value of