From 93ea6e8fa937675ade7e03c5aa35886a15185541 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 13 Apr 2011 17:55:09 -0700 Subject: [PATCH] * intervals.c: Make symbols static if they're not exported. (merge_properties_sticky, merge_interval_right, delete_interval): Now static. * intervals.h (merge_interval_right, delete_interval): Remove decls. --- src/ChangeLog | 7 +++++++ src/intervals.c | 9 +++++---- src/intervals.h | 2 -- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 9791e2b4d3..2187a6b562 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2011-04-14 Paul Eggert + + * intervals.c: Make symbols static if they're not exported. + (merge_properties_sticky, merge_interval_right, delete_interval): + Now static. + * intervals.h (merge_interval_right, delete_interval): Remove decls. + 2011-04-13 Paul Eggert * insdel.c: Make symbols static if they're not exported. diff --git a/src/intervals.c b/src/intervals.c index 952f826778..3be6e2d1ff 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -51,7 +51,8 @@ along with GNU Emacs. If not, see . */ #define TMEM(sym, set) (CONSP (set) ? ! NILP (Fmemq (sym, set)) : ! NILP (set)) -Lisp_Object merge_properties_sticky (Lisp_Object pleft, Lisp_Object pright); +static Lisp_Object merge_properties_sticky (Lisp_Object, Lisp_Object); +static INTERVAL merge_interval_right (INTERVAL); static INTERVAL reproduce_tree (INTERVAL, INTERVAL); static INTERVAL reproduce_tree_obj (INTERVAL, Lisp_Object); @@ -1089,7 +1090,7 @@ FR 8 9 A B left rear-nonsticky = t, right front-sticky = nil (inherit none) */ -Lisp_Object +static Lisp_Object merge_properties_sticky (Lisp_Object pleft, Lisp_Object pright) { register Lisp_Object props, front, rear; @@ -1258,7 +1259,7 @@ delete_node (register INTERVAL i) I is presumed to be empty; that is, no adjustments are made for the length of I. */ -void +static void delete_interval (register INTERVAL i) { register INTERVAL parent; @@ -1446,7 +1447,7 @@ offset_intervals (struct buffer *buffer, EMACS_INT start, EMACS_INT length) The caller must verify that this is not the last (rightmost) interval. */ -INTERVAL +static INTERVAL merge_interval_right (register INTERVAL i) { register EMACS_INT absorb = LENGTH (i); diff --git a/src/intervals.h b/src/intervals.h index 3a9ee87b92..f1679eb8b4 100644 --- a/src/intervals.h +++ b/src/intervals.h @@ -266,8 +266,6 @@ extern INTERVAL find_interval (INTERVAL, EMACS_INT); extern INTERVAL next_interval (INTERVAL); extern INTERVAL previous_interval (INTERVAL); extern INTERVAL merge_interval_left (INTERVAL); -extern INTERVAL merge_interval_right (INTERVAL); -extern void delete_interval (INTERVAL); extern void offset_intervals (struct buffer *, EMACS_INT, EMACS_INT); extern void graft_intervals_into_buffer (INTERVAL, EMACS_INT, EMACS_INT, struct buffer *, int); -- 2.20.1