Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-409
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-410
   Make sure image types are initialized for lookup too

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-411
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-412
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-413
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-414
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-415
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-416
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-417
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-418
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-419
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-202

1 files changed, 7 insertions, 10 deletions

diff --git a/src/syntax.c b/src/syntax.c
index 62612620f03..302250c39a4 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1455,7 +1455,7 @@ skip_chars (forwardp, syntaxp, string, lim, handle_iso_classes)
             {
               const unsigned char *class_beg = str + i_byte + 1;
               const unsigned char *class_end = class_beg;
-              const unsigned char *class_limit = str + size_byte;
+              const unsigned char *class_limit = str + size_byte - 2;
               /* Leave room for the null.        */
               unsigned char class_name[CHAR_CLASS_MAX_LENGTH + 1];
               re_wctype_t cc;
@@ -1463,17 +1463,13 @@ skip_chars (forwardp, syntaxp, string, lim, handle_iso_classes)
               if (class_limit - class_beg > CHAR_CLASS_MAX_LENGTH)
                 class_limit = class_beg + CHAR_CLASS_MAX_LENGTH;
 
-              while (class_end != class_limit
-                     && ! (*class_end >= 0200
-                           || *class_end <= 040
-                           || (*class_end == ':'
-                               && class_end[1] == ']')))
+              while (class_end < class_limit
+                     && *class_end >= 'a' && *class_end <= 'z')
                 class_end++;
 
-              if (class_end == class_limit
-                  || *class_end >= 0200
-                  || *class_end <= 040)
-                error ("Invalid ISO C character class");
+              if (class_end == class_beg
+                  || *class_end != ':' || class_end[1] != ']')
+                goto not_a_class_name;
 
               bcopy (class_beg, class_name, class_end - class_beg);
               class_name[class_end - class_beg] = 0;
@@ -1488,6 +1484,7 @@ skip_chars (forwardp, syntaxp, string, lim, handle_iso_classes)
               continue;
             }
 
+        not_a_class_name:
           if (c == '\\')
             {
               if (i_byte == size_byte)