[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107825: * lread.c (lisp_file_lexically_bound_p): Fix hang at "; -*-\n".

[Stefan Monnier]

------------------------------------------------------------
revno: 107825
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11238
author: Atsuo Ohki <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-04-13 14:08:18 -0400
message:
  * lread.c (lisp_file_lexically_bound_p): Fix hang at ";-*-\n".
modified:
  src/ChangeLog
  src/lread.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-04-10 07:59:14 +0000
+++ b/src/ChangeLog     2012-04-13 18:08:18 +0000
@@ -1,11 +1,15 @@
+2012-04-13  Atsuo Ohki  <address@hidden>  (tiny change)
+
+       * lread.c (lisp_file_lexically_bound_p): Fix hang at ";-*-\n" 
(bug#11238).
+
 2012-04-10  Teodor Zlatanov  <address@hidden>
 
        * process.c (make_process):
        * process.h: Add integer `gnutls_handshakes_tried' member to
        process struct.
 
-       * gnutls.h: Add `GNUTLS_EMACS_HANDSHAKES_LIMIT' upper limit.  Add
-       convenience `GNUTLS_LOG2i' macro.
+       * gnutls.h: Add `GNUTLS_EMACS_HANDSHAKES_LIMIT' upper limit.
+       Add convenience `GNUTLS_LOG2i' macro.
 
        * gnutls.c (gnutls_log_function2i): Convenience log function.
        (emacs_gnutls_read): Use new log functions,

=== modified file 'src/lread.c'
--- a/src/lread.c       2012-01-26 06:30:49 +0000
+++ b/src/lread.c       2012-04-13 18:08:18 +0000
@@ -839,7 +839,7 @@
            }
 
          /* Stop scanning if no colon was found before end marker.  */
-         if (!in_file_vars)
+         if (!in_file_vars || ch == '\n' || ch == EOF)
            break;
 
          while (i > 0 && (var[i - 1] == ' ' || var[i - 1] == '\t'))
@@ -863,8 +863,7 @@
                  ch = READCHAR;
                }
              if (! in_file_vars)
-               /* The value was terminated by an end-marker, which
-                  remove.  */
+               /* The value was terminated by an end-marker, which remove.  */
                i -= 3;
              while (i > 0 && (val[i - 1] == ' ' || val[i - 1] == '\t'))
                i--;