Mercurial > emacs

changeset 109271:de58fd0baac5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* lread.c (read1): Signal error if #s is not followed by paren.
author Andreas Schwab <schwab@linux-m68k.org>
date Wed, 23 Jun 2010 10:22:36 +0200
parents a7253b87aad9
children 87794f1fc758
files src/ChangeLog src/lread.c
diffstat 2 files changed, 16 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Wed Jun 23 00:44:09 2010 -0700
+++ b/src/ChangeLog	Wed Jun 23 10:22:36 2010 +0200
@@ -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).
--- a/src/lread.c	Wed Jun 23 00:44:09 2010 -0700
+++ b/src/lread.c	Wed Jun 23 10:22:36 2010 +0200
@@ -2377,28 +2377,28 @@
 	      /* 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 @@
 
 	      return ht;
 	    }
+	  UNREAD (c);
+	  invalid_syntax ("#", 1);
 	}
       if (c == '^')
 	{