1 files changed, 8 insertions, 0 deletions

diff --git a/lisp/startup.el b/lisp/startup.el
index 53539c6185f..6af6e748ee5 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -797,6 +797,14 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
     ;; the startup message.
     (setq inhibit-startup-message nil)
 
+    ;; Warn for invalid user name.
+    (and init-file-user
+         (not (file-directory-p (expand-file-name (concat "~" init-file-user))))
+         (display-warning 'initialization
+                          (format "User %s has no home directory"
+                                  init-file-user)
+                          :error))
+
     ;; Load that user's init file, or the default one, or none.
     (let (debug-on-error-from-init-file
           debug-on-error-should-be-set