mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

(command-line): Ignore init-file-user when checking user's home directory

Browse source 
on MS-DOS as well.
This commit is contained in:
Eli Zaretskii 2008-11-08 13:16:17 +00:00
parent ee107a899d
commit 5463218ceb
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2008-11-08 Eli Zaretskii <eliz@gnu.org>
* startup.el (command-line): Ignore init-file-user when checking
user's home directory on MS-DOS as well.
2008-11-07 Sam Steingold <sds@gnu.org>
* progmodes/cc-cmds.el (c-defun-name): Fix CLISP DEFUN handling.

16
lisp/startup.el
View file

@ -977,13 +977,15 @@ opening the first frame (e.g. open a connection to an X server).")
init-file-user)
:error)
(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)
;; We don't support ~USER on MS-Windows
;; and MS-DOS 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 (memq system-type '(windows-nt ms-dos))
"~"
(concat "~" init-file-user))))
nil