diff options
| author | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
| commit | 2c302df3a13236bfbf8ea1b771d13618fcda8d71 (patch) | |
| tree | f26dc9f22861dc37610de319d05255de058c221b /src/intervals.h | |
| parent | 0c747cb143fa227e78f350ac353d703f489209df (diff) | |
| parent | 175069efeb080517afefdd44a06f7a779ea8c25c (diff) | |
| download | emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.tar.gz emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.zip | |
Merge from trunk
Diffstat (limited to 'src/intervals.h')
| -rw-r--r-- | src/intervals.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/intervals.h b/src/intervals.h index b39fbd6899d..47eb8d4bcb1 100644 --- a/src/intervals.h +++ b/src/intervals.h | |||
| @@ -264,12 +264,12 @@ extern INTERVAL previous_interval (INTERVAL); | |||
| 264 | extern INTERVAL merge_interval_left (INTERVAL); | 264 | extern INTERVAL merge_interval_left (INTERVAL); |
| 265 | extern INTERVAL merge_interval_right (INTERVAL); | 265 | extern INTERVAL merge_interval_right (INTERVAL); |
| 266 | extern void delete_interval (INTERVAL); | 266 | extern void delete_interval (INTERVAL); |
| 267 | extern INLINE void offset_intervals (struct buffer *, EMACS_INT, EMACS_INT); | 267 | extern void offset_intervals (struct buffer *, EMACS_INT, EMACS_INT); |
| 268 | extern void graft_intervals_into_buffer (INTERVAL, EMACS_INT, EMACS_INT, | 268 | extern void graft_intervals_into_buffer (INTERVAL, EMACS_INT, EMACS_INT, |
| 269 | struct buffer *, int); | 269 | struct buffer *, int); |
| 270 | extern void verify_interval_modification (struct buffer *, int, int); | 270 | extern void verify_interval_modification (struct buffer *, int, int); |
| 271 | extern INTERVAL balance_intervals (INTERVAL); | 271 | extern INTERVAL balance_intervals (INTERVAL); |
| 272 | extern INLINE void copy_intervals_to_string (Lisp_Object, struct buffer *, | 272 | extern void copy_intervals_to_string (Lisp_Object, struct buffer *, |
| 273 | EMACS_INT, EMACS_INT); | 273 | EMACS_INT, EMACS_INT); |
| 274 | extern INTERVAL copy_intervals (INTERVAL, EMACS_INT, EMACS_INT); | 274 | extern INTERVAL copy_intervals (INTERVAL, EMACS_INT, EMACS_INT); |
| 275 | extern int compare_string_intervals (Lisp_Object, Lisp_Object); | 275 | extern int compare_string_intervals (Lisp_Object, Lisp_Object); |