[Emacs-diffs] /srv/bzr/emacs/trunk r101140: nt/addpm.c (add_registry): Create App Paths of type REG_EXPAND_SZ.

[Juanma Barranquero]

------------------------------------------------------------
revno: 101140
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Thu 2010-08-19 18:38:41 +0200
message:
  nt/addpm.c (add_registry): Create App Paths of type REG_EXPAND_SZ.
modified:
  nt/ChangeLog
  nt/addpm.c

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2010-08-12 14:28:43 +0000
+++ b/nt/ChangeLog      2010-08-19 16:38:41 +0000
@@ -1,3 +1,7 @@
+2010-08-19  Juanma Barranquero  <address@hidden>
+
+       * addpm.c (add_registry): Create App Paths of type REG_EXPAND_SZ.
+
 2010-08-12  Jason Rumney  <address@hidden>
 
        * addpm.c (add_registry): Set path for runemacs.exe to use.

=== modified file 'nt/addpm.c'
--- a/nt/addpm.c        2010-08-12 14:28:43 +0000
+++ b/nt/addpm.c        2010-08-19 16:38:41 +0000
@@ -113,7 +113,7 @@
       emacs_path = (char *) alloca (len);
       sprintf (emacs_path, "%s\\bin\\emacs.exe", path);
 
-      RegSetValueEx (hrootkey, NULL, 0, REG_SZ, emacs_path, len);
+      RegSetValueEx (hrootkey, NULL, 0, REG_EXPAND_SZ, emacs_path, len);
 
       /* Look for a GTK installation. If found, add it to the library search
          path for Emacs so that the image libraries it provides are available
@@ -135,7 +135,8 @@
                   len = strlen (path) + 5 + size;
                   dll_paths = (char *) alloca (size + strlen (path) + 1);
                   sprintf (dll_paths, "%s\\bin;%s", path, gtk_path);
-                  RegSetValueEx (hrootkey, "Path", 0, REG_SZ, dll_paths, len);
+                  RegSetValueEx (hrootkey, "Path", 0, REG_EXPAND_SZ,
+                                dll_paths, len);
 
                  /* Set the same path for runemacs.exe, as the Explorer shell
                     looks this up, so the above does not take effect when
@@ -145,7 +146,7 @@
                                      KEY_WRITE, NULL, &runemacs_key, NULL)
                      == ERROR_SUCCESS)
                    {
-                     RegSetValueEx (runemacs_key, "Path", 0, REG_SZ,
+                     RegSetValueEx (runemacs_key, "Path", 0, REG_EXPAND_SZ,
                                     dll_paths, len);
 
                      RegCloseKey (runemacs_key);