2 files changed, 3 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a02d1473b4c..6cacc4576fb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -8,6 +8,8 @@
         EMACS_INT, since callers assume the returned value fits in int.
         (upcase1): Likewise, for UPCASE_TABLE.
         (uppercasep, lowercasep, upcase): New static inline functions.
+        * editfns.c (Fchar_equal): Remove no-longer-needed workaround for
+        the race-condition problem the old DOWNCASE.
 
         * regex.c (CHARSET_LOOKUP_RANGE_TABLE_RAW, POP_FAILURE_REG_OR_COUNT):
         Rename locals to avoid shadowing.
diff --git a/src/editfns.c b/src/editfns.c
index 59cf269ef7b..8d428eb4815 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -4222,9 +4222,6 @@ Case is ignored if `case-fold-search' is non-nil in the current buffer.  */)
   if (NILP (BVAR (current_buffer, case_fold_search)))
     return Qnil;
 
-  /* Do these in separate statements,
-     then compare the variables.
-     because of the way downcase uses temp variables.  */
   i1 = XFASTINT (c1);
   if (NILP (BVAR (current_buffer, enable_multibyte_characters))
       && ! ASCII_CHAR_P (i1))
@@ -4237,9 +4234,7 @@ Case is ignored if `case-fold-search' is non-nil in the current buffer.  */)
     {
       MAKE_CHAR_MULTIBYTE (i2);
     }
-  i1 = downcase (i1);
-  i2 = downcase (i2);
-  return (i1 == i2 ? Qt :  Qnil);
+  return (downcase (i1) == downcase (i2) ? Qt :  Qnil);
 }
 
 /* Transpose the markers in two regions of the current buffer, and