From fd9fad062f45d041260e1678311f08ffa926bfff Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Sat, 25 Jun 2016 12:24:06 -0400 Subject: Give more helpful warning about setting HOME * src/w32.c (init_environment): Improve warning message that pops when Emacs sets HOME according to existence of C:\.emacs (Bug #11612). Co-authored-by: Eli Zaretskii --- src/w32.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/w32.c') diff --git a/src/w32.c b/src/w32.c index c26f14593f1..6948fdeeef3 100644 --- a/src/w32.c +++ b/src/w32.c @@ -2773,10 +2773,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' " + "in the environment is deprecated,\n" + "see `Windows Home' in the Emacs manual."))), + Vdelayed_warnings_list); } if (lpval) -- cgit v1.2.3 From c150a6461bce92fde6a8859b49d00814a0b8c9cf Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Mon, 27 Jun 2016 07:56:56 -0400 Subject: ; Fix typo in commit before last --- src/w32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/w32.c') diff --git a/src/w32.c b/src/w32.c index 6948fdeeef3..2478b454a74 100644 --- a/src/w32.c +++ b/src/w32.c @@ -2778,8 +2778,8 @@ init_environment (char ** argv) intern ("initialization"), build_string ("Use of `C:\\.emacs' without defining `HOME' " "in the environment is deprecated,\n" - "see `Windows Home' in the Emacs manual."))), - Vdelayed_warnings_list); + "see `Windows Home' in the Emacs manual.")), + Vdelayed_warnings_list); } if (lpval) -- cgit v1.2.3 From 272ddc6793243a48dc61f0734cbd80a3377cb788 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Mon, 27 Jun 2016 18:28:51 -0400 Subject: Fixup warning message regarding HOME a bit more * src/w32.c (init_environment): The manual section title is "Windows HOME" (Bug #11612). Move newline so warning fits in 80 character lines. --- src/w32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/w32.c') diff --git a/src/w32.c b/src/w32.c index 2478b454a74..793bc0f28d0 100644 --- a/src/w32.c +++ b/src/w32.c @@ -2776,9 +2776,9 @@ init_environment (char ** argv) = Fcons (listn (CONSTYPE_HEAP, 2, intern ("initialization"), build_string - ("Use of `C:\\.emacs' without defining `HOME' " - "in the environment is deprecated,\n" - "see `Windows Home' in the Emacs manual.")), + ("Use of `C:\\.emacs' without defining `HOME'\n" + "in the environment is deprecated, " + "see `Windows HOME' in the Emacs manual.")), Vdelayed_warnings_list); } -- cgit v1.2.3