diff options
| author | Paul Eggert | 2012-05-25 11:19:24 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-05-25 11:19:24 -0700 |
| commit | 42b2a986d9d4b7040fb20c90ec0efeffb78e761a (patch) | |
| tree | d38e7bf5307837f2f38982757f088100de18a64e /src/intervals.c | |
| parent | e4d81efc58695c19154d5f6733d91172b4c3e5b7 (diff) | |
| parent | a8d3cbf75d219d7a249fc0623219511179e959da (diff) | |
| download | emacs-42b2a986d9d4b7040fb20c90ec0efeffb78e761a.tar.gz emacs-42b2a986d9d4b7040fb20c90ec0efeffb78e761a.zip | |
Merge from trunk.
Diffstat (limited to 'src/intervals.c')
| -rw-r--r-- | src/intervals.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/intervals.c b/src/intervals.c index e6c1b4d60d2..0b332caf897 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); |