X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/4f308f7304c763b5a4b581716515e9a6ce9cec33..0bfd44c1806f9e589f79e9bc8f4b2a5aab7e4df3:/lisp/startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index 8369ecddd4..b81d8b811e 100644
--- 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"
@@ -1298,7 +1307,9 @@ where FACE is a valid face specification, as it can be used with
     (set-buffer buffer)
     (erase-buffer)
     (if pure-space-overflow
-	(insert "Warning Warning  Pure space overflow   Warning Warning\n"))
+	(insert "\
+Warning Warning!!!  Pure space overflow    !!!Warning Warning
+\(See the node Building Emacs in the Lisp manual for details.)\n"))
     (fancy-splash-head)
     (apply #'fancy-splash-insert text)
     (fancy-splash-tail)
@@ -1407,7 +1418,9 @@ we put it on this frame."
                (propertize "---- %b %-" 'face '(:weight bold)))
 
           (if pure-space-overflow
-              (insert "Warning Warning  Pure space overflow   Warning Warning\n"))
+              (insert "\
+Warning Warning!!!  Pure space overflow    !!!Warning Warning
+\(See the node Building Emacs in the Lisp manual for details.)\n"))
 
           ;; The convention for this piece of code is that
           ;; each piece of output starts with one or two newlines