Undo last change. Instead, look at Vsystem_type to

determine which breakpoints to set.

1 files changed, 19 insertions, 16 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index 9f99b50deb7..48a0fecc0cf 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -765,21 +765,24 @@ show environment TERM
 set args -geometry 80x40+0+0
 
 # People get bothered when they see messages about non-existent functions...
-echo \n
-echo  If you see messages below about functions not being defined,\n
-echo  don\'t worry about them.  Nothing is wrong.\n
-echo \n
-
-# Don't let abort actually run, as it will make
-# stdio stop working and therefore the `pr' command above as well.
-break abort
-
-# The MS-Windows build replaces abort with its own function.
-break w32_abort
-
-# 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...
-break x_error_quitter
+xgetptr Vsystem_type
+set $tem = (struct Lisp_Symbol *) $ptr
+xgetptr $tem->xname
+set $tem = (struct Lisp_String *) $ptr
+set $tem = (char *) $tem->data
+
+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
+
+  # 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...
+  break x_error_quitter
+end
 
 # arch-tag: 12f34321-7bfa-4240-b77a-3cd3a1696dfe