mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-16 17:19:41 +00:00
Code Issues Releases Activity

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

Browse Source 
`user-emacs-directory' when Emacs is running in batch mode.
This commit is contained in:
Juanma Barranquero 2008-10-28 11:35:02 +00:00
parent eeaa563e84
commit 2bea27959e
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -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>

10
lisp/subr.el
View File

@ -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)))))