(command-line): On MS-Windows, probe "~", not "~USER", for warning about

non-existent home directory

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 18b105e9a3dcd9e60029bfe8f00b18b54ec3a6f6..07531c468109ed1719035784ce784742bd696f71 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2006-05-05  Eli Zaretskii  <eliz@gnu.org>
 
+       * startup.el (command-line): On MS-Windows, probe "~", not
+       "~USER", for warning about non-existent home directory
+
        * arc-mode.el (archive-l-e): New optional argument `float' means
        generate a float value.
        (archive-arc-summarize, archive-lzh-summarize)

diff --git a/lisp/startup.el b/lisp/startup.el
index 8369ecddd4248d3e98c1c280c1778710d16932eb..a9a79e63be4b41e08e22b0357cf062195be96b2d 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -820,7 +820,16 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
                           (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"