aboutsummaryrefslogtreecommitdiffstats
path: root/src/intervals.c
diff options
context:
space:
mode:
authorKenichi Handa2012-05-03 15:57:54 +0900
committerKenichi Handa2012-05-03 15:57:54 +0900
commit1f110951b52c0d7705dd5891368efccbce95ec1a (patch)
tree5d9683724eb455e9bcb8030fb61114b2e559457b /src/intervals.c
parent2e51d4b5fb960ce0240a0eccbb0ed30cc7f53743 (diff)
parent2bd785a208c84e7ae73884d09a1087da52780b4a (diff)
downloademacs-1f110951b52c0d7705dd5891368efccbce95ec1a.tar.gz
emacs-1f110951b52c0d7705dd5891368efccbce95ec1a.zip
merge trunk
Diffstat (limited to 'src/intervals.c')
-rw-r--r--src/intervals.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/intervals.c b/src/intervals.c
index 88f47f58b52..a750ccd13f7 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -1000,6 +1000,7 @@ adjust_intervals_for_insertion (INTERVAL tree,
1000 Lisp_Object pleft, pright; 1000 Lisp_Object pleft, pright;
1001 struct interval newi; 1001 struct interval newi;
1002 1002
1003 RESET_INTERVAL (&newi);
1003 pleft = NULL_INTERVAL_P (prev) ? Qnil : prev->plist; 1004 pleft = NULL_INTERVAL_P (prev) ? Qnil : prev->plist;
1004 pright = NULL_INTERVAL_P (i) ? Qnil : i->plist; 1005 pright = NULL_INTERVAL_P (i) ? Qnil : i->plist;
1005 newi.plist = merge_properties_sticky (pleft, pright); 1006 newi.plist = merge_properties_sticky (pleft, pright);