aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2012-11-23 09:54:33 +0200
committerEli Zaretskii2012-11-23 09:54:33 +0200
commit8654a41b44c8fe925af2b10378faa09909699240 (patch)
tree7a1a3783e4669bbdda969da35562fcadf1aa2ede
parentcc4c01bd96b929e5b19bcb77eebd40e12930ef06 (diff)
downloademacs-8654a41b44c8fe925af2b10378faa09909699240.tar.gz
emacs-8654a41b44c8fe925af2b10378faa09909699240.zip
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).
-rw-r--r--src/.gdbinit3
-rw-r--r--src/ChangeLog6
2 files changed, 8 insertions, 1 deletions
diff --git a/src/.gdbinit b/src/.gdbinit
index 952d7392a4c..98ae247b8c5 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -495,7 +495,8 @@ define pgx
495 end 495 end
496 xgettype ($g.object) 496 xgettype ($g.object)
497 if ($type == Lisp_String) 497 if ($type == Lisp_String)
498 printf " str=%x[%d]", $g.object, $g.charpos 498 xgetptr $g.object
499 printf " str=0x%x[%d]", ((struct Lisp_String *)$ptr)->data, $g.charpos
499 else 500 else
500 printf " pos=%d", $g.charpos 501 printf " pos=%d", $g.charpos
501 end 502 end
diff --git a/src/ChangeLog b/src/ChangeLog
index f760adf313f..7460e2c5704 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12012-11-23 Eli Zaretskii <eliz@gnu.org>
2
3 * .gdbinit (pgx): If the glyph's object is a string, display the
4 pointer to string data, rather than the value of the string object
5 itself (which barfs under CHECK_LISP_OBJECT_TYPE).
6
12012-11-21 Eli Zaretskii <eliz@gnu.org> 72012-11-21 Eli Zaretskii <eliz@gnu.org>
2 8
3 * indent.c (Fvertical_motion): If the starting position is covered 9 * indent.c (Fvertical_motion): If the starting position is covered