Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-398
   Tweak permissions

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-399
   Tweak directory permissions

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-401
   More build-in-place tweaking of arch tagging

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-403
   Yet more build-in-place tweaking of arch tagging

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

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

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

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


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

17 files changed, 390 insertions, 145 deletions

diff --git a/src/.arch-inventory b/src/.arch-inventory
index 99b0d6cc539..a98d4c9932f 100644
--- a/src/.arch-inventory
+++ b/src/.arch-inventory
@@ -4,4 +4,6 @@ source ^\.(gdbinit|dbxinit)$
 # Auto-generated files, which ignore
 precious ^(config\.stamp|config\.h|epaths\.h)$
 
+backup ^(stamp-oldxmenu|prefix-args|temacs|emacs|emacs-[0-9.]*)$
+
 # arch-tag: 277cc7ae-b3f5-44af-abf1-84c073164543
diff --git a/src/ChangeLog b/src/ChangeLog
index 04133ca728c..5104ca9545c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,82 @@
+2004-06-13  Richard M. Stallman  <rms@gnu.org>
+
+        * regex.h (CHAR_CLASS_MAX_LENGTH, re_wctype_t, re_wchar_t)
+        (re_wctype, re_iswctype, re_wctype_to_bit):
+        Non-function definitions moved here from regex.c.
+        
+        * regex.c (re_wctype, re_iswctype): Function defs longer static.
+        (CHAR_CLASS_MAX_LENGTH, re_wctype_t, re_wchar_t)
+        (re_wctype, re_iswctype, re_wctype_to_bit):
+        Non-function definitions moved to regex.h.
+
+        * window.c (Fselect_window): Doc fix.
+
+        * syntax.c: Include regex.h.
+        (skip_chars): New arg HANDLE_ISO_CLASSES.  Callers changed.
+        If requested, make a list of classes, then check the scanned
+        chars for membership in them.
+        (in_classes): New function.
+        Doc fix.
+
+        * keyboard.c (cmd_error): Don't call any_kboard_state
+        if inside a recursive edit level.
+
+2004-06-13  Lorentey K,Aa(Broly  <lorentey@elte.hu>
+
+        * keyboard.c (command_loop): Call any_kboard_state before
+        command_loop_2 when at top level.
+
+2004-06-13  Andreas Schwab  <schwab@suse.de>
+
+        * print.c (print_object): Always use %ld for printing EMACS_INT.
+
+        * keyboard.c (cancel_hourglass_unwind): Return a value.
+        (modify_event_symbol): Always use %ld for printing EMACS_INT.
+        (Fexecute_extended_command): Likewise.
+
+        * syntax.h (SYNTAX_ENTRY_FOLLOW_PARENT): Rename local variable to
+        avoid clashes.
+        (SYNTAX): Likewise.
+        (SYNTAX_WITH_FLAGS): Likewise.
+        (SYNTAX_MATCH): Likewise.
+
+        * syntax.c (char_quoted): Avoid warning about undefined operation.
+        (find_defun_start): Likewise.
+        (scan_lists): Likewise.
+        (INC_FROM): Likewise.
+        (scan_sexps_forward): Likewise.
+
+        * image.c: Include <ctype.h>.
+
+        * xfaces.c (face_attr_equal_p): Declare parameters.
+
+2004-06-13  Kenichi Handa  <handa@m17n.org>
+
+        * ccl.c (CCL_READ_CHAR): If hit EOF, set REG to -1.
+
+2004-06-12  Matthew Mundell  <matt@mundell.ukfsn.org>
+
+        * eval.c (Fdefun): Signal an error if NAME is not a symbol.
+
+2004-06-12  Kenichi Handa  <handa@m17n.org>
+
+        * ccl.c (CCL_CALL_FOR_MAP_INSTRUCTION): Save eof_ic in
+        ccl_prog_stack_struct and update it.
+        (CCL_INVALID_CMD): If CCL_DEBUG is defined, call ccl_debug_hook.
+        (CCL_READ_CHAR): Get instruction counter from eof_ic, not from
+        ccl->eof_ic on EOF.
+        (ccl_debug_hook): New function.
+        (struct ccl_prog_stack): New member eof_ic.
+        (ccl_driver): Handle EOF in subrountine call correctly.
+
+2004-06-11  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (decode_coding_string): Check CODING_FINISH_INTERRUPT.
+
+2004-06-11  Kim F. Storm  <storm@cua.dk>
+
+        * emacs.c (shut_down_emacs): Inhibit redisplay during shutdown.
+
 2004-06-11  Juanma Barranquero  <lektu@terra.es>
 
         * keyboard.c (Fposn_at_point): Doc fix.
diff --git a/src/ccl.c b/src/ccl.c
index 4c3528075b4..5bff1f3a0ad 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -626,14 +626,17 @@ do								\
           {                                                     \
             ccl_prog = ccl_prog_stack_struct[0].ccl_prog;       \
             ic = ccl_prog_stack_struct[0].ic;                   \
+            eof_ic = ccl_prog_stack_struct[0].eof_ic;           \
           }                                                     \
         CCL_INVALID_CMD;                                        \
       }                                                         \
     ccl_prog_stack_struct[stack_idx].ccl_prog = ccl_prog;       \
     ccl_prog_stack_struct[stack_idx].ic = (ret_ic);             \
