(xprintsym): Use the new `xname' field.

(xsymbol): Use it.

2 files changed, 10 insertions, 6 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index 5f8768a8c92..705a6e836a7 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -159,9 +159,7 @@ end
 
 define xsymbol
 print (struct Lisp_Symbol *) ((((int) $) & $valmask) | gdb_data_seg_bits)
-set $xsymbol_name = ((struct Lisp_String *)(($->xname & $valmask) | gdb_data_seg_bits))
-output ($xsymbol_name->data[0])@($xsymbol_name->size_byte < 0 ? $xsymbol_name->size : $xsymbol_name->size_byte)
-echo \n
+xprintsym $
 end
 document xsymbol
 Print the name and address of the symbol $.
@@ -326,7 +324,8 @@ end
 
 define xprintsym
   set $sym = (struct Lisp_Symbol *) ((((int) $arg0) & $valmask) | gdb_data_seg_bits)
-  output (char*)$sym->name->data
+  set $sym_name = ((struct Lisp_String *)(($sym->xname & $valmask) | gdb_data_seg_bits))
+  output ($sym_name->data[0])@($sym_name->size_byte < 0 ? $sym_name->size : $sym_name->size_byte)
   echo \n
 end
 document xprintsym
diff --git a/src/ChangeLog b/src/ChangeLog
index 7651e9701f0..fb7c42a4d32 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-22  Stefan Monnier  <monnier@cs.yale.edu>
+
+        * .gdbinit (xprintsym): Use the new `xname' field.
+        (xsymbol): Use it.
+
 2002-06-22  Jason Rumney  <jasonr@gnu.org>
 
         * w32fns.c (file_dialog_callback): New function.
@@ -16,7 +21,7 @@
         (do_window_update): Call XClearWindow before calling expose_frame.
         (make_mac_frame): Don't set FRAME_BACKGROUND_PIXEL and
         FRAME_FOREGROUND_PIXEL of frame.
-        
+
         * macterm.c (XTread_socket): If Vmac_command_key_is_meta is nil,
         test Mac command key as <ALT> key.
 
@@ -30,7 +35,7 @@
         Remove function_key_possible and key_translation_possible, replaced
         by checking `keytran_start < t'.
 
-        * .gdbinit (xsymbol): Use the name `xname' field.
+        * .gdbinit (xsymbol): Use the new `xname' field.
 
 2002-06-17  Andrew Choi  <akochoi@shaw.ca>