aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2019-02-06 17:56:44 +0200
committerEli Zaretskii2019-02-06 17:56:44 +0200
commitb7b0cc709e6e9d3f267c471a97f58f29cc38da43 (patch)
treec58b213989d70bf89e0a1a09623aaf50026320fe /src
parenta03de1e2a33a35caf2715b2645aef0a52072b4b2 (diff)
downloademacs-b7b0cc709e6e9d3f267c471a97f58f29cc38da43.tar.gz
emacs-b7b0cc709e6e9d3f267c471a97f58f29cc38da43.zip
Unbreak interactive invocation of temacs on MS-Windows
* src/emacs.c (main) [WINDOWSNT]: Allow to invoke temacs interactively without the --temacs= option.
Diffstat (limited to 'src')
-rw-r--r--src/emacs.c4
1 files 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)
915 temacs and only if we are going to dump with unexec. */ 915 temacs and only if we are going to dump with unexec. */
916 bool use_dynamic_heap = false; 916 bool use_dynamic_heap = false;
917 char *temacs_str = strstr (argv[0], "temacs"); 917 char *temacs_str = strstr (argv[0], "temacs");
918 if (temacs_str != NULL 918 if (temacs
919 && temacs_str != NULL
919 && (temacs_str == argv[0] || IS_DIRECTORY_SEP (temacs_str[-1]))) 920 && (temacs_str == argv[0] || IS_DIRECTORY_SEP (temacs_str[-1])))
920 { 921 {
921 eassert (temacs);
922 /* Note that gflags are set at this point only if we have been 922 /* Note that gflags are set at this point only if we have been
923 called with the --temacs=METHOD option. We assume here that 923 called with the --temacs=METHOD option. We assume here that
924 temacs is always called that way, otherwise the functions 924 temacs is always called that way, otherwise the functions