+    ccl_prog_stack_struct[stack_idx].eof_ic = eof_ic;           \
     stack_idx++;                                                \
     ccl_prog = called_ccl.prog;                                 \
     ic = CCL_HEADER_MAIN;                                       \
+    eof_ic = XFASTINT (ccl_prog[CCL_HEADER_EOF]);               \
     goto ccl_repeat;                                            \
   }                                                             \
 while (0)
@@ -710,14 +713,29 @@ while (0)
 
 /* Terminate CCL program because of invalid command.  Should not occur
    in the normal case.  */
+#ifndef CCL_DEBUG
+
+#define CCL_INVALID_CMD                 \
+do                                      \
+  {                                     \
+    ccl->status = CCL_STAT_INVALID_CMD; \
+    goto ccl_error_handler;             \
+  }                                     \
+while(0)
+
+#else
+
 #define CCL_INVALID_CMD                 \
 do                                      \
   {                                     \
+    ccl_debug_hook (this_ic);           \
     ccl->status = CCL_STAT_INVALID_CMD; \
     goto ccl_error_handler;             \
   }                                     \
 while(0)
 
+#endif
+
 /* Encode one character CH to multibyte form and write to the current
    output buffer.  If CH is less than 256, CH is written as is.  */
 #define CCL_WRITE_CHAR(ch)                                              \
@@ -809,7 +827,8 @@ while(0)
       }                                                 \
     else if (ccl->last_block)                           \
       {                                                 \
-        ic = ccl->eof_ic;                               \
+        REG = -1;                                       \
+        ic = eof_ic;                                    \
         goto ccl_repeat;                                \
       }                                                 \
     else                                                \
@@ -854,12 +873,20 @@ while(0)
 #define CCL_DEBUG_BACKTRACE_LEN 256
 int ccl_backtrace_table[CCL_DEBUG_BACKTRACE_LEN];
 int ccl_backtrace_idx;
+
+int
+ccl_debug_hook (int ic)
+{
+  return ic;
+}
+
 #endif
 
 struct ccl_prog_stack
   {
     Lisp_Object *ccl_prog;      /* Pointer to an array of CCL code.  */
     int ic;                     /* Instruction Counter.  */
+    int eof_ic;                 /* Instruction Counter to jump on EOF.  */
   };
 
 /* For the moment, we only support depth 256 of stack.  */
@@ -888,8 +915,10 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed)
      sequence.  For that conversion, we remember how many more bytes
      we must keep in DESTINATION in this variable.  */
   int extra_bytes = ccl->eight_bit_control;
+  int eof_ic = ccl->eof_ic;
+  int eof_hit = 0;
 
-  if (ic >= ccl->eof_ic)
+  if (ic >= eof_ic)
     ic = CCL_HEADER_MAIN;
 
   if (ccl->buf_magnification == 0) /* We can't produce any bytes.  */
@@ -1093,15 +1122,18 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed)
                   {
                     ccl_prog = ccl_prog_stack_struct[0].ccl_prog;
                     ic = ccl_prog_stack_struct[0].ic;
+                    eof_ic = ccl_prog_stack_struct[0].eof_ic;
                   }
                 CCL_INVALID_CMD;
               }
 
             ccl_prog_stack_struct[stack_idx].ccl_prog = ccl_prog;
             ccl_prog_stack_struct[stack_idx].ic = ic;
+            ccl_prog_stack_struct[stack_idx].eof_ic = eof_ic;
             stack_idx++;
             ccl_prog = XVECTOR (AREF (slot, 1))->contents;
             ic = CCL_HEADER_MAIN;
+            eof_ic = XFASTINT (ccl_prog[CCL_HEADER_EOF]);
           }
           break;
 
@@ -1131,6 +1163,9 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed)
               stack_idx--;
               ccl_prog = ccl_prog_stack_struct[stack_idx].ccl_prog;
               ic = ccl_prog_stack_struct[stack_idx].ic;
+              eof_ic = ccl_prog_stack_struct[stack_idx].eof_ic;
+              if (eof_hit)
+                ic = eof_ic;
               break;
             }
           if (src)
@@ -1367,7 +1402,8 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed)
               src--;
               if (ccl->last_block)
                 {
-                  ic = ccl->eof_ic;
+                  ic = eof_ic;
+                  eof_hit = 1;
                   goto ccl_repeat;
                 }
               else
diff --git a/src/coding.c b/src/coding.c
index 328507de499..ed4b131b3a9 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -6316,6 +6316,7 @@ encode_coding_string (str, coding, nocopy)
       produced += coding->produced;
       produced_char += coding->produced_char;
       if (result == CODING_FINISH_NORMAL
+          || result == CODING_FINISH_INTERRUPT
           || (result == CODING_FINISH_INSUFFICIENT_SRC
               && coding->consumed == 0))
         break;
diff --git a/src/emacs.c b/src/emacs.c
index 0fbc6f86b5f..5425d5d64a2 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -207,6 +207,8 @@ extern Lisp_Object Vinitial_window_system;
 
 extern Lisp_Object Vauto_save_list_file_name;
 
+extern Lisp_Object Vinhibit_redisplay;
+
 #ifdef USG_SHARED_LIBRARIES
 /* If nonzero, this is the place to put the end of the writable segment
    at startup.  */
@@ -2009,6 +2011,9 @@ shut_down_emacs (sig, no_x, stuff)
   /* Prevent running of hooks from now on.  */
   Vrun_hooks = Qnil;
 
