From b953882a75068e079a99cfc86a5c0e9796d604bd Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 8 Jul 2015 17:22:15 +0300 Subject: [PATCH] Support "minimized" property of runemacs's shortcut * nt/runemacs.c (WinMain): If runemacs is invoked "minimized", pass the '--iconic' switch to Emacs. (Bug#20991) --- nt/runemacs.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nt/runemacs.c b/nt/runemacs.c index 3fcf405f6d4..905ef30a5d1 100644 --- a/nt/runemacs.c +++ b/nt/runemacs.c @@ -59,6 +59,7 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow) char *new_cmdline; char *p; char modname[MAX_PATH]; + static const char iconic_opt[] = "--iconic "; if (!ensure_unicows_dll ()) goto error; @@ -71,7 +72,10 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow) goto error; *p = 0; - new_cmdline = alloca (MAX_PATH + strlen (cmdline) + 3); + new_cmdline = alloca (MAX_PATH + + strlen (cmdline) + + (nShow == SW_SHOWMINNOACTIVE) * strlen (iconic_opt) + + 3); /* Quote executable name in case of spaces in the path. */ *new_cmdline = '"'; strcpy (new_cmdline + 1, modname); @@ -140,6 +144,11 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow) 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. */ + if (nShow == SW_SHOWMINNOACTIVE) + strcat (new_cmdline, iconic_opt); strcat (new_cmdline, cmdline); /* Set emacs_dir variable if runemacs was in "%emacs_dir%\bin". */ -- 2.39.5