[Emacs-diffs] /srv/bzr/emacs/trunk r104042: src/w32.c (init_environment): Warn about defaulting HOME to C:\.

[Juanma Barranquero]

------------------------------------------------------------
revno: 104042
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Thu 2011-04-28 21:51:12 +0200
message:
  src/w32.c (init_environment): Warn about defaulting HOME to C:\.
modified:
  src/ChangeLog
  src/w32.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-04-28 19:35:20 +0000
+++ b/src/ChangeLog     2011-04-28 19:51:12 +0000
@@ -1,5 +1,9 @@
 2011-04-28  Juanma Barranquero  <address@hidden>
 
+       * w32.c (init_environment): Warn about defaulting HOME to C:\.
+
+2011-04-28  Juanma Barranquero  <address@hidden>
+
        * keyboard.c (Qdelayed_warnings_hook): Define.
        (command_loop_1): Run `delayed-warnings-hook'
        if Vdelayed_warnings_list is non-nil.

=== modified file 'src/w32.c'
--- a/src/w32.c 2011-04-25 12:48:24 +0000
+++ b/src/w32.c 2011-04-28 19:51:12 +0000
@@ -1561,6 +1561,7 @@
     char locale_name[32];
     struct stat ignored;
     char default_home[MAX_PATH];
+    int appdata = 0;
 
     static const struct env_entry
     {
@@ -1614,7 +1615,10 @@
 
            /* If we can't get the appdata dir, revert to old behavior.  */
            if (profile_result == S_OK)
-             env_vars[0].def_value = default_home;
+             {
+               env_vars[0].def_value = default_home;
+               appdata = 1;
+             }
          }
       }
 
@@ -1701,6 +1705,14 @@
                lpval = env_vars[i].def_value;
                dwType = REG_EXPAND_SZ;
                dont_free = 1;
+               if (!strcmp (env_vars[i].name, "HOME") && !appdata)
+                 {
+                   Lisp_Object warning[2];
+                   warning[0] = intern ("initialization");
+                   warning[1] = build_string ("Setting HOME to C:\\ by default 
is deprecated");
+                   Vdelayed_warnings_list = Fcons (Flist (2, warning),
+                                                   Vdelayed_warnings_list);
+                 }
              }
 
            if (lpval)