[Emacs-diffs] /srv/bzr/emacs/trunk r111370: Fix last commit.

[Eli Zaretskii]

------------------------------------------------------------
revno: 111370
fixes bug: http://debbugs.gnu.org/13298
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-12-29 16:58:41 +0200
message:
  Fix last commit.
  
   lisp/files.el (basic-save-buffer): If set-file-extended-attributes
   fails, fall back on set-file-modes.
modified:
  lisp/ChangeLog
  lisp/files.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-29 14:32:36 +0000
+++ b/lisp/ChangeLog    2012-12-29 14:58:41 +0000
@@ -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  <address@hidden>
 

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2012-12-29 14:32:36 +0000
+++ b/lisp/files.el     2012-12-29 14:58:41 +0000
@@ -4621,9 +4621,11 @@
            (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.