From 77382fcc33809a84866968ed3f969ea65ea4f1f7 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 13 Apr 2011 17:44:47 -0700 Subject: [PATCH] * insdel.c: Make symbols static if they're not exported. However, leave prepare_to_modify_buffer alone. It's never called from outside this function, but that appears to be a bug. (combine_after_change_list, combine_after_change_buffer): (adjust_after_replace): Now static. (adjust_after_replace_noundo): Remove; unused. * lisp.h (adjust_after_replace, adjust_after_replace_noundo): Remove decls. --- src/ChangeLog | 9 ++++++++ src/insdel.c | 58 +++------------------------------------------------ src/lisp.h | 4 ---- 3 files changed, 12 insertions(+), 59 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index c11fd18714e..c87dfb5056e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,14 @@ 2011-04-13 Paul Eggert + * insdel.c: Make symbols static if they're not exported. + However, leave prepare_to_modify_buffer alone. It's never + called from outside this function, but that appears to be a bug. + (combine_after_change_list, combine_after_change_buffer): + (adjust_after_replace): Now static. + (adjust_after_replace_noundo): Remove; unused. + * lisp.h (adjust_after_replace, adjust_after_replace_noundo): + Remove decls. + * indent.c (val_compute_motion, val_vmotion): Now static. * image.c: Make symbols static if they're not exported. diff --git a/src/insdel.c b/src/insdel.c index dd7e3c14335..4bc25025a2f 100644 --- a/src/insdel.c +++ b/src/insdel.c @@ -60,10 +60,10 @@ INFUN (Fcombine_after_change_execute, 0); END-UNCHANGED is the number of chars after the changed range, and CHANGE-AMOUNT is the number of characters inserted by the change (negative for a deletion). */ -Lisp_Object combine_after_change_list; +static Lisp_Object combine_after_change_list; /* Buffer which combine_after_change_list is about. */ -Lisp_Object combine_after_change_buffer; +static Lisp_Object combine_after_change_buffer; Lisp_Object Qinhibit_modification_hooks; @@ -1222,7 +1222,7 @@ insert_from_buffer_1 (struct buffer *buf, PREV_TEXT nil means the new text was just inserted. */ -void +static void adjust_after_replace (EMACS_INT from, EMACS_INT from_byte, Lisp_Object prev_text, EMACS_INT len, EMACS_INT len_byte) { @@ -1285,58 +1285,6 @@ adjust_after_replace (EMACS_INT from, EMACS_INT from_byte, CHARS_MODIFF = MODIFF; } -/* Like adjust_after_replace, but doesn't require PREV_TEXT. - This is for use when undo is not enabled in the current buffer. */ - -void -adjust_after_replace_noundo (EMACS_INT from, EMACS_INT from_byte, - EMACS_INT nchars_del, EMACS_INT nbytes_del, - EMACS_INT len, EMACS_INT len_byte) -{ -#ifdef BYTE_COMBINING_DEBUG - if (count_combining_before (GPT_ADDR, len_byte, from, from_byte) - || count_combining_after (GPT_ADDR, len_byte, from, from_byte)) - abort (); -#endif - - /* Update various buffer positions for the new text. */ - GAP_SIZE -= len_byte; - ZV += len; Z+= len; - ZV_BYTE += len_byte; Z_BYTE += len_byte; - GPT += len; GPT_BYTE += len_byte; - if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */ - - if (nchars_del > 0) - adjust_markers_for_replace (from, from_byte, nchars_del, nbytes_del, - len, len_byte); - else - adjust_markers_for_insert (from, from_byte, - from + len, from_byte + len_byte, 0); - - if (len > nchars_del) - adjust_overlays_for_insert (from, len - nchars_del); - else if (len < nchars_del) - adjust_overlays_for_delete (from, nchars_del - len); - if (BUF_INTERVALS (current_buffer) != 0) - { - offset_intervals (current_buffer, from, len - nchars_del); - } - - if (from < PT) - adjust_point (len - nchars_del, len_byte - nbytes_del); - - /* As byte combining will decrease Z, we must check this again. */ - if (Z - GPT < END_UNCHANGED) - END_UNCHANGED = Z - GPT; - - CHECK_MARKERS (); - - if (len == 0) - evaporate_overlays (from); - MODIFF++; - CHARS_MODIFF = MODIFF; -} - /* Record undo information, adjust markers and position keepers for an insertion of a text from FROM (FROM_BYTE) to TO (TO_BYTE). The text already exists in the current buffer but character length (TO diff --git a/src/lisp.h b/src/lisp.h index 4f254002296..e25ae89dfaa 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2570,10 +2570,6 @@ extern void modify_region (struct buffer *, EMACS_INT, EMACS_INT, int); extern void prepare_to_modify_buffer (EMACS_INT, EMACS_INT, EMACS_INT *); extern void signal_before_change (EMACS_INT, EMACS_INT, EMACS_INT *); extern void signal_after_change (EMACS_INT, EMACS_INT, EMACS_INT); -extern void adjust_after_replace (EMACS_INT, EMACS_INT, Lisp_Object, - EMACS_INT, EMACS_INT); -extern void adjust_after_replace_noundo (EMACS_INT, EMACS_INT, EMACS_INT, - EMACS_INT, EMACS_INT, EMACS_INT); extern void adjust_after_insert (EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT); extern void adjust_markers_for_delete (EMACS_INT, EMACS_INT, -- 2.39.2