+  /* Don't update display from now on.  */
+  Vinhibit_redisplay = Qt;
+
   /* If we are controlling the terminal, reset terminal modes.  */
 #ifdef EMACS_HAVE_TTY_PGRP
   {
diff --git a/src/eval.c b/src/eval.c
index e1da1def446..096755f9c77 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -617,6 +617,7 @@ usage: (defun NAME ARGLIST [DOCSTRING] BODY...)  */)
   register Lisp_Object defn;
 
   fn_name = Fcar (args);
+  CHECK_SYMBOL (fn_name);
   defn = Fcons (Qlambda, Fcdr (args));
   if (!NILP (Vpurify_flag))
     defn = Fpurecopy (defn);
diff --git a/src/image.c b/src/image.c
index 3c53903b4b4..41762030b9e 100644
--- a/src/image.c
+++ b/src/image.c
@@ -23,6 +23,7 @@ Boston, MA 02111-1307, USA.  */
 #include <signal.h>
 #include <stdio.h>
 #include <math.h>
+#include <ctype.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/src/keyboard.c b/src/keyboard.c
index 1c4e9fe0c4a..de2bcf825a0 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1147,7 +1147,8 @@ cmd_error (data)
 
   Vinhibit_quit = Qnil;
 #ifdef MULTI_KBOARD
-  any_kboard_state ();
+  if (command_loop_level == 0 && minibuf_level == 0)
+    any_kboard_state ();
 #endif
 
   return make_number (0);
@@ -6261,12 +6262,8 @@ modify_event_symbol (symbol_num, modifiers, symbol_kind, name_alist_or_stem,
         {
           int len = SBYTES (name_alist_or_stem);
           char *buf = (char *) alloca (len + 50);
-          if (sizeof (int) == sizeof (EMACS_INT))
-            sprintf (buf, "%s-%d", SDATA (name_alist_or_stem),
-                     (int)XINT (symbol_int) + 1);
-          else if (sizeof (long) == sizeof (EMACS_INT))
-            sprintf (buf, "%s-%ld", SDATA (name_alist_or_stem),
-                     (long)XINT (symbol_int) + 1);
+          sprintf (buf, "%s-%ld", SDATA (name_alist_or_stem),
+                   (long) XINT (symbol_int) + 1);
           value = intern (buf);
         }
       else if (name_table != 0 && name_table[symbol_num])
@@ -9790,23 +9787,9 @@ DEFUN ("execute-extended-command", Fexecute_extended_command, Sexecute_extended_
   else if (CONSP (prefixarg) && XINT (XCAR (prefixarg)) == 4)
     strcpy (buf, "C-u ");
   else if (CONSP (prefixarg) && INTEGERP (XCAR (prefixarg)))
-    {
-      if (sizeof (int) == sizeof (EMACS_INT))
-        sprintf (buf, "%d ", XINT (XCAR (prefixarg)));
-      else if (sizeof (long) == sizeof (EMACS_INT))
-        sprintf (buf, "%ld ", (long) XINT (XCAR (prefixarg)));
-      else
-        abort ();
-    }
+    sprintf (buf, "%ld ", (long) XINT (XCAR (prefixarg)));
   else if (INTEGERP (prefixarg))
-    {
-      if (sizeof (int) == sizeof (EMACS_INT))
-        sprintf (buf, "%d ", XINT (prefixarg));
-      else if (sizeof (long) == sizeof (EMACS_INT))
-        sprintf (buf, "%ld ", (long) XINT (prefixarg));
-      else
-        abort ();
-    }
+    sprintf (buf, "%ld ", (long) XINT (prefixarg));
 
   /* This isn't strictly correct if execute-extended-command
      is bound to anything else.  Perhaps it should use
diff --git a/src/minibuf.c b/src/minibuf.c
index 6dd55c5ea76..2f05a56d7dd 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1290,20 +1290,21 @@ is used to further constrain the set of candidates.  */)
           XSETFASTINT (zero, 0);
 
           /* Ignore this element if it fails to match all the regexps.  */
-          {
-            int count = SPECPDL_INDEX ();
-            specbind (Qcase_fold_search, completion_ignore_case ? Qt : Qnil);
-            for (regexps = Vcompletion_regexp_list; CONSP (regexps);
-                 regexps = XCDR (regexps))
-              {
-                tem = Fstring_match (XCAR (regexps), eltstring, zero);
-                if (NILP (tem))
-                  break;
-              }
-            unbind_to (count, Qnil);
-            if (CONSP (regexps))
-              continue;
-          }
+          if (CONSP (Vcompletion_regexp_list))
+            {
+              int count = SPECPDL_INDEX ();
+              specbind (Qcase_fold_search, completion_ignore_case ? Qt : Qnil);
+              for (regexps = Vcompletion_regexp_list; CONSP (regexps);
+                   regexps = XCDR (regexps))
+                {
+                  tem = Fstring_match (XCAR (regexps), eltstring, zero);
+                  if (NILP (tem))
+                    break;
+                }
+              unbind_to (count, Qnil);
+              if (CONSP (regexps))
+                continue;
+            }
 
           /* Ignore this element if there is a predicate
              and the predicate doesn't like it. */
@@ -1541,20 +1542,21 @@ are ignored unless STRING itself starts with a space.  */)
           XSETFASTINT (zero, 0);
 
           /* Ignore this element if it fails to match all the regexps.  */
