From: Andreas Schwab <schwab@linux-m68k.org>
Date: Wed, 23 Jun 2010 08:22:36 +0000 (+0200)
Subject: * lread.c (read1): Signal error if #s is not followed by paren.
X-Git-Tag: emacs-pretest-23.2.90~139^2~91
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5721b4ed163946f1d3828f978f1c2bb43f3a9c61;p=emacs.git

* lread.c (read1): Signal error if #s is not followed by paren.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index cf6f8427b25..14c1482a049 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-23  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* lread.c (read1): Signal error if #s is not followed by paren.
+
 2010-06-19  Chong Yidong  <cyd@stupidchicken.com>
 
 	* image.c (free_image): Mark frame as garbaged (Bug#6426).
diff --git a/src/lread.c b/src/lread.c
index ba9d5378104..c96e391a2d3 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -2377,28 +2377,28 @@ read1 (readcharfun, pch, first_in_list)
 	      /* This is repetitive but fast and simple. */
 	      params[param_count] = QCsize;
 	      params[param_count+1] = Fplist_get (tmp, Qsize);
-	      if (!NILP (params[param_count+1]))
-		param_count+=2;
+	      if (!NILP (params[param_count + 1]))
+		param_count += 2;
 
 	      params[param_count] = QCtest;
 	      params[param_count+1] = Fplist_get (tmp, Qtest);
-	      if (!NILP (params[param_count+1]))
-		param_count+=2;
+	      if (!NILP (params[param_count + 1]))
+		param_count += 2;
 
 	      params[param_count] = QCweakness;
 	      params[param_count+1] = Fplist_get (tmp, Qweakness);
-	      if (!NILP (params[param_count+1]))
-		param_count+=2;
+	      if (!NILP (params[param_count + 1]))
+		param_count += 2;
 
 	      params[param_count] = QCrehash_size;
 	      params[param_count+1] = Fplist_get (tmp, Qrehash_size);
-	      if (!NILP (params[param_count+1]))
-		param_count+=2;
+	      if (!NILP (params[param_count + 1]))
+		param_count += 2;
 
 	      params[param_count] = QCrehash_threshold;
 	      params[param_count+1] = Fplist_get (tmp, Qrehash_threshold);
-	      if (!NILP (params[param_count+1]))
-		param_count+=2;
+	      if (!NILP (params[param_count + 1]))
+		param_count += 2;
 
 	      /* This is the hashtable data. */
 	      data = Fplist_get (tmp, Qdata);
@@ -2419,6 +2419,8 @@ read1 (readcharfun, pch, first_in_list)
 
 	      return ht;
 	    }
+	  UNREAD (c);
+	  invalid_syntax ("#", 1);
 	}
       if (c == '^')
 	{