* 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 06e71e33fde2f52dd6c42bfe5709e652160aae12..b06279b1a0a6f292f2f7d0ae7c19f3f2517a435f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * 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  <monnier@iro.umontreal.ca>
 
        * xdisp.c (prepare_menu_bars): Call Vpre_redisplay_function.

diff --git a/src/insdel.c b/src/insdel.c
index 7e6182deb9169da131180a1c948952ccfde72148..d7b7ff05e2c0038b66a7a2e20bf775f012035519 100644 (file)
--- 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;