mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-01 11:14:55 +00:00
Code Issues Releases Activity

(command-line): On MS-Windows, probe "~", not "~USER", for warning about

Browse Source 
non-existent home directory
This commit is contained in:
Eli Zaretskii 2006-05-05 11:36:34 +00:00
parent a12aece309
commit 1df1e49eb3
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ChangeLog
View File

@ -1,5 +1,8 @@
2006-05-05 Eli Zaretskii <eliz@gnu.org>
* startup.el (command-line): On MS-Windows, probe "~", not
"~USER", for warning about non-existent home directory
* arc-mode.el (archive-l-e): New optional argument `float' means
generate a float value.
(archive-arc-summarize, archive-lzh-summarize)

11
lisp/startup.el
View File

@ -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"