# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1217711240 0
# Node ID cc5f94eeb1d8fa81f36acf9c6ffbb011d1751a66
# Parent  145e6327f4da2ceb37ec59acec527fb0f9582687
(custom-save-all): Avoid destrying symlink if already visiting the
custom file.

diff -r 145e6327f4da -r cc5f94eeb1d8 lisp/cus-edit.el
--- a/lisp/cus-edit.el	Sat Aug 02 21:07:06 2008 +0000
+++ b/lisp/cus-edit.el	Sat Aug 02 21:07:20 2008 +0000
@@ -4265,9 +4265,18 @@
 			     (recentf-expand-file-name (custom-file)))
 			    "\\'")
 		    recentf-exclude)))
-	 (old-buffer (find-buffer-visiting filename)))
+	 (old-buffer (find-buffer-visiting filename))
+	 old-buffer-name)
+
     (with-current-buffer (let ((find-file-visit-truename t))
 			   (or old-buffer (find-file-noselect filename)))
+      ;; We'll save using file-precious-flag, so avoid destroying
+      ;; symlinks.  (If we're not already visiting the buffer, this is
+      ;; handled by find-file-visit-truename, above.)
+      (when old-buffer
+	(setq old-buffer-name (buffer-file-name))
+	(set-visited-file-name (file-chase-links filename)))
+
       (unless (eq major-mode 'emacs-lisp-mode)
 	(emacs-lisp-mode))
       (let ((inhibit-read-only t))
@@ -4275,7 +4284,10 @@
 	(custom-save-faces))
       (let ((file-precious-flag t))
 	(save-buffer))
-      (unless old-buffer
+      (if old-buffer
+	  (progn
+	    (set-visited-file-name old-buffer-name)
+	    (set-buffer-modified-p nil))
 	(kill-buffer (current-buffer))))))
 
 ;;;###autoload