; 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.

diff --git a/src/emacs.c b/src/emacs.c
index 8c897762a2bc607b9bfdcddbbbd224fbb7af87df..fd79963ed9ce9af23510b8c6b857d7a217f806b9 100644 (file)
--- 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 acd7d004e533a99490a7126697b7a78732b39962..ae1d77a021a7f32b57cc8a88c323ad4eb50c4552 100644 (file)
--- 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;