diff options
| author | Michael R. Mauger | 2017-07-24 22:15:04 -0400 |
|---|---|---|
| committer | Michael R. Mauger | 2017-07-24 22:15:04 -0400 |
| commit | df1a71272e5cdd10b511e2ffd702ca50ddd8a773 (patch) | |
| tree | 9b9ac725394ee80891e2bff57b6407d0e491e71a /src/intervals.h | |
| parent | eb27fc4d49e8c914cd0e6a8a2d02159601542141 (diff) | |
| parent | 32daa3cb54523006c88717cbeac87964cd687a1b (diff) | |
| download | emacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.tar.gz emacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/intervals.h')
| -rw-r--r-- | src/intervals.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/intervals.h b/src/intervals.h index a0da6f37801..9140e0c17ab 100644 --- a/src/intervals.h +++ b/src/intervals.h | |||
| @@ -242,8 +242,7 @@ extern void traverse_intervals (INTERVAL, ptrdiff_t, | |||
| 242 | void (*) (INTERVAL, Lisp_Object), | 242 | void (*) (INTERVAL, Lisp_Object), |
| 243 | Lisp_Object); | 243 | Lisp_Object); |
| 244 | extern void traverse_intervals_noorder (INTERVAL, | 244 | extern void traverse_intervals_noorder (INTERVAL, |
| 245 | void (*) (INTERVAL, Lisp_Object), | 245 | void (*) (INTERVAL, void *), void *); |
| 246 | Lisp_Object); | ||
| 247 | extern INTERVAL split_interval_right (INTERVAL, ptrdiff_t); | 246 | extern INTERVAL split_interval_right (INTERVAL, ptrdiff_t); |
| 248 | extern INTERVAL split_interval_left (INTERVAL, ptrdiff_t); | 247 | extern INTERVAL split_interval_left (INTERVAL, ptrdiff_t); |
| 249 | extern INTERVAL find_interval (INTERVAL, ptrdiff_t); | 248 | extern INTERVAL find_interval (INTERVAL, ptrdiff_t); |