Mercurial > emacs
changeset 99184:fc215de0bf93
* 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 | 5f8d9a97e74f |
| children | a4d853355dca |
| files | lisp/ChangeLog lisp/subr.el |
| diffstat | 2 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Oct 28 11:17:05 2008 +0000 +++ b/lisp/ChangeLog Tue Oct 28 11:35:02 2008 +0000 @@ -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>
--- 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)))))