From b7b0cc709e6e9d3f267c471a97f58f29cc38da43 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 6 Feb 2019 17:56:44 +0200 Subject: [PATCH] Unbreak interactive invocation of temacs on MS-Windows * src/emacs.c (main) [WINDOWSNT]: Allow to invoke temacs interactively without the --temacs= option. --- src/emacs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/emacs.c b/src/emacs.c index 869b5307f23..92773996184 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -915,10 +915,10 @@ main (int argc, char **argv) temacs and only if we are going to dump with unexec. */ bool use_dynamic_heap = false; char *temacs_str = strstr (argv[0], "temacs"); - if (temacs_str != NULL + if (temacs + && temacs_str != NULL && (temacs_str == argv[0] || IS_DIRECTORY_SEP (temacs_str[-1]))) { - eassert (temacs); /* Note that gflags are set at this point only if we have been called with the --temacs=METHOD option. We assume here that temacs is always called that way, otherwise the functions -- 2.39.5