Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
5463218c
Commit
5463218c
authored
Nov 08, 2008
by
Eli Zaretskii
Browse files
(command-line): Ignore init-file-user when checking user's home directory
on MS-DOS as well.
parent
ee107a89
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
7 deletions
+14
-7
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/startup.el
lisp/startup.el
+9
-7
No files found.
lisp/ChangeLog
View file @
5463218c
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.
...
...
lisp/startup.el
View file @
5463218c
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment