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

lisp/ChangeLog

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

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.