# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 989244176 0
# Node ID bd93cba9ef3e80d5a88363ab35192ddaaf972c69
# Parent  df85a76987bb1ba5ae688e56c18debd12194d895
(custom-file): Signal an error if user-init-file is
nil (running -q).

diff -r df85a76987bb -r bd93cba9ef3e lisp/cus-edit.el
--- a/lisp/cus-edit.el	Mon May 07 13:43:10 2001 +0000
+++ b/lisp/cus-edit.el	Mon May 07 14:02:56 2001 +0000
@@ -1993,7 +1993,9 @@
 ;; the global custom one
 (defun custom-comment-show (widget)
   (widget-put widget :comment-shown t)
+  (trace-to-stderr (format "1: %s\n" (widget-value widget)))
   (custom-redraw widget)
+  (trace-to-stderr (format "2: %s\n" (widget-value widget)))
   (widget-setup))
 
 (defun custom-comment-invisible-p (widget)
@@ -3447,11 +3449,12 @@
 
 (defun custom-file ()
   "Return the file name for saving customizations."
-  (setq custom-file
-	(or custom-file
-	    user-init-file
-	    (read-file-name "File for customizations: "
-			    "~/" nil nil ".emacs"))))
+  (if (null user-init-file)
+      ;; Started with -q, i.e. the file containing Custom settings
+      ;; hasn't been read.  Saving settings there would overwrite
+      ;; other settings.
+      (error "Saving settings when running -q would overwrite existing settings")
+    (setq custom-file (or custom-file user-init-file))))
 
 (defun custom-save-delete (symbol)
   "Visit `custom-file' and delete all calls to SYMBOL from it.