* subr.el (locate-user-emacs-file): Simplify. Don't create

  `user-emacs-directory' when Emacs is running in batch mode.

2 files changed, 9 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 31be499710d..58467dead3b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-10-28  Juanma Barranquero  <lekktu@gmail.com>
 
+        * subr.el (locate-user-emacs-file): Simplify.  Don't create
+        `user-emacs-directory' when Emacs is running in batch mode.
+
         * startup.el (inhibit-startup-screen): Reflow docstring.
         (user-mail-address, tool-bar-images-pixel-height): Fix docstring typos.
 
@@ -4413,7 +4416,6 @@
         (vc-hg-diff): If no file is passed, use default-directory for cwd.
 
         * vc-bzr.el (vc-bzr-log-view-mode): Set log-view-per-file-logs.
-
         * vc-svn.el (vc-svn-log-view-mode): New derived mode.
 
 2008-06-15  Michael Albinus  <michael.albinus@gmx.de>
diff --git a/lisp/subr.el b/lisp/subr.el
index 0dda4b0e604..f0fe7be0700 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2169,10 +2169,12 @@ directory if it does not exist."
           (at-home (and old-name (expand-file-name old-name home))))
      (if (and at-home (file-readable-p at-home))
          at-home
-       (unless (or purify-flag ;; don't create dir while dumping
-                   (file-accessible-directory-p
-                    (directory-file-name user-emacs-directory)))
-         (make-directory user-emacs-directory t)) ;; don't catch errors
+       ;; Make sure `user-emacs-directory' exists,
+       ;; unless we're in batch mode or dumping Emacs
+       (or noninteractive
+           purify-flag
+           (file-accessible-directory-p (directory-file-name user-emacs-directory))
+           (make-directory user-emacs-directory))
        (expand-file-name new-name user-emacs-directory)))))