-          {
-            int count = SPECPDL_INDEX ();
-            specbind (Qcase_fold_search, completion_ignore_case ? Qt : Qnil);
-            for (regexps = Vcompletion_regexp_list; CONSP (regexps);
-                 regexps = XCDR (regexps))
-              {
-                tem = Fstring_match (XCAR (regexps), eltstring, zero);
-                if (NILP (tem))
-                  break;
-              }
-            unbind_to (count, Qnil);
-            if (CONSP (regexps))
-              continue;
-          }
+          if (CONSP (Vcompletion_regexp_list))
+            {
+              int count = SPECPDL_INDEX ();
+              specbind (Qcase_fold_search, completion_ignore_case ? Qt : Qnil);
+              for (regexps = Vcompletion_regexp_list; CONSP (regexps);
+                   regexps = XCDR (regexps))
+                {
+                  tem = Fstring_match (XCAR (regexps), eltstring, zero);
+                  if (NILP (tem))
+                    break;
+                }
+              unbind_to (count, Qnil);
+              if (CONSP (regexps))
+                continue;
+            }
 
           /* Ignore this element if there is a predicate
              and the predicate doesn't like it. */
@@ -1789,19 +1791,20 @@ the values STRING, PREDICATE and `lambda'.  */)
     return call3 (alist, string, predicate, Qlambda);
 
   /* Reject this element if it fails to match all the regexps.  */
-  {
-    int count = SPECPDL_INDEX ();
-    specbind (Qcase_fold_search, completion_ignore_case ? Qt : Qnil);
-    for (regexps = Vcompletion_regexp_list; CONSP (regexps);
-         regexps = XCDR (regexps))
-      {
-        if (NILP (Fstring_match (XCAR (regexps),
-                                 SYMBOLP (tem) ? string : tem,
-                                 Qnil)))
-          return unbind_to (count, Qnil);
-      }
-    unbind_to (count, Qnil);
-  }
+  if (CONSP (Vcompletion_regexp_list))
+    {
+      int count = SPECPDL_INDEX ();
+      specbind (Qcase_fold_search, completion_ignore_case ? Qt : Qnil);
+      for (regexps = Vcompletion_regexp_list; CONSP (regexps);
+           regexps = XCDR (regexps))
+        {
+          if (NILP (Fstring_match (XCAR (regexps),
+                                   SYMBOLP (tem) ? string : tem,
+                                   Qnil)))
+            return unbind_to (count, Qnil);
+        }
+      unbind_to (count, Qnil);
+    }
 
   /* Finally, check the predicate.  */
   if (!NILP (predicate))
diff --git a/src/print.c b/src/print.c
index 0e07cd6fdd3..a91276d409a 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1822,7 +1822,7 @@ print_object (obj, printcharfun, escapeflag)
 
           PRINTCHAR ('#');
           PRINTCHAR ('&');
-          sprintf (buf, "%d", XBOOL_VECTOR (obj)->size);
+          sprintf (buf, "%ld", (long) XBOOL_VECTOR (obj)->size);
           strout (buf, -1, -1, printcharfun, 0);
           PRINTCHAR ('\"');
 
@@ -1875,7 +1875,7 @@ print_object (obj, printcharfun, escapeflag)
       else if (WINDOWP (obj))
         {
           strout ("#<window ", -1, -1, printcharfun, 0);
-          sprintf (buf, "%d", XFASTINT (XWINDOW (obj)->sequence_number));
+          sprintf (buf, "%ld", (long) XFASTINT (XWINDOW (obj)->sequence_number));
           strout (buf, -1, -1, printcharfun, 0);
           if (!NILP (XWINDOW (obj)->buffer))
             {
@@ -1896,8 +1896,8 @@ print_object (obj, printcharfun, escapeflag)
               PRINTCHAR (' ');
               strout (SDATA (SYMBOL_NAME (h->weak)), -1, -1, printcharfun, 0);
               PRINTCHAR (' ');
-              sprintf (buf, "%d/%d", XFASTINT (h->count),
-                       XVECTOR (h->next)->size);
+              sprintf (buf, "%ld/%ld", (long) XFASTINT (h->count),
+                       (long) XVECTOR (h->next)->size);
               strout (buf, -1, -1, printcharfun, 0);
             }
           sprintf (buf, " 0x%lx", (unsigned long) h);
@@ -2020,7 +2020,7 @@ print_object (obj, printcharfun, escapeflag)
           break;
 
         case Lisp_Misc_Intfwd:
-          sprintf (buf, "#<intfwd to %d>", *XINTFWD (obj)->intvar);
+          sprintf (buf, "#<intfwd to %ld>", (long) *XINTFWD (obj)->intvar);
           strout (buf, -1, -1, printcharfun, 0);
           break;
 
diff --git a/src/process.c b/src/process.c
index d2789e0e42e..71f38afc776 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3619,6 +3619,8 @@ FLAGS is the current flags of the interface.  */)
 #endif
 #endif  /* HAVE_SOCKETS */
 
+/* Turn off input and output for process PROC.  */
+
 void
 deactivate_process (proc)
      Lisp_Object proc;
diff --git a/src/regex.c b/src/regex.c
index db69275c312..31a10ee92e0 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -1961,41 +1961,10 @@ struct range_table_work_area
        }                                                                \
     } while (0)
 
-#if WIDE_CHAR_SUPPORT
-/* The GNU C library provides support for user-defined character classes
-   and the functions from ISO C amendement 1.  */
-# ifdef CHARCLASS_NAME_MAX
-#  define CHAR_CLASS_MAX_LENGTH CHARCLASS_NAME_MAX
-# else
-/* This shouldn't happen but some implementation might still have this
-   problem.  Use a reasonable default value.  */
-#  define CHAR_CLASS_MAX_LENGTH 256
-# endif
-typedef wctype_t re_wctype_t;
-typedef wchar_t re_wchar_t;
-# define re_wctype wctype
-# define re_iswctype iswctype
-# define re_wctype_to_bit(cc) 0
-#else
-# define CHAR_CLASS_MAX_LENGTH  9 /* Namely, `multibyte'.  */
-# define btowc(c) c
-
-/* Character classes.  */
-typedef enum { RECC_ERROR = 0,
-               RECC_ALNUM, RECC_ALPHA, RECC_WORD,
-               RECC_GRAPH, RECC_PRINT,
-               RECC_LOWER, RECC_UPPER,
-               RECC_PUNCT, RECC_CNTRL,
-               RECC_DIGIT, RECC_XDIGIT,
-               RECC_BLANK, RECC_SPACE,
-               RECC_MULTIBYTE, RECC_NONASCII,
-               RECC_ASCII, RECC_UNIBYTE
-} re_wctype_t;
-
-typedef int re_wchar_t;
+#if ! WIDE_CHAR_SUPPORT
 
 /* Map a string to the char class it names (if any).  */
