/* runemacs --- Simple program to start Emacs with its console window hidden.
-Copyright (C) 2001-2015 Free Software Foundation, Inc.
+Copyright (C) 2001-2016 Free Software Foundation, Inc.
This file is part of GNU Emacs.
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 3 of the License, 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
char *new_cmdline;
char *p;
char modname[MAX_PATH];
+ static const char iconic_opt[] = "--iconic ", maximized_opt[] = "--maximized ";
if (!ensure_unicows_dll ())
goto error;
goto error;
*p = 0;
- new_cmdline = alloca (MAX_PATH + strlen (cmdline) + 3);
+ new_cmdline = alloca (MAX_PATH
+ + strlen (cmdline)
+ + ((nShow == SW_SHOWMINNOACTIVE
+ || nShow == SW_SHOWMAXIMIZED)
+ ? max (sizeof (iconic_opt), sizeof (maximized_opt))
+ : 0)
+ + 3);
/* Quote executable name in case of spaces in the path. */
*new_cmdline = '"';
strcpy (new_cmdline + 1, modname);
while (*++cmdline == ' ');
}
+ /* If the desktop shortcut properties tell to invoke runemacs
+ minimized, or if they invoked runemacs via "start /min", pass
+ '--iconic' to Emacs, as that's what users will expect. Likewise
+ with invoking runemacs maximized: pass '--maximized' to Emacs. */
+ if (nShow == SW_SHOWMINNOACTIVE)
+ strcat (new_cmdline, iconic_opt);
+ else if (nShow == SW_SHOWMAXIMIZED)
+ strcat (new_cmdline, maximized_opt);
strcat (new_cmdline, cmdline);
/* Set emacs_dir variable if runemacs was in "%emacs_dir%\bin". */
set_user_model_id (void)
{
HMODULE shell;
- HRESULT (WINAPI * set_user_model) (wchar_t * id);
+ HRESULT (WINAPI * set_user_model) (const wchar_t * id);
/* On Windows 7 and later, we need to set the user model ID
to associate emacsclient launched files with Emacs frames