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

Better handle errors when writing r-o files without backup

Browse source 
* lisp/files.el (basic-save-buffer-2): Restore file permissions when
writing read-only files without backup fails.  (Bug#66546)
This commit is contained in:
Jens Schmidt 2023-10-19 23:00:32 +02:00 • committed by Eli Zaretskii
parent 90474045c0
commit 8d2a04f4c0
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lisp/files.el
View file

@ -5934,9 +5934,10 @@ Before and after saving the buffer, this function runs
t))
;; If file not writable, see if we can make it writable
;; temporarily while we write it (its original modes will be
;; restored in 'basic-save-buffer'). But no need to do so if
;; we have just backed it up (setmodes is set) because that
;; says we're superseding.
;; restored in 'basic-save-buffer' or, in case of an error, in
;; the `unwind-protect' below). But no need to do so if we
;; have just backed it up (setmodes is set) because that says
;; we're superseding.
(cond ((and tempsetmodes (not setmodes))
;; Change the mode back, after writing.
(setq setmodes
@ -5946,7 +5947,12 @@ Before and after saving the buffer, this function runs
(file-extended-attributes buffer-file-name))
buffer-file-name))
;; If set-file-extended-attributes fails to make the
;; file writable, fall back on set-file-modes.
;; file writable, fall back on set-file-modes. Calling
;; set-file-extended-attributes here may or may not be
;; actually necessary. However, since its exact
;; behavior is highly port-specific, since calling it
;; does not do any harm, and since the call has a long
;; history, we decided to leave it in (bug#66546).
(with-demoted-errors "Error setting attributes: %s"
(set-file-extended-attributes buffer-file-name
(nth 1 setmodes)))
@ -5963,12 +5969,22 @@ Before and after saving the buffer, this function runs
buffer-file-name nil t buffer-file-truename)
(when save-silently (message nil))
(setq success t))
;; If we get an error writing the new file, and we made
;; the backup by renaming, undo the backing-up.
(and setmodes (not success)
(progn
(rename-file (nth 2 setmodes) buffer-file-name t)
(setq buffer-backed-up nil)))))))
(cond
;; If we get an error writing the file, and there is no
;; backup file, then we (most likely) made that file
;; writable above. Attempt to undo the write-access.
((and setmodes (not success)
(equal (nth 2 setmodes) buffer-file-name))
(with-demoted-errors "Error setting file modes: %S"
(set-file-modes buffer-file-name (car setmodes)))
(with-demoted-errors "Error setting attributes: %s"
(set-file-extended-attributes buffer-file-name
(nth 1 setmodes))))
;; If we get an error writing the new file, and we made
;; the backup by renaming, undo the backing-up.
((and setmodes (not success))
(rename-file (nth 2 setmodes) buffer-file-name t)
(setq buffer-backed-up nil)))))))
setmodes))
(declare-function diff-no-select "diff"