-static re_wctype_t
+re_wctype_t
 re_wctype (str)
      re_char *str;
 {
@@ -2021,7 +1990,7 @@ re_wctype (str)
 }
 
 /* True iff CH is in the char class CC.  */
-static boolean
+boolean
 re_iswctype (ch, cc)
      int ch;
      re_wctype_t cc;
diff --git a/src/regex.h b/src/regex.h
index 1818d5f9681..f969c9c5e74 100644
--- a/src/regex.h
+++ b/src/regex.h
@@ -562,6 +562,49 @@ extern void regfree _RE_ARGS ((regex_t *__preg));
 }
 #endif  /* C++ */
 
+/* For platform which support the ISO C amendement 1 functionality we
+   support user defined character classes.  */
+#if WIDE_CHAR_SUPPORT
+/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.  */
+# include <wchar.h>
+# include <wctype.h>
+#endif
+
+#if WIDE_CHAR_SUPPORT
+/* The GNU C library provides support for user-defined character classes
+   and the functions from ISO C amendement 1.  */
+# ifdef CHARCLASS_NAME_MAX
+#  define CHAR_CLASS_MAX_LENGTH CHARCLASS_NAME_MAX
+# else
+/* This shouldn't happen but some implementation might still have this
+   problem.  Use a reasonable default value.  */
+#  define CHAR_CLASS_MAX_LENGTH 256
+# endif
+typedef wctype_t re_wctype_t;
+typedef wchar_t re_wchar_t;
+# define re_wctype wctype
+# define re_iswctype iswctype
+# define re_wctype_to_bit(cc) 0
+#else
+# define CHAR_CLASS_MAX_LENGTH  9 /* Namely, `multibyte'.  */
+# define btowc(c) c
+
+/* Character classes.  */
+typedef enum { RECC_ERROR = 0,
+               RECC_ALNUM, RECC_ALPHA, RECC_WORD,
+               RECC_GRAPH, RECC_PRINT,
+               RECC_LOWER, RECC_UPPER,
+               RECC_PUNCT, RECC_CNTRL,
+               RECC_DIGIT, RECC_XDIGIT,
+               RECC_BLANK, RECC_SPACE,
+               RECC_MULTIBYTE, RECC_NONASCII,
+               RECC_ASCII, RECC_UNIBYTE
+} re_wctype_t;
+
+typedef int re_wchar_t;
+
+#endif /* not WIDE_CHAR_SUPPORT */
+
 #endif /* regex.h */
 
 /*
diff --git a/src/syntax.c b/src/syntax.c
index 4b26d04cd30..62612620f03 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -26,6 +26,7 @@ Boston, MA 02111-1307, USA.  */
 #include "buffer.h"
 #include "charset.h"
 #include "keymap.h"
+#include "regex.h"
 
 /* Make syntax table lookup grant data in gl_state.  */
 #define SYNTAX_ENTRY_VIA_PROPERTY
@@ -97,11 +98,12 @@ static int find_start_modiff;
 static int find_defun_start P_ ((int, int));
 static int back_comment P_ ((int, int, int, int, int, int *, int *));
 static int char_quoted P_ ((int, int));
-static Lisp_Object skip_chars P_ ((int, int, Lisp_Object, Lisp_Object));
+static Lisp_Object skip_chars P_ ((int, int, Lisp_Object, Lisp_Object, int));
 static Lisp_Object scan_lists P_ ((int, int, int, int));
 static void scan_sexps_forward P_ ((struct lisp_parse_state *,
                                     int, int, int, int,
                                     int, Lisp_Object, int));
+static int in_classes P_ ((int, Lisp_Object));
 
 
 struct gl_state_s gl_state;             /* Global state of syntax parser.  */
