1 files changed, 5 insertions, 0 deletions

diff --git a/src/textprop.c b/src/textprop.c
index 5b8dada6042..c41757388c7 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -556,6 +556,9 @@ overlays are considered only if they are associated with OBJECT.")
       Lisp_Object *overlay_vec, tem;
       int next_overlay;
       int len;
+      struct buffer *obuf = current_buffer;
+
+      set_buffer_temp (XBUFFER (object));
 
       /* First try with room for 40 overlays.  */
       len = 40;
@@ -575,6 +578,8 @@ overlays are considered only if they are associated with OBJECT.")
         }
       noverlays = sort_overlays (overlay_vec, noverlays, w);
 
+      set_buffer_temp (obuf);
+
       /* Now check the overlays in order of decreasing priority.  */
       while (--noverlays >= 0)
         {