(Fexpand_abbrev): Convert a unibyte character to

multibyte if necessary.

1 files changed, 2 insertions, 4 deletions

diff --git a/src/abbrev.c b/src/abbrev.c
index 64989b40553..7ba0f575a2d 100644
--- a/src/abbrev.c
+++ b/src/abbrev.c
@@ -295,9 +295,7 @@ Returns the abbrev symbol, if expansion took place.  */)
 
       FETCH_CHAR_ADVANCE (c, idx, idx_byte);
       if (! multibyte)
-        {
-          MAKE_CHAR_MULTIBYTE (c);
-        }
+        MAKE_CHAR_MULTIBYTE (c);
 
       if (UPPERCASEP (c))
         c = DOWNCASE (c), uccount++;
@@ -384,7 +382,7 @@ Returns the abbrev symbol, if expansion took place.  */)
 
           /* Find the initial.  */
           while (pos < PT_BYTE
-                 && SYNTAX (*BUF_BYTE_ADDRESS (current_buffer, pos)) != Sword)
+                 && SYNTAX (FETCH_CHAR_AS_MULTIBYTE (pos)) != Sword)
             pos++;
 
           /* Change just that.  */