Mercurial > emacs

diff lisp/subr.el @ 99184:fc215de0bf93

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* subr.el (locate-user-emacs-file): Simplify. Don't create `user-emacs-directory' when Emacs is running in batch mode.
author Juanma Barranquero <lekktu@gmail.com>
date Tue, 28 Oct 2008 11:35:02 +0000
parents a96e658622b6
children d646820f5ba2
line wrap: on
line diff
--- a/lisp/subr.el	Tue Oct 28 11:17:05 2008 +0000
+++ b/lisp/subr.el	Tue Oct 28 11:35:02 2008 +0000
@@ -2169,10 +2169,12 @@
 	  (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)))))