Simplify Vobarray checking in oblookup.

* lread.c (oblookup): Simplify Vobarray checking.

diff --git a/src/ChangeLog b/src/ChangeLog
index de97c08c6fcb466be3823b0256907b0fa7bb5e11..ae0d7982baedbf6847d0006b6fdc17a99e485e97 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
 

diff --git a/src/lread.c b/src/lread.c
index 13f4141319609d19473a5ebb2bc33adeaaf6becc..d8a0275bee7ca7c56e115ddf5e1523c10056c5b8 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -3835,12 +3835,9 @@ oblookup (Lisp_Object obarray, register const char *ptr, ptrdiff_t size, ptrdiff
   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;