From: Atsuo Ohki <ohki@gssm.otsuka.tsukuba.ac.jp>
Date: Fri, 13 Apr 2012 18:08:18 +0000 (-0400)
Subject: * lread.c (lisp_file_lexically_bound_p): Fix hang at ";-*-\n".
X-Git-Tag: emacs-24.0.96~88
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ad3a2b411dc2b34f5d6fa434aee3ca56fa7a88e7;p=emacs.git

* lread.c (lisp_file_lexically_bound_p): Fix hang at ";-*-\n".

Fixes: debbugs:11238
---

diff --git a/src/ChangeLog b/src/ChangeLog
index fc4f31028ea..73c67125257 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,11 +1,15 @@
+2012-04-13  Atsuo Ohki  <ohki@gssm.otsuka.tsukuba.ac.jp>  (tiny change)
+
+	* lread.c (lisp_file_lexically_bound_p): Fix hang at ";-*-\n" (bug#11238).
+
 2012-04-10  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* 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,
diff --git a/src/lread.c b/src/lread.c
index 353f4a3064d..b6135429b48 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -839,7 +839,7 @@ lisp_file_lexically_bound_p (Lisp_Object readcharfun)
 	    }
 
 	  /* 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 @@ lisp_file_lexically_bound_p (Lisp_Object readcharfun)
 		  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--;