merge from trunk

this merges frmo trunk and fixes various build issues.
this needed a few ugly tweaks.
this hangs in "make check" now

1 files changed, 1 insertions, 1 deletions

diff --git a/src/bytecode.c b/src/bytecode.c
index 9e5f4d1434f..a22be984b44 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -1633,7 +1633,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
             c = XFASTINT (TOP);
             if (NILP (BVAR (current_buffer, enable_multibyte_characters)))
               MAKE_CHAR_MULTIBYTE (c);
-            XSETFASTINT (TOP, syntax_code_spec[(int) SYNTAX (c)]);
+            XSETFASTINT (TOP, syntax_code_spec[SYNTAX (c)]);
           }
           NEXT;