X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ff2de6d2bb239c5fdcfaba2c8efd5c62610e3b7d..9f6f48455f7d25e5cc2d50485d98ff3af43946a2:/nt/addpm.c

diff --git a/nt/addpm.c b/nt/addpm.c
index de09fd5382..361726b10e 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -1,6 +1,5 @@
 /* Add entries to the GNU Emacs Program Manager folder.
-   Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-     2008, 2009, 2010  Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -67,8 +66,8 @@ DdeCallback (UINT uType, UINT uFmt, HCONV hconv,
 
 static struct entry
 {
-  char *name;
-  char *value;
+  const char *name;
+  const char *value;
 }
 env_vars[] =
 {
@@ -85,7 +84,7 @@ env_vars[] =
 };
 
 BOOL
-add_registry (char *path)
+add_registry (const char *path)
 {
   HKEY hrootkey = NULL;
   int i;
@@ -178,7 +177,7 @@ add_registry (char *path)
 
   for (i = 0; i < (sizeof (env_vars) / sizeof (env_vars[0])); i++)
     {
-      char * value = env_vars[i].value ? env_vars[i].value : path;
+      const char * value = env_vars[i].value ? env_vars[i].value : path;
 
       if (RegSetValueEx (hrootkey, env_vars[i].name,
 			 0, REG_EXPAND_SZ,
@@ -198,8 +197,8 @@ main (int argc, char *argv[])
   int shortcuts_created = 0;
   int com_available = 1;
   char modname[MAX_PATH];
-  char *prog_name;
-  char *emacs_path;
+  const char *prog_name;
+  const char *emacs_path;
   char *p;
   int quiet = 0;
   HRESULT result;
@@ -251,7 +250,7 @@ main (int argc, char *argv[])
 			       MB_OKCANCEL | MB_ICONQUESTION);
 	  if (result != IDOK)
 	    {
-	      fprintf (stderr, "Install cancelled\n");
+	      fprintf (stderr, "Install canceled\n");
 	      exit (1);
 	    }
 	}
@@ -275,8 +274,6 @@ main (int argc, char *argv[])
     {
       if (strlen (start_folder) < (MAX_PATH - 20))
 	{
-	  BOOL retval;
-
 	  strcat (start_folder, "\\Gnu Emacs");
 	  if (CreateDirectory (start_folder, NULL)
 	      || GetLastError () == ERROR_ALREADY_EXISTS)
@@ -308,8 +305,6 @@ main (int argc, char *argv[])
       /* Ensure there is enough room for "...\GNU Emacs\Emacs.lnk".  */
       if (strlen (start_folder) < (MAX_PATH - 20))
 	{
-	  BOOL retval;
-
 	  strcat (start_folder, "\\Gnu Emacs");
 	  if (CreateDirectory (start_folder, NULL)
 	      || GetLastError () == ERROR_ALREADY_EXISTS)
@@ -370,6 +365,3 @@ main (int argc, char *argv[])
 
   return 0;
 }
-
-/* arch-tag: f923609d-b781-4ef4-abce-ca0da29cbbf0
-   (do not change this comment) */