[Emacs-diffs] /srv/bzr/emacs/trunk r110499: * alloc.c (mark_object): Use meaningful PVEC_NORMAL_VECTOR.

[Dmitry Antipov]

------------------------------------------------------------
revno: 110499
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2012-10-10 19:31:21 +0400
message:
  * alloc.c (mark_object): Use meaningful PVEC_NORMAL_VECTOR.
  * lisp.h (enum pvec_type): Adjust comments and omit explicit
  initializer for PVEC_NORMAL_VECTOR.
modified:
  src/ChangeLog
  src/alloc.c
  src/lisp.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-10 15:10:57 +0000
+++ b/src/ChangeLog     2012-10-10 15:31:21 +0000
@@ -1,3 +1,9 @@
+2012-10-10  Dmitry Antipov  <address@hidden>
+
+       * alloc.c (mark_object): Use meaningful PVEC_NORMAL_VECTOR.
+       * lisp.h (enum pvec_type): Adjust comments and omit explicit
+       initializer for PVEC_NORMAL_VECTOR.
+
 2012-10-10  Paul Eggert  <address@hidden>
 
        Clean out old termopts cruft.

=== modified file 'src/alloc.c'
--- a/src/alloc.c       2012-10-10 14:45:07 +0000
+++ b/src/alloc.c       2012-10-10 15:31:21 +0000
@@ -5689,7 +5689,7 @@
          pvectype = ((ptr->header.size & PVEC_TYPE_MASK)
                      >> PSEUDOVECTOR_SIZE_BITS);
        else
-         pvectype = 0;
+         pvectype = PVEC_NORMAL_VECTOR;
 
        if (pvectype != PVEC_SUBR && pvectype != PVEC_BUFFER)
          CHECK_LIVE (live_vector_p);

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2012-10-04 05:52:49 +0000
+++ b/src/lisp.h        2012-10-10 15:31:21 +0000
@@ -345,15 +345,11 @@
       = PSEUDOVECTOR_FLAG;
 
 /* In a pseudovector, the size field actually contains a word with one
-   PSEUDOVECTOR_FLAG bit set, and exactly one of the following bits to
-   indicate the actual type.
-   We use a bitset, even tho only one of the bits can be set at any
-   particular time just so as to be able to use micro-optimizations such as
-   testing membership of a particular subset of pseudovectors in Fequal.
-   It is not crucial, but there are plenty of bits here, so why not do it?  */
+   PSEUDOVECTOR_FLAG bit set, and one of the following values extracted
+   with PVEC_TYPE_MASK to indicate the actual type.  */
 enum pvec_type
 {
-  PVEC_NORMAL_VECTOR = 0,      /* Unused!  */
+  PVEC_NORMAL_VECTOR,
   PVEC_FREE,
   PVEC_PROCESS,
   PVEC_FRAME,