Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

vc-register: Fix setting backup-inhibited

Browse source 
* lisp/vc/vc.el (vc-register): Delete unreachable code trying to
use 'buffer-file-name' as one of the file names.  Properly set
'backup-inhibited' in any file-visiting buffers.
This commit is contained in:
Sean Whitton 2025-07-13 12:30:43 +01:00
parent 0c97e6aeca
commit 24bd93b35b
1 changed files with 18 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
lisp/vc/vc.el
View file

@ -1719,34 +1719,27 @@ first backend that could register the file is used."
;; possibility to register directories rather than files only, since
;; many VCS allow that as well.
(dolist (fname files)
(let ((bname (get-file-buffer fname)))
(unless fname
(setq fname buffer-file-name))
(when (vc-call-backend backend 'registered fname)
(error "This file is already registered: %s" fname))
;; Watch out for new buffers of size 0: the corresponding file
;; does not exist yet, even though buffer-modified-p is nil.
(when bname
(with-current-buffer bname
(when (and (not (buffer-modified-p))
(zerop (buffer-size))
(not (file-exists-p buffer-file-name)))
(set-buffer-modified-p t))
(vc-buffer-sync)))))
(when (vc-call-backend backend 'registered fname)
(error "This file is already registered: %s" fname))
;; Watch out for new buffers of size 0: the corresponding file
;; does not exist yet, even though buffer-modified-p is nil.
(when-let* ((bname (get-file-buffer fname)))
(with-current-buffer bname
(when (and (not (buffer-modified-p))
(zerop (buffer-size))
(not (file-exists-p buffer-file-name)))
(set-buffer-modified-p t))
(vc-buffer-sync))))
(message "Registering %s... " files)
(mapc #'vc-file-clearprops files)
(vc-call-backend backend 'register files comment)
(mapc
(lambda (file)
(vc-file-setprop file 'vc-backend backend)
;; FIXME: This is wrong: it should set `backup-inhibited' in all
;; the buffers visiting files affected by this `vc-register', not
;; in the current-buffer.
;; (unless vc-make-backup-files
;; (setq-local backup-inhibited t))
(vc-resynch-buffer file t t))
files)
(dolist (fname files)
(vc-file-setprop fname 'vc-backend backend)
(when-let* ((bname (get-file-buffer fname)))
(with-current-buffer bname
(unless vc-make-backup-files
(setq-local backup-inhibited t))))
(vc-resynch-buffer fname t t))
(message "Registering %s... done" files)))
(defun vc-register-with (backend)