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

(xsymbol): Use it.

1 files changed, 3 insertions, 4 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