Commit 2bea2795 authored by Juanma Barranquero's avatar Juanma Barranquero

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

  `user-emacs-directory' when Emacs is running in batch mode.
parent eeaa563e
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>
......
......@@ -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)))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment