(Fbyte_code): Convert a unibyte character to multibyte if necessary.

diff --git a/src/bytecode.c b/src/bytecode.c
index 6c4e34ddaa79fa1857481103792eae13ae2e7568..df6eb266eb95bd95400f22e2cd20159a6e3f4776 100644 (file)
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -1433,10 +1433,17 @@ If the third argument is incorrect, Emacs may crash.  */)
          break;
 
        case Bchar_syntax:
-         BEFORE_POTENTIAL_GC ();
-         CHECK_NUMBER (TOP);
-         AFTER_POTENTIAL_GC ();
-         XSETFASTINT (TOP, syntax_code_spec[(int) SYNTAX (XINT (TOP))]);
+         {
+           int c;
+
+           BEFORE_POTENTIAL_GC ();
+           CHECK_CHARACTER (TOP);
+           AFTER_POTENTIAL_GC ();
+           c = XFASTINT (TOP);
+           if (NILP (current_buffer->enable_multibyte_characters))
+             MAKE_CHAR_MULTIBYTE (c);
+           XSETFASTINT (TOP, syntax_code_spec[(int) SYNTAX (c)]);
+         }         
          break;
 
        case Bbuffer_substring: