From: Daniel Colascione <dancol@dancol.org>
Date: Mon, 13 Jan 2014 23:41:43 +0000 (-0800)
Subject: Correctly handle reaching the end of the interval tree. (Bug#15344)
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1b49bd5d72d012cd349c29822fd6985bb4e5a158;p=emacs.git

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

1b49bd5d72d012cd349c29822fd6985bb4e5a158
diff --cc src/ChangeLog
index 950d4a34b12,2929c03329c..53b8b747118
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,19 -1,3 +1,24 @@@
++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
 +	frame's line height.  Fix bug in calculation of window start
 +	position (Bug#16424).
 +
 +2014-01-13  Jan Djärv  <jan.h.d@swipnet.se>
 +
 +	* macfont.m: Include termchar.h.
 +	(CG_SET_FILL_COLOR_WITH_FACE_FOREGROUND)
 +	(CG_SET_FILL_COLOR_WITH_FACE_BACKGROUND)
 +	(CG_SET_STROKE_COLOR_WITH_FACE_FOREGROUND): Modified from
 +	*_WITH_GC_* to take face and f as parameters.
 +	(macfont_draw): Check for DRAW_MOUSE_FACE and set face accordingly.
 +	Use *_WITH_FACE_*, and pass face as parameter (Bug#16425).
 +
  2014-01-13  Daniel Colascione  <dancol@dancol.org>
  
  	Fix menu item updating in the presence of the Unity global menu
diff --cc src/textprop.c
index 3fff8c42b33,3fff8c42b33..67f517182ea
--- a/src/textprop.c
+++ b/src/textprop.c
@@@ -1741,6 -1741,6 +1741,19 @@@ Return t if any property was actually r
  	}
        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;
++        }
      }
  }