@@ -292,8 +294,11 @@ char_quoted (charpos, bytepos)
 
   while (bytepos >= beg)
     {
+      int c;
+
       UPDATE_SYNTAX_TABLE_BACKWARD (charpos);
-      code = SYNTAX (FETCH_CHAR (bytepos));
+      c = FETCH_CHAR (bytepos);
+      code = SYNTAX (c);
       if (! (code == Scharquote || code == Sescape))
         break;
 
@@ -380,12 +385,16 @@ find_defun_start (pos, pos_byte)
   gl_state.use_global = 0;
   while (PT > BEGV)
     {
+      int c;
+
       /* Open-paren at start of line means we may have found our
          defun-start.  */
-      if (SYNTAX (FETCH_CHAR (PT_BYTE)) == Sopen)
+      c = FETCH_CHAR (PT_BYTE);
+      if (SYNTAX (c) == Sopen)
         {
           SETUP_SYNTAX_TABLE (PT + 1, -1);      /* Try again... */
-          if (SYNTAX (FETCH_CHAR (PT_BYTE)) == Sopen)
+          c = FETCH_CHAR (PT_BYTE);
+          if (SYNTAX (c) == Sopen)
             break;
           /* Now fallback to the default value.  */
           gl_state.current_syntax_table = current_buffer->syntax_table;
@@ -1314,13 +1323,13 @@ except that `]' is never special and `\\' quotes `^', `-' or `\\'
  (but not as the end of a range; quoting is never needed there).
 Thus, with arg "a-zA-Z", this skips letters stopping before first nonletter.
 With arg "^a-zA-Z", skips nonletters stopping before first letter.
-Returns the distance traveled, either zero or positive.
-Note that char classes, e.g. `[:alpha:]', are not currently supported;
-they will be treated as literals.  */)
+Char classes, e.g. `[:alpha:]', are supported.
+
+Returns the distance traveled, either zero or positive.  */)
      (string, lim)
      Lisp_Object string, lim;
 {
-  return skip_chars (1, 0, string, lim);
+  return skip_chars (1, 0, string, lim, 1);
 }
 
 DEFUN ("skip-chars-backward", Fskip_chars_backward, Sskip_chars_backward, 1, 2, 0,
@@ -1330,7 +1339,7 @@ Returns the distance traveled, either zero or negative.  */)
      (string, lim)
      Lisp_Object string, lim;
 {
-  return skip_chars (0, 0, string, lim);
+  return skip_chars (0, 0, string, lim, 1);
 }
 
 DEFUN ("skip-syntax-forward", Fskip_syntax_forward, Sskip_syntax_forward, 1, 2, 0,
@@ -1342,7 +1351,7 @@ This function returns the distance traveled, either zero or positive.  */)
      (syntax, lim)
      Lisp_Object syntax, lim;
 {
-  return skip_chars (1, 1, syntax, lim);
+  return skip_chars (1, 1, syntax, lim, 0);
 }
 
 DEFUN ("skip-syntax-backward", Fskip_syntax_backward, Sskip_syntax_backward, 1, 2, 0,
@@ -1354,13 +1363,14 @@ This function returns the distance traveled, either zero or negative.  */)
      (syntax, lim)
      Lisp_Object syntax, lim;
 {
-  return skip_chars (0, 1, syntax, lim);
+  return skip_chars (0, 1, syntax, lim, 0);
 }
 
 static Lisp_Object
-skip_chars (forwardp, syntaxp, string, lim)
+skip_chars (forwardp, syntaxp, string, lim, handle_iso_classes)
      int forwardp, syntaxp;
      Lisp_Object string, lim;
+     int handle_iso_classes;
 {
   register unsigned int c;
   unsigned char fastmap[0400];
@@ -1376,12 +1386,14 @@ skip_chars (forwardp, syntaxp, string, lim)
   int size_byte;
   const unsigned char *str;
   int len;
+  Lisp_Object iso_classes;
 
   CHECK_STRING (string);
   char_ranges = (int *) alloca (SCHARS (string) * (sizeof (int)) * 2);
   string_multibyte = STRING_MULTIBYTE (string);
   str = SDATA (string);
   size_byte = SBYTES (string);
+  iso_classes = Qnil;
 
   /* Adjust the multibyteness of the string to that of the buffer.  */
   if (multibyte != string_multibyte)
@@ -1437,6 +1449,45 @@ skip_chars (forwardp, syntaxp, string, lim)
         fastmap[syntax_spec_code[c & 0377]] = 1;
       else
         {
+          if (handle_iso_classes && c == '['
+              && i_byte < size_byte
+              && STRING_CHAR (str + i_byte, size_byte - i_byte) == ':')
+            {
+              const unsigned char *class_beg = str + i_byte + 1;
+              const unsigned char *class_end = class_beg;
+              const unsigned char *class_limit = str + size_byte;
+              /* Leave room for the null.        */
+              unsigned char class_name[CHAR_CLASS_MAX_LENGTH + 1];
+              re_wctype_t cc;
+
+              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] == ']')))
+                class_end++;
+
+              if (class_end == class_limit
+                  || *class_end >= 0200
+                  || *class_end <= 040)
+                error ("Invalid ISO C character class");
+
+              bcopy (class_beg, class_name, class_end - class_beg);
+              class_name[class_end - class_beg] = 0;
+
+              cc = re_wctype (class_name);
+              if (cc == 0)
+                error ("Invalid ISO C character class");
+
+              iso_classes = Fcons (make_number (cc), iso_classes);
+
+              i_byte = class_end + 2 - str;
+              continue;
+            }
+
           if (c == '\\')
             {
               if (i_byte == size_byte)
@@ -1630,6 +1681,15 @@ skip_chars (forwardp, syntaxp, string, lim)
                       stop = endp;
                     }
                   c = STRING_CHAR_AND_LENGTH (p, MAX_MULTIBYTE_LENGTH, nbytes);
