[Emacs-diffs] /srv/bzr/emacs/trunk r109195: Fix displaying the user name in error message about no home directory.

[Eli Zaretskii]

------------------------------------------------------------
revno: 109195
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2012-07-23 20:27:41 +0300
message:
  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.
modified:
  lisp/ChangeLog
  lisp/startup.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-22 21:14:12 +0000
+++ b/lisp/ChangeLog    2012-07-23 17:27:41 +0000
@@ -1,3 +1,11 @@
+2012-07-23  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * ses.el (ses-cell-formula-aset): New macro.

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2012-07-20 10:29:32 +0000
+++ b/lisp/startup.el   2012-07-23 17:27:41 +0000
@@ -1001,7 +1001,9 @@
            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.