Merge branch 'trunk' into xwidget

Conflicts:
	src/window.c

1 files changed, 1 insertions, 1 deletions

diff --git a/src/bytecode.c b/src/bytecode.c
index 4940fd5c182..d95c53bf055 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -1636,7 +1636,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;