[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master b7b0cc7: Unbreak interactive invocation of temacs o
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master b7b0cc7: Unbreak interactive invocation of temacs on MS-Windows |
Date: |
Wed, 6 Feb 2019 10:57:50 -0500 (EST) |
branch: master
commit b7b0cc709e6e9d3f267c471a97f58f29cc38da43
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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 869b530..9277399 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master b7b0cc7: Unbreak interactive invocation of temacs on MS-Windows,
Eli Zaretskii <=