aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/cus-edit.el
diff options
context:
space:
mode:
authorRichard M. Stallman <[email protected]>2005-05-10 09:09:58 +0000
committerRichard M. Stallman <[email protected]>2005-05-10 09:09:58 +0000
commit541044b0e19f365cdb882d7d68bbf9acf37a37e8 (patch)
tree433adeddb391e69253ce6cfb5ae05d69b394a0c9 /lisp/cus-edit.el
parentcc45837e571e9dd9845f1e00ab56893d8dde7dd5 (diff)
(custom-file): Call file-chase-links.
Diffstat (limited to 'lisp/cus-edit.el')
-rw-r--r--lisp/cus-edit.el29
1 files changed, 15 insertions, 14 deletions
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 93b310fdb1..50c9accb9c 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.