aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2013-03-10 21:02:06 -0700
committerPaul Eggert2013-03-10 21:02:06 -0700
commitcb0290dfa24e02a8b0967e5674e37e440c1b6e7e (patch)
treefd8ff5211af19832bd0f8c2a7ef5eaa520e940ad /src
parent25c09217a0bb2ef721419304d5922d05ae8fc26b (diff)
downloademacs-cb0290dfa24e02a8b0967e5674e37e440c1b6e7e.tar.gz
emacs-cb0290dfa24e02a8b0967e5674e37e440c1b6e7e.zip
* insdel.c (adjust_after_replace): Use bool for boolean.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/insdel.c8
-rw-r--r--src/lisp.h6
3 files changed, 10 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2359311f98a..8ae25e6e612 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-03-11 Paul Eggert <eggert@cs.ucla.edu>
2
3 * insdel.c (adjust_after_replace): Use bool for boolean.
4
12013-03-11 Stefan Monnier <monnier@iro.umontreal.ca> 52013-03-11 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * keyboard.c: Move keyboard decoding to read_key_sequence. 7 * keyboard.c: Move keyboard decoding to read_key_sequence.
diff --git a/src/insdel.c b/src/insdel.c
index 992cebb04b0..5e3f4427538 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -1162,16 +1162,16 @@ insert_from_buffer_1 (struct buffer *buf,
1162 1162
1163/* Record undo information and adjust markers and position keepers for 1163/* Record undo information and adjust markers and position keepers for
1164 a replacement of a text PREV_TEXT at FROM to a new text of LEN 1164 a replacement of a text PREV_TEXT at FROM to a new text of LEN
1165 chars (LEN_BYTE bytes). If TEXT_AT_GAP_TAIL is zero, the new text 1165 chars (LEN_BYTE bytes). If TEXT_AT_GAP_TAIL, the new text
1166 resides in the gap just after GPT_BYTE. Otherwise, the text 1166 resides at the gap tail; i.e. at (GAP_END_ADDR - LEN_BNYTE)
1167 resides at the gap tail; i.e. at (GAP_END_ADDR - LEN_BNYTE). 1167 Otherwise, the text resides in the gap just after GPT_BYTE.
1168 1168
1169 PREV_TEXT nil means the new text was just inserted. */ 1169 PREV_TEXT nil means the new text was just inserted. */
1170 1170
1171void 1171void
1172adjust_after_replace (ptrdiff_t from, ptrdiff_t from_byte, 1172adjust_after_replace (ptrdiff_t from, ptrdiff_t from_byte,
1173 Lisp_Object prev_text, ptrdiff_t len, ptrdiff_t len_byte, 1173 Lisp_Object prev_text, ptrdiff_t len, ptrdiff_t len_byte,
1174 int text_at_gap_tail) 1174 bool text_at_gap_tail)
1175{ 1175{
1176 ptrdiff_t nchars_del = 0, nbytes_del = 0; 1176 ptrdiff_t nchars_del = 0, nbytes_del = 0;
1177 1177
diff --git a/src/lisp.h b/src/lisp.h
index 171292f942e..bb9f60b29f9 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2900,10 +2900,8 @@ extern Lisp_Object del_range_2 (ptrdiff_t, ptrdiff_t,
2900extern void modify_region_1 (ptrdiff_t, ptrdiff_t, bool); 2900extern void modify_region_1 (ptrdiff_t, ptrdiff_t, bool);
2901extern void prepare_to_modify_buffer (ptrdiff_t, ptrdiff_t, ptrdiff_t *); 2901extern void prepare_to_modify_buffer (ptrdiff_t, ptrdiff_t, ptrdiff_t *);
2902extern void signal_after_change (ptrdiff_t, ptrdiff_t, ptrdiff_t); 2902extern void signal_after_change (ptrdiff_t, ptrdiff_t, ptrdiff_t);
2903extern void adjust_after_replace (ptrdiff_t from, ptrdiff_t from_byte, 2903extern void adjust_after_replace (ptrdiff_t, ptrdiff_t, Lisp_Object,
2904 Lisp_Object prev_text, 2904 ptrdiff_t, ptrdiff_t, bool);
2905 ptrdiff_t len, ptrdiff_t len_byte,
2906 int text_at_gap_tail);
2907extern void adjust_after_insert (ptrdiff_t, ptrdiff_t, ptrdiff_t, 2905extern void adjust_after_insert (ptrdiff_t, ptrdiff_t, ptrdiff_t,
2908 ptrdiff_t, ptrdiff_t); 2906 ptrdiff_t, ptrdiff_t);
2909extern void adjust_markers_for_delete (ptrdiff_t, ptrdiff_t, 2907extern void adjust_markers_for_delete (ptrdiff_t, ptrdiff_t,