diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2001-05-27 10:38:51 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2001-05-27 10:38:51 +0000 |
| commit | 71261a01d39bff61ec7de6b85c621452a9d094b4 (patch) | |
| tree | 78e67951f9e4f679f286ac66aed7d3452b90b73d /lisp | |
| parent | d2b747a84703c7772c0138e57d4c42b1a421d115 (diff) | |
| download | emacs-71261a01d39bff61ec7de6b85c621452a9d094b4.tar.gz | |
(custom-file): Don't assume we were invoked with -q unless ~/.emacs exists.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/cus-edit.el | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7d513375741..11cbd4f8ed7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2001-05-27 Eli Zaretskii <eliz@is.elta.co.il> + * cus-edit.el (custom-file): Don't assume we were invoked with -q + unless ~/.emacs exists. + * novice.el (enable-command): If user-init-file is nil or does not exist, default to "~/.emacs" (~/_emacs on DOS and, maybe, Windows). diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index e3e1421db4f..b36414d3ac6 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -3447,7 +3447,10 @@ to the new custom file. This will preserve your existing customizations." (defun custom-file () "Return the file name for saving customizations." - (if (null user-init-file) + (if (and (null user-init-file) + (or (file-exists-p "~/.emacs") + (and (memq system-type '(ms-dos 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. |