2 files changed, 9 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 541432e70bf..9e1ef4b06f8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,11 @@
+2007-10-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lisp.h (XSETPSEUDOVECTOR): Don't set the tag anymore.
+        This was made redundant by the previous introduction of XSETPVECTYPE.
+
 2007-10-09  Richard Stallman  <rms@gnu.org>
 
-        * image.c (free_bitmap_record): Renamed from Free_Bitmap_Record.
+        * image.c (free_bitmap_record): Rename from Free_Bitmap_Record.
 
 2007-09-29  Richard Stallman  <rms@gnu.org>
 
diff --git a/src/lisp.h b/src/lisp.h
index bbad0b28226..43daded691a 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -561,7 +561,9 @@ extern size_t pure_size;
 
 #define XSETPVECTYPE(v,code) ((v)->size |= PSEUDOVECTOR_FLAG | (code))
 #define XSETPSEUDOVECTOR(a, b, code) \
-  (XSETVECTOR (a, b), XSETPVECTYPE (XVECTOR (a), code))
+  (XSETVECTOR (a, b),                                                   \
+   eassert ((XVECTOR (a)->size & (PSEUDOVECTOR_FLAG | PVEC_TYPE_MASK))  \
+            == (PSEUDOVECTOR_FLAG | (code))))
 #define XSETWINDOW_CONFIGURATION(a, b) \
   (XSETPSEUDOVECTOR (a, b, PVEC_WINDOW_CONFIGURATION))
 #define XSETPROCESS(a, b) (XSETPSEUDOVECTOR (a, b, PVEC_PROCESS))