master dd451a37dd: ; Minor fix for 'restart-emacs' on MS-Windows

[Eli Zaretskii]

branch: master
commit dd451a37ddf9e1358c56bdb9c65606c1a7967f07
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    ; Minor fix for 'restart-emacs' on MS-Windows
    
    * src/w32.c (w32_reexec_emacs): Fail if in -nw session.
    * src/emacs.c (Fkill_emacs): Fix a typo.
---
 src/emacs.c | 2 +-
 src/w32.c   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/emacs.c b/src/emacs.c
index 8c897762a2..fd79963ed9 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2820,7 +2820,7 @@ killed.  */
       if (initial_argc < 1)
        error ("No command line arguments known; unable to re-execute Emacs");
 #ifdef WINDOWSNT
-      if (w32_reexec_emacs (initial_cmdline, initial_wd) < 1)
+      if (w32_reexec_emacs (initial_cmdline, initial_wd) < 0)
 #else
       if (execvp (*initial_argv, initial_argv) < 1)
 #endif
diff --git a/src/w32.c b/src/w32.c
index acd7d004e5..ae1d77a021 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -10623,6 +10623,12 @@ realpath (const char *file_name, char *resolved_name)
 int
 w32_reexec_emacs (char *cmd_line, const char *wdir)
 {
+  if (inhibit_window_system)
+    {
+      errno = ENOSYS;
+      return -1;       /* FIXME! */
+    }
+
   STARTUPINFO si;
   SECURITY_ATTRIBUTES sec_attrs;
   BOOL status;