(normal-splash-screen, fancy-splash-screens-1): Add a reference to the Lisp

[gnu-emacs] / nt / addpm.c

diff --git a/nt/addpm.c b/nt/addpm.c
index ccae76c1f20c951ddad6322fa1289d63632daf92..08d84c70b81c0549b68eebf6092ee486f09926c4 100644 (file)
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -1,5 +1,6 @@
 /* Add entries to the GNU Emacs Program Manager folder.
-   Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2002, 2003, 2004, 2005,
+      2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /****************************************************************************
  *
@@ -70,19 +71,23 @@ add_registry (path)
      char *path;
 {
   HKEY hrootkey = NULL;
-  DWORD dwDisp;
   int i;
   BOOL ok = TRUE;
 
+  /* Previous versions relied on registry settings, but we do not need
+     them any more.  If registry settings are installed from a previous
+     version, replace them to ensure they are the current settings.
+     Otherwise, do nothing.  */
+
   /* Check both the current user and the local machine to see if we
      have any resources.  */
 
-  if (RegCreateKeyEx (HKEY_LOCAL_MACHINE, REG_ROOT,
-                     0, "", REG_OPTION_NON_VOLATILE,
-                     KEY_WRITE, NULL, &hrootkey, &dwDisp) != ERROR_SUCCESS
-      && RegCreateKeyEx (HKEY_CURRENT_USER, REG_ROOT,
-                        0, "", REG_OPTION_NON_VOLATILE,
-                        KEY_WRITE, NULL, &hrootkey, &dwDisp) != ERROR_SUCCESS)
+  if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, REG_ROOT,
+                     REG_OPTION_NON_VOLATILE,
+                     KEY_WRITE, &hrootkey) != ERROR_SUCCESS
+      && RegOpenKeyEx (HKEY_CURRENT_USER, REG_ROOT,
+                        REG_OPTION_NON_VOLATILE,
+                        KEY_WRITE, &hrootkey) != ERROR_SUCCESS)
     {
       return FALSE;
     }
@@ -121,12 +126,14 @@ main (argc, argv)
 #if 0
   if (argc < 2 || argc > 3)
     {
-      fprintf (stderr, "usage: addpm [/q] [emacs_path [icon_path]]\n");
+      fprintf (stderr, "usage: addpm [-q] [emacs_path [icon_path]]\n");
       exit (1);
     }
 #endif
 
-  if (argc > 1 && argv[1][0] == '/' && argv[1][1] == 'q')
+  if (argc > 1
+      && (argv[1][0] == '/' || argv[1][0] == '-')
+      && argv[1][1] == 'q')
     {
       quiet = 1;
       --argc;