From ec1b09b12339df0920e8901c6bd355a7afd2bc11 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 23 Jul 2012 20:27:41 +0300 Subject: [PATCH] Fix displaying the user name in error message about no home directory. lisp/startup.el (command-line): Don't display an empty user name in the error message about non-existent home directory, when init-file-user was set to an empty string. See http://lists.gnu.org/archive/html/bug-gnu-emacs/2012-07/msg00835.html for the details and context. --- lisp/ChangeLog | 8 ++++++++ lisp/startup.el | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5dee987d401..b43706a0bef 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2012-07-23 Eli Zaretskii + + * startup.el (command-line): Don't display an empty user name in + the error message about non-existent home directory, when + init-file-user was set to an empty string. See + http://lists.gnu.org/archive/html/bug-gnu-emacs/2012-07/msg00835.html + for the details and context. + 2012-07-22 Vincent Belaïche * ses.el (ses-cell-formula-aset): New macro. diff --git a/lisp/startup.el b/lisp/startup.el index e861a333a76..348e653dd28 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1001,7 +1001,9 @@ Amongst another things, it parses the command-line arguments." nil (display-warning 'initialization (format "User %s has no home directory" - init-file-user) + (if (equal init-file-user "") + (user-real-login-name) + init-file-user)) :error)))) ;; Load that user's init file, or the default one, or none. -- 2.39.2