From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 23 Nov 2012 07:54:33 +0000 (+0200)
Subject: Fix pgx in .gdbinit when CHECK_LISP_OBJECT_TYPE is defined.
X-Git-Tag: emacs-24.2.90~14
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8654a41b44c8fe925af2b10378faa09909699240;p=emacs.git

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 952d7392a4c..98ae247b8c5 100644
--- 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 f760adf313f..7460e2c5704 100644
--- 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