mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

(custom-file): Don't assume we were invoked with -q unless ~/.emacs exists.

Browse source
This commit is contained in:
Eli Zaretskii 2001-05-27 10:38:51 +00:00
parent d2b747a847
commit 71261a01d3
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -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).

5
lisp/cus-edit.el
View file

@ -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.