From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 8 Nov 2008 13:16:17 +0000 (+0000)
Subject: (command-line): Ignore init-file-user when checking user's home directory
X-Git-Tag: emacs-pretest-23.0.90~1914
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5463218ceb256c65db72a836bbdcabf536482fb0;p=emacs.git

(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 27b856bc9bc..d23eb3eda06 100644
--- 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 1532093ceec..6306fa78367 100644
--- 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