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

2 files changed, 18 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 950d4a34b12..53b8b747118 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-13  Daniel Colascione  <dancol@dancol.org>
+
+	* textprop.c (Fremove_list_of_text_properties): Correctly
+	handle reaching the end of the interval tree. (Bug#15344)
+
 2014-01-13  Martin Rudalics  <rudalics@gmx.at>
 
 	* xdisp.c (resize_mini_window): Round height to a multiple of
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;
+        }
     }
 }