diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-05 14:06:59 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-05 14:06:59 -0700 |
| commit | 80fcf41d31ae2a4815a1cb63bf08a88a3c7910b5 (patch) | |
| tree | 6fd85620c6a3ae3667720695cfc42c659b665f64 /src/w32.c | |
| parent | 8d9ad899f11ec2a6763617ba069fdaf3889ac4e1 (diff) | |
| parent | 850ba444a7be542c8dc92efbeb4031868f3f779d (diff) | |
| download | emacs-80fcf41d31ae2a4815a1cb63bf08a88a3c7910b5.tar.gz | |
Merge from origin/emacs-25
850ba44 Clarify lexical binding with symbol args behavior
f981b31 * lisp/net/tramp-sh.el (tramp-remote-path): Doc fix.
68fc964 * lisp/net/tramp-sh.el (tramp-remote-path): Doc fix. (Bug#23...
21110af Avoid assertion violations when rendering some fonts
6192b6c Document more details of package activation
272ddc6 Fixup warning message regarding HOME a bit more
43206d6 * lisp/leim/quail/indian.el ("bengali-probhat"): Change indic...
d41f7ff Fix input method "probhat" for Bengali
c150a64 ; Fix typo in commit before last
ebf0472 Add to elisp-completion-at-point's docstring
fd9fad0 Give more helpful warning about setting HOME
ea6b01d ; * lisp/term.el (term-mode): FIXME comment about bidi reorde...
# Conflicts:
# lisp/term.el
Diffstat (limited to 'src/w32.c')
| -rw-r--r-- | src/w32.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/w32.c b/src/w32.c index 71a38b91946..1db34260978 100644 --- a/src/w32.c +++ b/src/w32.c @@ -2822,10 +2822,13 @@ init_environment (char ** argv) } if (strcmp (env_vars[i].name, "HOME") == 0 && !appdata) Vdelayed_warnings_list - = Fcons (listn (CONSTYPE_HEAP, 2, - intern ("initialization"), - build_string ("Setting HOME to C:\\ by default is deprecated")), - Vdelayed_warnings_list); + = Fcons + (listn (CONSTYPE_HEAP, 2, + intern ("initialization"), build_string + ("Use of `C:\\.emacs' without defining `HOME'\n" + "in the environment is deprecated, " + "see `Windows HOME' in the Emacs manual.")), + Vdelayed_warnings_list); } if (lpval) |