+
+                  if (! NILP (iso_classes) && in_classes (c, iso_classes))
+                    {
+                      if (negate)
+                        break;
+                      else
+                        goto fwd_ok;
+                    }
+
                   if (SINGLE_BYTE_CHAR_P (c))
                     {
                       if (!fastmap[c])
@@ -1652,6 +1712,7 @@ skip_chars (forwardp, syntaxp, string, lim)
                       if (!(negate ^ (i < n_char_ranges)))
                         break;
                     }
+                fwd_ok:
                   p += nbytes, pos++, pos_byte += nbytes;
                 }
             else
@@ -1664,8 +1725,19 @@ skip_chars (forwardp, syntaxp, string, lim)
                       p = GAP_END_ADDR;
                       stop = endp;
                     }
+
+                  if (!NILP (iso_classes) && in_classes (*p, iso_classes))
+                    {
+                      if (negate)
+                        break;
+                      else
+                        goto fwd_ok;
+                    }
+
                   if (!fastmap[*p])
                     break;
+
+                fwd_unibyte_ok:
                   p++, pos++;
                 }
           }
@@ -1691,6 +1763,15 @@ skip_chars (forwardp, syntaxp, string, lim)
                     p = prev_p - 1, c = *p, nbytes = 1;
                   else
                     c = STRING_CHAR (p, MAX_MULTIBYTE_LENGTH);
+
+                  if (! NILP (iso_classes) && in_classes (c, iso_classes))
+                    {
+                      if (negate)
+                        break;
+                      else
+                        goto back_ok;
+                    }
+
                   if (SINGLE_BYTE_CHAR_P (c))
                     {
                       if (!fastmap[c])
@@ -1705,6 +1786,7 @@ skip_chars (forwardp, syntaxp, string, lim)
                       if (!(negate ^ (i < n_char_ranges)))
                         break;
                     }
+                back_ok:
                   pos--, pos_byte -= nbytes;
                 }
             else
@@ -1717,8 +1799,19 @@ skip_chars (forwardp, syntaxp, string, lim)
                       p = GPT_ADDR;
                       stop = endp;
                     }
+
+                  if (! NILP (iso_classes) && in_classes (p[-1], iso_classes))
+                    {
+                      if (negate)
+                        break;
+                      else
+                        goto fwd_ok;
+                    }
+
                   if (!fastmap[p[-1]])
                     break;
+
+                back_unibyte_ok:
                   p--, pos--;
                 }
           }
@@ -1741,6 +1834,30 @@ skip_chars (forwardp, syntaxp, string, lim)
     return make_number (PT - start_point);
   }
 }
+
+/* Return 1 if character C belongs to one of the ISO classes
+   in the list ISO_CLASSES.  Each class is represented by an
+   integer which is its type according to re_wctype.  */
+
+static int
+in_classes (c, iso_classes)
+     int c;
+     Lisp_Object iso_classes;
+{
+  int fits_class = 0;
+
+  while (! NILP (iso_classes))
+    {
+      Lisp_Object elt;
+      elt = XCAR (iso_classes);
+      iso_classes = XCDR (iso_classes);
+
+      if (re_iswctype (c, XFASTINT (elt)))
+        fits_class = 1;
+    }
+
+  return fits_class;
+}
 
 /* Jump over a comment, assuming we are at the beginning of one.
    FROM is the current position.
@@ -2124,7 +2241,7 @@ scan_lists (from, count, depth, sexpflag)
           INC_BOTH (from, from_byte);
           UPDATE_SYNTAX_TABLE_FORWARD (from);
           if (from < stop && comstart_first
-              && SYNTAX_COMSTART_SECOND (FETCH_CHAR (from_byte))
+              && (c = FETCH_CHAR (from_byte), SYNTAX_COMSTART_SECOND (c))
               && parse_sexp_ignore_comments)
             {
               /* we have encountered a comment start sequence and we
@@ -2449,7 +2566,7 @@ scan_lists (from, count, depth, sexpflag)
            Fcons (build_string ("Unbalanced parentheses"),
                   Fcons (make_number (last_good),
                          Fcons (make_number (from), Qnil))));
-
+  abort ();
   /* NOTREACHED */
 }
 
