Correctly handle reaching the end of the interval tree. (Bug#15344)

1 files changed, 13 insertions, 0 deletions

diff --git a/src/textprop.c b/src/textprop.c
index 3fff8c42b33..67f517182ea 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1741,6 +1741,19 @@ Return t if any property was actually removed, nil otherwise.  */)
         }
       len -= LENGTH (i);
       i = next_interval (i);
+      if(!i)
+        {
+          if (modified)
+            {
+              if (BUFFERP (object))
+                signal_after_change (XINT (start),
+                                     XINT (end) - XINT (start),
+                                     XINT (end) - XINT (start));
+              return Qt;
+            }
+          else
+            return Qnil;
+        }
     }
 }