Merge from emacs--devo--0

[gnu-emacs] / src / .gdbinit

diff --git a/src/.gdbinit b/src/.gdbinit
index 008305ca252d97daf5e0df054e78c72403bf19cb..de35709f26b4aa7d56f63f16bca245ffca95c918 100644 (file)
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -5,7 +5,7 @@
 #
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Emacs is distributed in the hope that it will be useful,
@@ -977,7 +977,7 @@ Print $ as a lisp object of any type.
 end
 
 define xprintstr
-  set $data = $arg0->data
+  set $data = (char *) $arg0->data
   output ($arg0->size > 1000) ? 0 : ($data[0])@($arg0->size_byte < 0 ? $arg0->size & ~gdb_array_mark_flag : $arg0->size_byte)
 end
 
@@ -1087,7 +1087,7 @@ set print sevenbit-strings
 
 show environment DISPLAY
 show environment TERM
-set args -geometry 80x40+0+0
+#set args -geometry 80x40+0+0
 
 # People get bothered when they see messages about non-existent functions...
 xgetptr Vsystem_type
@@ -1115,7 +1115,7 @@ end
 tbreak init_sys_modes
 commands
   silent
-  xgetptr Vwindow_system
+  xgetptr Vinitial_window_system
   set $tem = (struct Lisp_Symbol *) $ptr
   xgetptr $tem->xname
   set $tem = (struct Lisp_String *) $ptr