[Emacs-diffs] /srv/bzr/emacs/trunk r109027: Simplify Vobarray checking in oblookup.

[Dmitry Antipov]

------------------------------------------------------------
revno: 109027
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2012-07-11 12:33:04 +0400
message:
  Simplify Vobarray checking in oblookup.
  * lread.c (oblookup): Simplify Vobarray checking.
modified:
  src/ChangeLog
  src/lread.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-11 07:38:33 +0000
+++ b/src/ChangeLog     2012-07-11 08:33:04 +0000
@@ -4,7 +4,8 @@
        * lisp.h (intern, intern_c_string): Redefine as static inline
        wrappers for intern_1 and intern_c_string_1, respectively.
        (intern_1, intern_c_string_1): Rename prototypes.
-       * lread.c (intern_1, intern_c_string_1): Simplify Vobarray checking.
+       * lread.c (intern_1, intern_c_string_1, oblookup): Simplify
+       Vobarray checking.
        * font.c (font_intern_prop): Likewise.  Adjust comment.
        * w32font.c (intern_font_name): Likewise.
 

=== modified file 'src/lread.c'
--- a/src/lread.c       2012-07-11 07:37:39 +0000
+++ b/src/lread.c       2012-07-11 08:33:04 +0000
@@ -3835,12 +3835,9 @@
   register Lisp_Object tail;
   Lisp_Object bucket, tem;
 
-  if (!VECTORP (obarray)
-      || (obsize = ASIZE (obarray)) == 0)
-    {
-      obarray = check_obarray (obarray);
-      obsize = ASIZE (obarray);
-    }
+  obarray = check_obarray (obarray);
+  obsize = ASIZE (obarray);
+
   /* This is sometimes needed in the middle of GC.  */
   obsize &= ~ARRAY_MARK_FLAG;
   hash = hash_string (ptr, size_byte) % obsize;