From e93864f9436cf1718bc9ae2c1b707e931f95c9df Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 13 Jun 2012 21:02:35 -0700
Subject: [PATCH] .gdbinit: Update to match recent lisp.h changes.

---
 src/.gdbinit  | 4 ++--
 src/ChangeLog | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/.gdbinit b/src/.gdbinit
index df3a9cd7124..1db25324ea0 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -60,7 +60,7 @@ define xgetint
   if gdb_use_struct
     set $bugfix = $bugfix.i
   end
-  set $int = gdb_use_lsb ? $bugfix >> (gdb_gctypebits - 1) : $bugfix << gdb_gctypebits) >> gdb_gctypebits
+  set $int = gdb_use_lsb ? $bugfix >> (gdb_gctypebits - 1) : $bugfix << (gdb_gctypebits - 1) >> (gdb_gctypebits - 1)
 end
 
 define xgettype
@@ -1189,7 +1189,7 @@ define hookpost-backtrace
 end
 
 define xreload
-  set $tagmask = (((long)1 << gdb_gctypebits) - 1)
+  set $tagmask = ((1 << gdb_gctypebits) - 1)
   # The consing_since_gc business widens the 1 to EMACS_INT,
   # a symbol not directly visible to GDB.
   set $valmask = gdb_use_lsb ? ~($tagmask) : ((consing_since_gc - consing_since_gc + 1) << gdb_valbits) - 1
diff --git a/src/ChangeLog b/src/ChangeLog
index e5e0c199026..416b74c9f68 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2012-06-14  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* .gdbinit (xgetint): Fix recently-introduced paren typo.
+	Assume USE_2_TAGS_FOR_INTS.
+	(xreload): Adjust $tagmask width to match recent lisp.h change.
+
 	Simplify lisp.h in minor ways that should not affect code.
 	* lisp.h (USE_2_TAGS_FOR_INTS): Remove, as it was always defined.
 	(LISP_INT_TAG, case_Lisp_Int, LISP_STRING_TAG, LISP_INT_TAG_P)
-- 
2.11.4.GIT