From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 10 May 2005 09:09:58 +0000 (+0000)
Subject: (custom-file): Call file-chase-links.
X-Git-Tag: ttn-vms-21-2-B4~414
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=541044b0e19f365cdb882d7d68bbf9acf37a37e8;p=emacs.git

(custom-file): Call file-chase-links.
---

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 93b310fdb17..50c9accb9ce 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -3835,20 +3835,21 @@ if only the first line of the docstring is shown."))
 
 (defun custom-file ()
   "Return the file name for saving customizations."
-  (or custom-file
-      (let ((user-init-file user-init-file)
-	    (default-init-file
-	      (if (eq system-type 'ms-dos) "~/_emacs" "~/.emacs")))
-	(when (null user-init-file)
-	  (if (or (file-exists-p default-init-file)
-		  (and (eq system-type 'windows-nt)
-		       (file-exists-p "~/_emacs")))
-	      ;; Started with -q, i.e. the file containing
-	      ;; Custom settings hasn't been read.  Saving
-	      ;; settings there would overwrite other settings.
-	      (error "Saving settings from \"emacs -q\" would overwrite existing customizations"))
-	  (setq user-init-file default-init-file))
-	user-init-file)))
+  (file-chase-links
+   (or custom-file
+       (let ((user-init-file user-init-file)
+	     (default-init-file
+	       (if (eq system-type 'ms-dos) "~/_emacs" "~/.emacs")))
+	 (when (null user-init-file)
+	   (if (or (file-exists-p default-init-file)
+		   (and (eq system-type 'windows-nt)
+			(file-exists-p "~/_emacs")))
+	       ;; Started with -q, i.e. the file containing
+	       ;; Custom settings hasn't been read.  Saving
+	       ;; settings there would overwrite other settings.
+	       (error "Saving settings from \"emacs -q\" would overwrite existing customizations"))
+	   (setq user-init-file default-init-file))
+	 user-init-file))))
 
 (defun custom-save-delete (symbol)
   "Visit `custom-file' and delete all calls to SYMBOL from it.