Fix last commit.

 lisp/files.el (basic-save-buffer): If set-file-extended-attributes
 fails, fall back on set-file-modes.

Fixes: debbugs:13298

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0beb4a7318589f4c3d60a211f460d0b262429d79..c41cfe1b25fb9ddac25e8a9fdbed6a4a99a3f170 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,7 @@
        * files.el (backup-buffer-copy, basic-save-buffer-2): If
        set-file-extended-attributes fails, fall back on set-file-modes
        instead of signaling an error.  (Bug#13298)
+       (basic-save-buffer): Likewise.
 
 2012-12-29  Fabián Ezequiel Gallina  <fgallina@cuca>
 

diff --git a/lisp/files.el b/lisp/files.el
index fb82d0dbe1f9e300557a2cf36f5cc6f44fa73cf0..e8be1a09047d1073eb407850a07ed94d9a375f31 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4621,9 +4621,11 @@ Before and after saving the buffer, this function runs
            (if setmodes
                (condition-case ()
                    (progn
-                     (set-file-modes buffer-file-name (car setmodes))
-                     (set-file-extended-attributes buffer-file-name
-                                                   (nth 1 setmodes)))
+                     (unless
+                         (with-demoted-errors
+                           (set-file-modes buffer-file-name (car setmodes)))
+                       (set-file-extended-attributes buffer-file-name
+                                                     (nth 1 setmodes))))
                  (error nil))))
          ;; If the auto-save file was recent before this command,
          ;; delete it now.