diff options
Diffstat (limited to 'src/intervals.c')
| -rw-r--r-- | src/intervals.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/intervals.c b/src/intervals.c index 952f826778c..3be6e2d1ffa 100644 --- a/src/intervals.c +++ b/src/intervals.c | |||
| @@ -51,7 +51,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 51 | 51 | ||
| 52 | #define TMEM(sym, set) (CONSP (set) ? ! NILP (Fmemq (sym, set)) : ! NILP (set)) | 52 | #define TMEM(sym, set) (CONSP (set) ? ! NILP (Fmemq (sym, set)) : ! NILP (set)) |
| 53 | 53 | ||
| 54 | Lisp_Object merge_properties_sticky (Lisp_Object pleft, Lisp_Object pright); | 54 | static Lisp_Object merge_properties_sticky (Lisp_Object, Lisp_Object); |
| 55 | static INTERVAL merge_interval_right (INTERVAL); | ||
| 55 | static INTERVAL reproduce_tree (INTERVAL, INTERVAL); | 56 | static INTERVAL reproduce_tree (INTERVAL, INTERVAL); |
| 56 | static INTERVAL reproduce_tree_obj (INTERVAL, Lisp_Object); | 57 | static INTERVAL reproduce_tree_obj (INTERVAL, Lisp_Object); |
| 57 | 58 | ||
| @@ -1089,7 +1090,7 @@ FR 8 9 A B | |||
| 1089 | left rear-nonsticky = t, right front-sticky = nil (inherit none) | 1090 | left rear-nonsticky = t, right front-sticky = nil (inherit none) |
| 1090 | */ | 1091 | */ |
| 1091 | 1092 | ||
| 1092 | Lisp_Object | 1093 | static Lisp_Object |
| 1093 | merge_properties_sticky (Lisp_Object pleft, Lisp_Object pright) | 1094 | merge_properties_sticky (Lisp_Object pleft, Lisp_Object pright) |
| 1094 | { | 1095 | { |
| 1095 | register Lisp_Object props, front, rear; | 1096 | register Lisp_Object props, front, rear; |
| @@ -1258,7 +1259,7 @@ delete_node (register INTERVAL i) | |||
| 1258 | I is presumed to be empty; that is, no adjustments are made | 1259 | I is presumed to be empty; that is, no adjustments are made |
| 1259 | for the length of I. */ | 1260 | for the length of I. */ |
| 1260 | 1261 | ||
| 1261 | void | 1262 | static void |
| 1262 | delete_interval (register INTERVAL i) | 1263 | delete_interval (register INTERVAL i) |
| 1263 | { | 1264 | { |
| 1264 | register INTERVAL parent; | 1265 | register INTERVAL parent; |
| @@ -1446,7 +1447,7 @@ offset_intervals (struct buffer *buffer, EMACS_INT start, EMACS_INT length) | |||
| 1446 | The caller must verify that this is not the last (rightmost) | 1447 | The caller must verify that this is not the last (rightmost) |
| 1447 | interval. */ | 1448 | interval. */ |
| 1448 | 1449 | ||
| 1449 | INTERVAL | 1450 | static INTERVAL |
| 1450 | merge_interval_right (register INTERVAL i) | 1451 | merge_interval_right (register INTERVAL i) |
| 1451 | { | 1452 | { |
| 1452 | register EMACS_INT absorb = LENGTH (i); | 1453 | register EMACS_INT absorb = LENGTH (i); |