# HG changeset patch # User Eli Zaretskii # Date 1226150106 0 # Node ID de3c8bf4f808eb0101b8179b21b6a18ce4a9d4bd # Parent 05580ce7beabb83a5dd27d6e0d9ee20eb259e6bf (command-line): Ignore init-file-user when checking user's home directory on MS-DOS as well. diff -r 05580ce7beab -r de3c8bf4f808 lisp/startup.el --- a/lisp/startup.el Sat Nov 08 13:02:38 2008 +0000 +++ b/lisp/startup.el Sat Nov 08 13:15:06 2008 +0000 @@ -977,13 +977,15 @@ 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