Fix last change.

1 files changed, 15 insertions, 8 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index f00a5449531..c0e68b32872 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -771,26 +771,33 @@ xgetptr $tem->xname
 set $tem = (struct Lisp_String *) $ptr
 set $tem = (char *) $tem->data
 
+# Don't let abort actually run, as it will make stdio stop working and
+# therefore the `pr' command above as well.
 if $tem[0] == 'w' && $tem[1] == 'i' && $tem[2] == 'n' && $tem[3] == 'd'
   # The windows-nt build replaces abort with its own function.
   break w32_abort
 else
-  # Don't let abort actually run, as it will make
-  # stdio stop working and therefore the `pr' command above as well.
   break abort
+end
 
-  # If we are running in synchronous mode, we want a chance to look around
-  # before Emacs exits.  Perhaps we should put the break somewhere else
-  # instead...
+# x_error_quitter is defined only on X.  But window-system is set up
+# only at run time, during Emacs startup, so we need to defer setting
+# the breakpoint.  init_sys_modes is the first function called on
+# every platform after init_display, where window-system is set.
+tbreak init_sys_modes
+commands
+  silent
   xgetptr Vwindow_system
   set $tem = (struct Lisp_Symbol *) $ptr
   xgetptr $tem->xname
   set $tem = (struct Lisp_String *) $ptr
   set $tem = (char *) $tem->data
-  # x_error_quitter is defined only on X
+  # If we are running in synchronous mode, we want a chance to look
+  # around before Emacs exits.  Perhaps we should put the break
+  # somewhere else instead...
   if $tem[0] == 'x' && $tem[1] == '\0'
-    break x_error_quitter
+    break abort
   end
+  continue
 end
-
 # arch-tag: 12f34321-7bfa-4240-b77a-3cd3a1696dfe