Fix pgx in .gdbinit when CHECK_LISP_OBJECT_TYPE is defined.

 src/.gdbinit (pgx): If the glyph's object is a string, display the
 pointer to string data, rather than the value of the string object
 itself (which barfs under CHECK_LISP_OBJECT_TYPE).

diff --git a/src/.gdbinit b/src/.gdbinit
index 952d7392a4c36c0b2c5d92f3e7b542f1ae3ff3f2..98ae247b8c56a92f87f4bf4ef65f6ab78c89fd30 100644 (file)
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -495,7 +495,8 @@ define pgx
   end
   xgettype ($g.object)
   if ($type == Lisp_String)
-    printf " str=%x[%d]", $g.object, $g.charpos
+    xgetptr $g.object
+    printf " str=0x%x[%d]", ((struct Lisp_String *)$ptr)->data, $g.charpos
   else
     printf " pos=%d", $g.charpos
   end

diff --git a/src/ChangeLog b/src/ChangeLog
index f760adf313f5c3335b97d4840b4a4d6ebea5117c..7460e2c570494576d64744ea1d7285b47bf50c2e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-23  Eli Zaretskii  <eliz@gnu.org>
+
+       * .gdbinit (pgx): If the glyph's object is a string, display the
+       pointer to string data, rather than the value of the string object
+       itself (which barfs under CHECK_LISP_OBJECT_TYPE).
+
 2012-11-21  Eli Zaretskii  <eliz@gnu.org>
 
        * indent.c (Fvertical_motion): If the starting position is covered