* lisp/cus-edit.el (custom-file): Consider init-file-had-error

In case `(and (null custom-file) init-file-had-error)' do the same
thing we'd do if `(null user-init-file)', which is to either error out
or return nil.  This is in line with `custom-save-all' which would
throw an error in that situation. (bug#20355)

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index cd894f47263b1f6f7ed818a77640a71385e57fb6..9f57d0da24a3d6ccf4057f37c2abbe6e6265858b 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -4377,7 +4377,8 @@ if only the first line of the docstring is shown."))
 
 (defun custom-file (&optional no-error)
   "Return the file name for saving customizations."
-  (if (null user-init-file)
+  (if (or (null user-init-file)
+          (and (null custom-file) init-file-had-error))
       ;; Started with -q, i.e. the file containing Custom settings
       ;; hasn't been read.  Saving settings there won't make much
       ;; sense.