[Emacs-diffs] /srv/bzr/emacs/trunk r104128: * src/lread.c (lisp_file_lexically_bound_p): Stop scanning at end

[Andreas Schwab]

------------------------------------------------------------
revno: 104128
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Thu 2011-05-05 18:56:39 +0200
message:
  * src/lread.c (lisp_file_lexically_bound_p): Stop scanning at end
  marker.  (Bug#8610)
modified:
  src/ChangeLog
  src/lread.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-05-05 04:00:38 +0000
+++ b/src/ChangeLog     2011-05-05 16:56:39 +0000
@@ -1,3 +1,8 @@
+2011-05-05  Andreas Schwab  <address@hidden>
+
+       * lread.c (lisp_file_lexically_bound_p): Stop scanning at end
+       marker.  (Bug#8610)
+
 2011-05-05 Eli Zaretskii  <address@hidden>
 
        * w32heap.c (allocate_heap) [USE_LISP_UNION_TYPE || USE_LSB_TAG]:

=== modified file 'src/lread.c'
--- a/src/lread.c       2011-04-25 21:34:39 +0000
+++ b/src/lread.c       2011-05-05 16:56:39 +0000
@@ -830,7 +830,7 @@
            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 @@
              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';