From e963ef1ed065c8e6650fa1716b8ab99f7581781c Mon Sep 17 00:00:00 2001 From: Per Abrahamsen Date: Mon, 8 Sep 1997 19:17:57 +0000 Subject: *** empty log message *** --- lisp/cus-edit.el | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index b3d0b52db55..c08c41eb428 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -2918,23 +2918,18 @@ Optional EVENT is the location for the menu." ;;; The `custom-save-all' Function. ;;;###autoload -(defcustom custom-file (if (boundp 'emacs-user-extension-dir) - (concat "~" - init-file-user - emacs-user-extension-dir - "options.el") - (convert-standard-filename"~/.emacs")) +(defcustom custom-file nil "File used for storing customization information. -If you change this from the default \"~/.emacs\" (or \"~/_emacs\" -on MS-DOS) you need to explicitly load that file for the settings -to take effect." - :type 'file +The default is nil, which means to use your init file +as specified by `user-init-file'. If you specify some other file, +you need to explicitly load that file for the settings to take effect." + :type '(choice (const :tag "Your Emacs init file" nil) file) :group 'customize) (defun custom-save-delete (symbol) "Delete the call to SYMBOL form `custom-file'. Leave point at the location of the call, or after the last expression." - (set-buffer (find-file-noselect custom-file)) + (set-buffer (find-file-noselect (or custom-file user-init-file))) (goto-char (point-min)) (catch 'found (while t @@ -3041,7 +3036,7 @@ Leave point at the location of the call, or after the last expression." (custom-save-variables) (custom-save-faces) (save-excursion - (set-buffer (find-file-noselect custom-file)) + (set-buffer (find-file-noselect (or custom-file user-init-file))) (save-buffer)))) ;;; The Customize Menu. -- cgit v1.2.1