1 files changed, 14 insertions, 7 deletions

diff --git a/src/cmds.c b/src/cmds.c
index 6314df416a0..6d09556f32c 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -25,7 +25,7 @@ Boston, MA 02110-1301, USA.  */
 #include "lisp.h"
 #include "commands.h"
 #include "buffer.h"
-#include "charset.h"
+#include "character.h"
 #include "syntax.h"
 #include "window.h"
 #include "keyboard.h"
@@ -328,11 +328,11 @@ Whichever character you type to run this command is inserted.  */)
   CHECK_NUMBER (n);
 
   /* Barf if the key that invoked this was not a character.  */
-  if (!INTEGERP (last_command_char))
+  if (!CHARACTERP (last_command_char))
     bitch_at_user ();
   {
     int character = translate_char (Vtranslation_table_for_input,
-                                    XINT (last_command_char), 0, 0, 0);
+                                    XINT (last_command_char));
     if (XINT (n) >= 2 && NILP (current_buffer->overwrite_mode))
       {
         int modified_char = character;
@@ -396,7 +396,6 @@ internal_self_insert (c, noautofill)
   /* At first, get multi-byte form of C in STR.  */
   if (!NILP (current_buffer->enable_multibyte_characters))
     {
-      c = unibyte_char_to_multibyte (c);
       len = CHAR_STRING (c, str);
       if (len == 1)
         /* If C has modifier bits, this makes C an appropriate
@@ -473,10 +472,19 @@ internal_self_insert (c, noautofill)
         }
       hairy = 2;
     }
+
+  if (NILP (current_buffer->enable_multibyte_characters))
+    MAKE_CHAR_MULTIBYTE (c);
+  synt = SYNTAX (c);
+
   if (!NILP (current_buffer->abbrev_mode)
-      && SYNTAX (c) != Sword
+      && synt != Sword
       && NILP (current_buffer->read_only)
-      && PT > BEGV && SYNTAX (XFASTINT (Fprevious_char ())) == Sword)
+      && PT > BEGV
+      && (!NILP (current_buffer->enable_multibyte_characters)
+          ? SYNTAX (XFASTINT (Fprevious_char ())) == Sword
+          : (SYNTAX (unibyte_char_to_multibyte (XFASTINT (Fprevious_char ())))
+             == Sword)))
     {
       int modiff = MODIFF;
       Lisp_Object sym;
@@ -545,7 +553,6 @@ internal_self_insert (c, noautofill)
       Vself_insert_face = Qnil;
     }
 
-  synt = SYNTAX (c);
   if ((synt == Sclose || synt == Smath)
       && !NILP (Vblink_paren_function) && INTERACTIVE
       && !noautofill)