From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 29 Dec 2012 14:58:41 +0000 (+0200)
Subject: Fix last commit.
X-Git-Tag: emacs-24.3.90~173^2~7^2~452
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7e56b103166f740bcfdc2d77b6b886c3c2b173c2;p=emacs.git

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 0beb4a73185..c41cfe1b25f 100644
--- 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 fb82d0dbe1f..e8be1a09047 100644
--- 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.