Commit 93ea6e8f authored by Paul Eggert's avatar Paul Eggert
Browse files

* 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.
parent 4889fc82
2011-04-14 Paul Eggert <eggert@cs.ucla.edu>
* 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 <eggert@cs.ucla.edu> 2011-04-13 Paul Eggert <eggert@cs.ucla.edu>
* insdel.c: Make symbols static if they're not exported. * insdel.c: Make symbols static if they're not exported.
......
...@@ -51,7 +51,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -51,7 +51,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define TMEM(sym, set) (CONSP (set) ? ! NILP (Fmemq (sym, set)) : ! NILP (set)) #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 (INTERVAL, INTERVAL);
static INTERVAL reproduce_tree_obj (INTERVAL, Lisp_Object); static INTERVAL reproduce_tree_obj (INTERVAL, Lisp_Object);
...@@ -1089,7 +1090,7 @@ FR 8 9 A B ...@@ -1089,7 +1090,7 @@ FR 8 9 A B
left rear-nonsticky = t, right front-sticky = nil (inherit none) left rear-nonsticky = t, right front-sticky = nil (inherit none)
*/ */
Lisp_Object static Lisp_Object
merge_properties_sticky (Lisp_Object pleft, Lisp_Object pright) merge_properties_sticky (Lisp_Object pleft, Lisp_Object pright)
{ {
register Lisp_Object props, front, rear; register Lisp_Object props, front, rear;
...@@ -1258,7 +1259,7 @@ delete_node (register INTERVAL i) ...@@ -1258,7 +1259,7 @@ delete_node (register INTERVAL i)
I is presumed to be empty; that is, no adjustments are made I is presumed to be empty; that is, no adjustments are made
for the length of I. */ for the length of I. */
void static void
delete_interval (register INTERVAL i) delete_interval (register INTERVAL i)
{ {
register INTERVAL parent; register INTERVAL parent;
...@@ -1446,7 +1447,7 @@ offset_intervals (struct buffer *buffer, EMACS_INT start, EMACS_INT length) ...@@ -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) The caller must verify that this is not the last (rightmost)
interval. */ interval. */
INTERVAL static INTERVAL
merge_interval_right (register INTERVAL i) merge_interval_right (register INTERVAL i)
{ {
register EMACS_INT absorb = LENGTH (i); register EMACS_INT absorb = LENGTH (i);
......
...@@ -266,8 +266,6 @@ extern INTERVAL find_interval (INTERVAL, EMACS_INT); ...@@ -266,8 +266,6 @@ extern INTERVAL find_interval (INTERVAL, EMACS_INT);
extern INTERVAL next_interval (INTERVAL); extern INTERVAL next_interval (INTERVAL);
extern INTERVAL previous_interval (INTERVAL); extern INTERVAL previous_interval (INTERVAL);
extern INTERVAL merge_interval_left (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 offset_intervals (struct buffer *, EMACS_INT, EMACS_INT);
extern void graft_intervals_into_buffer (INTERVAL, EMACS_INT, EMACS_INT, extern void graft_intervals_into_buffer (INTERVAL, EMACS_INT, EMACS_INT,
struct buffer *, int); struct buffer *, int);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment