(command-line): Ignore init-file-user when checking user's home directory

on MS-DOS as well.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 27b856b..d23eb3e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-08  Eli Zaretskii  <eliz@gnu.org>
+
+       * startup.el (command-line): Ignore init-file-user when checking
+       user's home directory on MS-DOS as well.
+
 2008-11-07  Sam Steingold  <sds@gnu.org>
 
        * progmodes/cc-cmds.el (c-defun-name): Fix CLISP DEFUN handling.

diff --git a/lisp/startup.el b/lisp/startup.el
index 1532093..6306fa7 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -977,13 +977,15 @@ opening the first frame (e.g. open a connection to an X server).")
                                   init-file-user)
                           :error)
        (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)
+                              ;; We don't support ~USER on MS-Windows
+                              ;; and MS-DOS 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 (memq system-type '(windows-nt ms-dos))
                                   "~"
                                 (concat "~" init-file-user))))
            nil