aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2013-10-29 11:40:54 -0700
committerPaul Eggert2013-10-29 11:40:54 -0700
commitdcd163ac993757af6afa129b8625e3ea1c43973a (patch)
treee3e814bbd114f46b650b5f41e798aa4dd77965c1 /src
parent3472b6c682817242f8b6134dea06a6ce4777e419 (diff)
downloademacs-dcd163ac993757af6afa129b8625e3ea1c43973a.tar.gz
emacs-dcd163ac993757af6afa129b8625e3ea1c43973a.zip
* insdel.c: Fix minor problems found by static checking.
(Qregion_extract_function): Now static. (prepare_to_modify_buffer_1): Remove unused locals.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/insdel.c10
2 files changed, 9 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 06e71e33fde..b06279b1a0a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12013-10-29 Paul Eggert <eggert@cs.ucla.edu>
2
3 * insdel.c: Fix minor problems found by static checking.
4 (Qregion_extract_function): Now static.
5 (prepare_to_modify_buffer_1): Remove unused locals.
6
12013-10-29 Stefan Monnier <monnier@iro.umontreal.ca> 72013-10-29 Stefan Monnier <monnier@iro.umontreal.ca>
2 8
3 * xdisp.c (prepare_menu_bars): Call Vpre_redisplay_function. 9 * 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)
1778 bset_point_before_scroll (current_buffer, Qnil); 1778 bset_point_before_scroll (current_buffer, Qnil);
1779} 1779}
1780 1780
1781Lisp_Object Qregion_extract_function; 1781static Lisp_Object Qregion_extract_function;
1782 1782
1783/* Check that it is okay to modify the buffer between START and END, 1783/* Check that it is okay to modify the buffer between START and END,
1784 which are char positions. 1784 which are char positions.
@@ -1854,12 +1854,8 @@ prepare_to_modify_buffer_1 (ptrdiff_t start, ptrdiff_t end,
1854 ? EQ (CAR_SAFE (Vtransient_mark_mode), Qonly) 1854 ? EQ (CAR_SAFE (Vtransient_mark_mode), Qonly)
1855 : (!NILP (Vselect_active_regions) 1855 : (!NILP (Vselect_active_regions)
1856 && !NILP (Vtransient_mark_mode)))) 1856 && !NILP (Vtransient_mark_mode))))
1857 { 1857 Vsaved_region_selection
1858 ptrdiff_t b = marker_position (BVAR (current_buffer, mark)); 1858 = call1 (Fsymbol_value (Qregion_extract_function), Qnil);
1859 ptrdiff_t e = PT;
1860 Vsaved_region_selection
1861 = call1 (Fsymbol_value (Qregion_extract_function), Qnil);
1862 }
1863 1859
1864 signal_before_change (start, end, preserve_ptr); 1860 signal_before_change (start, end, preserve_ptr);
1865 Vdeactivate_mark = Qt; 1861 Vdeactivate_mark = Qt;