1 files changed, 4 insertions, 4 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 6ec40aff646..78f1d977221 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2036,7 +2036,7 @@ cleaning up all windows currently displaying the buffer to be killed. */)
   /* If the buffer now current is shown in the minibuffer and our buffer
      is the sole other buffer give up.  */
   XSETBUFFER (tem, current_buffer);
-  if (EQ (tem, XWINDOW (minibuf_window)->contents)
+  if (BASE_EQ (tem, XWINDOW (minibuf_window)->contents)
       && BASE_EQ (buffer, Fother_buffer (buffer, Qnil, Qnil)))
     return Qnil;
 
@@ -3175,7 +3175,7 @@ mouse_face_overlay_overlaps (Lisp_Object overlay)
     {
       if (node->begin < end && node->end > start
           && node->begin < node->end
-          && !EQ (node->data, overlay)
+          && !BASE_EQ (node->data, overlay)
           && (tem = Foverlay_get (overlay, Qmouse_face),
               !NILP (tem)))
         return true;
@@ -3238,7 +3238,7 @@ compare_overlays (const void *v1, const void *v2)
     return s2->end < s1->end ? -1 : 1;
   else if (s1->spriority != s2->spriority)
     return (s1->spriority < s2->spriority ? -1 : 1);
-  else if (EQ (s1->overlay, s2->overlay))
+  else if (BASE_EQ (s1->overlay, s2->overlay))
     return 0;
   else
     /* Avoid the non-determinism of qsort by choosing an arbitrary ordering
@@ -4090,7 +4090,7 @@ report_overlay_modification (Lisp_Object start, Lisp_Object end, bool after,
                              Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3)
 {
   /* True if this change is an insertion.  */
-  bool insertion = (after ? XFIXNAT (arg3) == 0 : EQ (start, end));
+  bool insertion = (after ? XFIXNAT (arg3) == 0 : BASE_EQ (start, end));
 
   /* We used to run the functions as soon as we found them and only register
      them in last_overlay_modification_hooks for the purpose of the `after'