@@ -2588,8 +2705,8 @@ scan_sexps_forward (stateptr, from, from_byte, end, targetdepth,
 #define INC_FROM                                \
 do { prev_from = from;                          \
      prev_from_byte = from_byte;                \
-     prev_from_syntax                           \
-       = SYNTAX_WITH_FLAGS (FETCH_CHAR (prev_from_byte)); \
+     temp = FETCH_CHAR (prev_from_byte);        \
+     prev_from_syntax = SYNTAX_WITH_FLAGS (temp); \
      INC_BOTH (from, from_byte);                \
      if (from < end)                            \
        UPDATE_SYNTAX_TABLE_FORWARD (from);      \
@@ -2664,7 +2781,8 @@ do { prev_from = from;				\
   curlevel->last = -1;
 
   SETUP_SYNTAX_TABLE (prev_from, 1);
-  prev_from_syntax = SYNTAX_WITH_FLAGS (FETCH_CHAR (prev_from_byte));
+  temp = FETCH_CHAR (prev_from_byte);
+  prev_from_syntax = SYNTAX_WITH_FLAGS (temp);
   UPDATE_SYNTAX_TABLE_FORWARD (from);
 
   /* Enter the loop at a place appropriate for initial state.  */
@@ -2743,7 +2861,8 @@ do { prev_from = from;				\
           while (from < end)
             {
               /* Some compilers can't handle this inside the switch.  */
-              temp = SYNTAX (FETCH_CHAR (from_byte));
+              temp = FETCH_CHAR (from_byte);
+              temp = SYNTAX (temp);
               switch (temp)
                 {
                 case Scharquote:
diff --git a/src/syntax.h b/src/syntax.h
index f86ab8fc265..cb1eeb62687 100644
--- a/src/syntax.h
+++ b/src/syntax.h
@@ -68,16 +68,16 @@ enum syntaxcode
 
 #ifdef __GNUC__
 #define SYNTAX_ENTRY_FOLLOW_PARENT(table, c)                    \
-  ({ Lisp_Object tbl = table;                                   \
-     Lisp_Object temp = XCHAR_TABLE (tbl)->contents[(c)];       \
-     while (NILP (temp))                                        \
+  ({ Lisp_Object _syntax_tbl = (table);                         \
+     Lisp_Object _syntax_temp = XCHAR_TABLE (_syntax_tbl)->contents[(c)]; \
+     while (NILP (_syntax_temp))                                \
        {                                                        \
-         tbl = XCHAR_TABLE (tbl)->parent;                       \
-         if (NILP (tbl))                                        \
+         _syntax_tbl = XCHAR_TABLE (_syntax_tbl)->parent;       \
+         if (NILP (_syntax_tbl))                                \
            break;                                               \
-         temp = XCHAR_TABLE (tbl)->contents[(c)];               \
+         _syntax_temp = XCHAR_TABLE (_syntax_tbl)->contents[(c)]; \
        }                                                        \
-     temp; })
+     _syntax_temp; })
 #else
 extern Lisp_Object syntax_temp;
 extern Lisp_Object syntax_parent_lookup P_ ((Lisp_Object, int));
@@ -117,24 +117,24 @@ extern Lisp_Object syntax_parent_lookup P_ ((Lisp_Object, int));
 
 #ifdef __GNUC__
 #define SYNTAX(c)                                                       \
-  ({ Lisp_Object temp;                                                  \
-     temp = SYNTAX_ENTRY (c);                                           \
-     (CONSP (temp)                                                      \
-      ? (enum syntaxcode) (XINT (XCAR (temp)) & 0xff)           \
+  ({ Lisp_Object _syntax_temp;                                          \
+     _syntax_temp = SYNTAX_ENTRY (c);                                   \
+     (CONSP (_syntax_temp)                                              \
+      ? (enum syntaxcode) (XINT (XCAR (_syntax_temp)) & 0xff)           \
       : Swhitespace); })
 
 #define SYNTAX_WITH_FLAGS(c)                                            \
-  ({ Lisp_Object temp;                                                  \
-     temp = SYNTAX_ENTRY (c);                                           \
-     (CONSP (temp)                                                      \
-      ? XINT (XCAR (temp))                                      \
+  ({ Lisp_Object _syntax_temp;                                          \
+     _syntax_temp = SYNTAX_ENTRY (c);                                   \
+     (CONSP (_syntax_temp)                                              \
+      ? XINT (XCAR (_syntax_temp))                                      \
       : (int) Swhitespace); })
 
 #define SYNTAX_MATCH(c)                                                 \
-  ({ Lisp_Object temp;                                                  \
-     temp = SYNTAX_ENTRY (c);                                           \
-     (CONSP (temp)                                                      \
-      ? XCDR (temp)                                             \
+  ({ Lisp_Object _syntax_temp;                                          \
+     _syntax_temp = SYNTAX_ENTRY (c);                                   \
+     (CONSP (_syntax_temp)                                              \
+      ? XCDR (_syntax_temp)                                             \
       : Qnil); })
 #else
 #define SYNTAX(c)                                                       \
diff --git a/src/window.c b/src/window.c
index 03ca22dd525..ff0d810a9c8 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3064,8 +3064,8 @@ defaults.  */)
 
 DEFUN ("select-window", Fselect_window, Sselect_window, 1, 2, 0,
        doc: /* Select WINDOW.  Most editing will apply to WINDOW's buffer.
-If WINDOW is not already selected, also make WINDOW's buffer current.
-Also make WINDOW the frame's selected window.
+If WINDOW is not already selected, make WINDOW's buffer current
+and make WINDOW the frame's selected window.
 Optional second arg NORECORD non-nil means
 do not put this buffer at the front of the list of recently selected ones.
 
diff --git a/src/xfaces.c b/src/xfaces.c
index 505e601c57d..171472dbb31 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4915,6 +4915,7 @@ If FRAME is omitted or nil, use the selected frame.  */)
 
 static INLINE int
 face_attr_equal_p (v1, v2)
+     Lisp_Object v1, v2;
 {
   /* Type can differ, e.g. when one attribute is unspecified, i.e. nil,
      and the other is specified.  */