X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/71936d675333ffe1a9638a755bccfd9006bd5404..bb05142310581fe66bd9920406544c58976997ed:/nt/runemacs.c

diff --git a/nt/runemacs.c b/nt/runemacs.c
index c43c7b6136..ab9620c0b0 100644
--- a/nt/runemacs.c
+++ b/nt/runemacs.c
@@ -1,11 +1,12 @@
-/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+     Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,9 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 /*
@@ -33,7 +32,7 @@ Boston, MA 02110-1301, USA.  */
    is running emacs.exe already, you cannot install a newer version.
    By defining CHOOSE_NEWEST_EXE, you can name your new emacs.exe
    something else which matches "emacs*.exe", and runemacs will
-   automatically select the newest emacs executeable in the bin directory.
+   automatically select the newest emacs executable in the bin directory.
    (So you'll probably be able to delete the old version some hours/days
    later).
 */
@@ -44,12 +43,13 @@ Boston, MA 02110-1301, USA.  */
 #include <string.h>
 #include <malloc.h>
 
+static void set_user_model_id ();
+
 int WINAPI
 WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow)
 {
   STARTUPINFO start;
   SECURITY_ATTRIBUTES sec_attrs;
-  SECURITY_DESCRIPTOR sec_desc;
   PROCESS_INFORMATION child;
   int wait_for_child = FALSE;
   DWORD priority_class = NORMAL_PRIORITY_CLASS;
@@ -58,6 +58,8 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow)
   char *p;
   char modname[MAX_PATH];
 
+  set_user_model_id ();
+
   if (!GetModuleFileName (NULL, modname, MAX_PATH))
     goto error;
   if ((p = strrchr (modname, '\\')) == NULL)
@@ -85,13 +87,13 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow)
       goto error;
     do
       {
-        if (wfd.ftLastWriteTime.dwHighDateTime > best_time.dwHighDateTime
-            || (wfd.ftLastWriteTime.dwHighDateTime == best_time.dwHighDateTime
-                && wfd.ftLastWriteTime.dwLowDateTime > best_time.dwLowDateTime))
-          {
-            best_time = wfd.ftLastWriteTime;
-            strcpy (best_name, wfd.cFileName);
-          }
+	if (wfd.ftLastWriteTime.dwHighDateTime > best_time.dwHighDateTime
+	    || (wfd.ftLastWriteTime.dwHighDateTime == best_time.dwHighDateTime
+		&& wfd.ftLastWriteTime.dwLowDateTime > best_time.dwLowDateTime))
+	  {
+	    best_time = wfd.ftLastWriteTime;
+	    strcpy (best_name, wfd.cFileName);
+	  }
       }
     while (FindNextFile (fh, &wfd));
     FindClose (fh);
@@ -109,9 +111,9 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow)
     {
       if (strncmp (cmdline+1, "wait", 4) == 0)
 	{
-      wait_for_child = TRUE;
-      cmdline += 5;
-    }
+	  wait_for_child = TRUE;
+	  cmdline += 5;
+	}
       else if (strncmp (cmdline+1, "high", 4) == 0)
 	{
 	  priority_class = HIGH_PRIORITY_CLASS;
@@ -124,7 +126,10 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow)
 	}
       else
 	break;
+      /* Look for next argument.  */
+      while (*++cmdline == ' ');
     }
+
   strcat (new_cmdline, cmdline);
 
   /* Set emacs_dir variable if runemacs was in "%emacs_dir%\bin".  */
@@ -169,5 +174,32 @@ error:
   return 1;
 }
 
+void set_user_model_id ()
+{
+  HMODULE shell;
+  HRESULT (WINAPI * set_user_model) (wchar_t * id);
+
+  /* On Windows 7 and later, we need to set the user model ID
+     to associate emacsclient launched files with Emacs frames
+     in the UI.  */
+  shell = LoadLibrary ("shell32.dll");
+  if (shell)
+    {
+      set_user_model
+	= (void *) GetProcAddress (shell,
+				   "SetCurrentProcessExplicitAppUserModelID");
+
+      /* If the function is defined, then we are running on Windows 7
+	 or newer, and the UI uses this to group related windows
+	 together.  Since emacs, runemacs, emacsclient are related, we
+	 want them grouped even though the executables are different,
+	 so we need to set a consistent ID between them.  */
+      if (set_user_model)
+	set_user_model (L"GNU.Emacs");
+
+      FreeLibrary (shell);
+    }
+}
+
 /* arch-tag: 7e02df73-4df7-4aa0-baea-99c6d047a384
    (do not change this comment) */