diff options
| author | Eli Zaretskii | 2012-12-29 16:58:41 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-12-29 16:58:41 +0200 |
| commit | 7e56b103166f740bcfdc2d77b6b886c3c2b173c2 (patch) | |
| tree | 5018ac02d6ff6fbb33030049f3ff1c2f86870d28 | |
| parent | ccad023bc3c70fc8368c00f7ed2f5ec947a4260d (diff) | |
| download | emacs-7e56b103166f740bcfdc2d77b6b886c3c2b173c2.tar.gz emacs-7e56b103166f740bcfdc2d77b6b886c3c2b173c2.zip | |
Fix last commit.
lisp/files.el (basic-save-buffer): If set-file-extended-attributes
fails, fall back on set-file-modes.
Fixes: debbugs:13298
| -rw-r--r-- | lisp/ChangeLog | 1 | ||||
| -rw-r--r-- | lisp/files.el | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0beb4a73185..c41cfe1b25f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * files.el (backup-buffer-copy, basic-save-buffer-2): If | 3 | * files.el (backup-buffer-copy, basic-save-buffer-2): If |
| 4 | set-file-extended-attributes fails, fall back on set-file-modes | 4 | set-file-extended-attributes fails, fall back on set-file-modes |
| 5 | instead of signaling an error. (Bug#13298) | 5 | instead of signaling an error. (Bug#13298) |
| 6 | (basic-save-buffer): Likewise. | ||
| 6 | 7 | ||
| 7 | 2012-12-29 Fabián Ezequiel Gallina <fgallina@cuca> | 8 | 2012-12-29 Fabián Ezequiel Gallina <fgallina@cuca> |
| 8 | 9 | ||
diff --git a/lisp/files.el b/lisp/files.el index fb82d0dbe1f..e8be1a09047 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -4621,9 +4621,11 @@ Before and after saving the buffer, this function runs | |||
| 4621 | (if setmodes | 4621 | (if setmodes |
| 4622 | (condition-case () | 4622 | (condition-case () |
| 4623 | (progn | 4623 | (progn |
| 4624 | (set-file-modes buffer-file-name (car setmodes)) | 4624 | (unless |
| 4625 | (set-file-extended-attributes buffer-file-name | 4625 | (with-demoted-errors |
| 4626 | (nth 1 setmodes))) | 4626 | (set-file-modes buffer-file-name (car setmodes))) |
| 4627 | (set-file-extended-attributes buffer-file-name | ||
| 4628 | (nth 1 setmodes)))) | ||
| 4627 | (error nil)))) | 4629 | (error nil)))) |
| 4628 | ;; If the auto-save file was recent before this command, | 4630 | ;; If the auto-save file was recent before this command, |
| 4629 | ;; delete it now. | 4631 | ;; delete it now. |