diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2019-02-06 17:56:44 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2019-02-06 17:56:44 +0200 |
| commit | b7b0cc709e6e9d3f267c471a97f58f29cc38da43 (patch) | |
| tree | c58b213989d70bf89e0a1a09623aaf50026320fe | |
| parent | a03de1e2a33a35caf2715b2645aef0a52072b4b2 (diff) | |
| download | emacs-b7b0cc709e6e9d3f267c471a97f58f29cc38da43.tar.gz emacs-b7b0cc709e6e9d3f267c471a97f58f29cc38da43.tar.bz2 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.
| -rw-r--r-- | src/emacs.c | 4 |
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) 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 |