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

diff --git a/src/ChangeLog b/src/ChangeLog
index cf6f8427b255c82f2ed0dd75f275bfaf84671e0e..14c1482a04928c28607909aeadaf044a9c6cfc47 100644 (file)
--- 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 ba9d5378104f462c9eca9f2669b7156302f803bf..c96e391a2d3418eb13a0b48b855c3b9ed73874ca 100644 (file)
--- 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 == '^')
        {