upstream

1 files changed, 5 insertions, 5 deletions

diff --git a/src/editfns.c b/src/editfns.c
index a14e043c1bf..65baaf4e3f8 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2783,8 +2783,8 @@ determines whether case is significant or ignored.  */)
 
       if (!NILP (trt))
         {
-          c1 = CHAR_TABLE_TRANSLATE (trt, c1);
-          c2 = CHAR_TABLE_TRANSLATE (trt, c2);
+          c1 = char_table_translate (trt, c1);
+          c2 = char_table_translate (trt, c2);
         }
       if (c1 < c2)
         return make_number (- 1 - chars);
@@ -4263,7 +4263,7 @@ usage: (format STRING &rest OBJECTS)  */)
     }
 
   if (bufsize < p - buf)
-    abort ();
+    emacs_abort ();
 
   if (maybe_combine_byte)
     nchars = multibyte_chars_in_text ((unsigned char *) buf, p - buf);
@@ -4603,7 +4603,7 @@ Transposing beyond buffer boundaries is an error.  */)
                                      len1_byte, end2, start2_byte + len2_byte)
           || count_combining_after (BYTE_POS_ADDR (start1_byte),
                                     len1_byte, end2, start2_byte + len2_byte))
-        abort ();
+        emacs_abort ();
     }
   else
     {
@@ -4615,7 +4615,7 @@ Transposing beyond buffer boundaries is an error.  */)
                                     len2_byte, end1, start1_byte + len1_byte)
           || count_combining_after (BYTE_POS_ADDR (start1_byte),
                                     len1_byte, end2, start2_byte + len2_byte))
-        abort ();
+        emacs_abort ();
     }
 #endif