1 files changed, 7 insertions, 13 deletions

diff --git a/src/casefiddle.c b/src/casefiddle.c
index 28ffcb298ff..b2b87e7a858 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -64,13 +64,9 @@ casify_object (enum case_action flag, Lisp_Object obj)
         multibyte = 1;
       if (! multibyte)
         MAKE_CHAR_MULTIBYTE (c1);
-      c = downcase (c1);
-      if (inword)
-        XSETFASTINT (obj, c | flags);
-      else if (c == (XFASTINT (obj) & ~flagbits))
+      c = flag == CASE_DOWN ? downcase (c1) : upcase (c1);
+      if (c != c1)
         {
-          if (! inword)
-            c = upcase1 (c1);
           if (! multibyte)
             MAKE_CHAR_UNIBYTE (c);
           XSETFASTINT (obj, c | flags);
@@ -95,7 +91,7 @@ casify_object (enum case_action flag, Lisp_Object obj)
             c = downcase (c);
           else if (!uppercasep (c)
                    && (!inword || flag != CASE_CAPITALIZE_UP))
-            c = upcase1 (c1);
+            c = upcase (c1);
           if ((int) flag >= (int) CASE_CAPITALIZE)
             inword = (SYNTAX (c) == Sword);
           if (c != c1)
@@ -127,9 +123,8 @@ casify_object (enum case_action flag, Lisp_Object obj)
           c = STRING_CHAR_AND_LENGTH (SDATA (obj) + i_byte, len);
           if (inword && flag != CASE_CAPITALIZE_UP)
             c = downcase (c);
-          else if (!uppercasep (c)
-                   && (!inword || flag != CASE_CAPITALIZE_UP))
-            c = upcase1 (c);
+          else if (!inword || flag != CASE_CAPITALIZE_UP)
+            c = upcase (c);
           if ((int) flag >= (int) CASE_CAPITALIZE)
             inword = (SYNTAX (c) == Sword);
           o += CHAR_STRING (c, o);
@@ -236,9 +231,8 @@ casify_region (enum case_action flag, Lisp_Object b, Lisp_Object e)
       c2 = c;
       if (inword && flag != CASE_CAPITALIZE_UP)
         c = downcase (c);
-      else if (!uppercasep (c)
-               && (!inword || flag != CASE_CAPITALIZE_UP))
-        c = upcase1 (c);
+      else if (!inword || flag != CASE_CAPITALIZE_UP)
+        c = upcase (c);
       if ((int) flag >= (int) CASE_CAPITALIZE)
         inword = ((SYNTAX (c) == Sword)
                   && (inword || !syntax_prefix_flag_p (c)));