2 files changed, 8 insertions, 3 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 07550e1b2d2..05f01767bd3 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-19  Juanma Barranquero  <lekktu@gmail.com>
+
+        * addpm.c (add_registry): Create App Paths of type REG_EXPAND_SZ.
+
 2010-08-12  Jason Rumney  <jasonr@gnu.org>
 
         * addpm.c (add_registry): Set path for runemacs.exe to use.
diff --git a/nt/addpm.c b/nt/addpm.c
index 4fcebe2ca14..de09fd5382c 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -113,7 +113,7 @@ add_registry (char *path)
       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 @@ add_registry (char *path)
                   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 @@ add_registry (char *path)
                                       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);