From: Paul Eggert Date: Tue, 29 Oct 2013 18:40:54 +0000 (-0700) Subject: * insdel.c: Fix minor problems found by static checking. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1081 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dcd163ac993757af6afa129b8625e3ea1c43973a;p=emacs.git * insdel.c: Fix minor problems found by static checking. (Qregion_extract_function): Now static. (prepare_to_modify_buffer_1): Remove unused locals. --- diff --git a/src/ChangeLog b/src/ChangeLog index 06e71e33fde..b06279b1a0a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2013-10-29 Paul Eggert + + * insdel.c: Fix minor problems found by static checking. + (Qregion_extract_function): Now static. + (prepare_to_modify_buffer_1): Remove unused locals. + 2013-10-29 Stefan Monnier * xdisp.c (prepare_menu_bars): Call Vpre_redisplay_function. diff --git a/src/insdel.c b/src/insdel.c index 7e6182deb91..d7b7ff05e2c 100644 --- a/src/insdel.c +++ b/src/insdel.c @@ -1778,7 +1778,7 @@ modify_text (ptrdiff_t start, ptrdiff_t end) bset_point_before_scroll (current_buffer, Qnil); } -Lisp_Object Qregion_extract_function; +static Lisp_Object Qregion_extract_function; /* Check that it is okay to modify the buffer between START and END, which are char positions. @@ -1854,12 +1854,8 @@ prepare_to_modify_buffer_1 (ptrdiff_t start, ptrdiff_t end, ? EQ (CAR_SAFE (Vtransient_mark_mode), Qonly) : (!NILP (Vselect_active_regions) && !NILP (Vtransient_mark_mode)))) - { - ptrdiff_t b = marker_position (BVAR (current_buffer, mark)); - ptrdiff_t e = PT; - Vsaved_region_selection - = call1 (Fsymbol_value (Qregion_extract_function), Qnil); - } + Vsaved_region_selection + = call1 (Fsymbol_value (Qregion_extract_function), Qnil); signal_before_change (start, end, preserve_ptr); Vdeactivate_mark = Qt;