(custom-save-all): Avoid destrying symlink if already visiting the

custom file.

1 files changed, 13 insertions, 2 deletions

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 0446102eb09..5201256bcab 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -4207,9 +4207,17 @@ if only the first line of the docstring is shown."))
                              (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))
@@ -4217,7 +4225,10 @@ if only the first line of the docstring is shown."))
         (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