* src/lread.c (lisp_file_lexically_bound_p): Stop scanning at end

marker.  (Bug#8610)

diff --git a/src/ChangeLog b/src/ChangeLog
index b6e30ab817c4b6b9140ef940c44ed03e30d479b3..ae1b9e773a2263fc0b62d09659502363d11dae0c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-05  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * lread.c (lisp_file_lexically_bound_p): Stop scanning at end
+       marker.  (Bug#8610)
+
 2011-05-05 Eli Zaretskii  <eliz@gnu.org>
 
        * w32heap.c (allocate_heap) [USE_LISP_UNION_TYPE || USE_LSB_TAG]:

diff --git a/src/lread.c b/src/lread.c
index 7ffc98b254fe07ca667fd0f561a0f2db3a83e80e..2139d558851f3664c98ca91ce6cfe368b3c74df0 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -830,7 +830,7 @@ lisp_file_lexically_bound_p (Lisp_Object readcharfun)
            ch = READCHAR;
 
          i = 0;
-         while (ch != ':' && ch != '\n' && ch != EOF)
+         while (ch != ':' && ch != '\n' && ch != EOF && in_file_vars)
            {
              if (i < sizeof var - 1)
                var[i++] = ch;
@@ -838,6 +838,10 @@ lisp_file_lexically_bound_p (Lisp_Object readcharfun)
              ch = READCHAR;
            }
 
+         /* Stop scanning if no colon was found before end marker.  */
+         if (!in_file_vars)
+           break;
+
          while (i > 0 && (var[i - 1] == ' ' || var[i - 1] == '\t'))
            i--;
          var[i] = '\0';