Mercurial > emacs
changeset 70390:0712a8b0bd8a
(command-line): On MS-Windows, probe "~", not "~USER", for warning about
non-existent home directory
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 05 May 2006 11:36:00 +0000 |
| parents | 5f67d565fee5 |
| children | 8a56ebbd6666 |
| files | lisp/startup.el |
| diffstat | 1 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/startup.el Fri May 05 10:58:10 2006 +0000 +++ b/lisp/startup.el Fri May 05 11:36:00 2006 +0000 @@ -820,7 +820,16 @@ (format "Invalid user name %s" init-file-user) :error) - (if (file-directory-p (expand-file-name (concat "~" init-file-user))) + (if (file-directory-p (expand-file-name + ;; We don't support ~USER on MS-Windows except + ;; for the current user, and always load .emacs + ;; from the current user's home directory (see + ;; below). So always check "~", even if invoked + ;; with "-u USER", or if $USER or $LOGNAME are + ;; set to something different. + (if (eq system-type 'windows-nt) + "~" + (concat "~" init-file-user)))) nil (display-warning 'initialization (format "User %s has no home directory"