aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDmitry Antipov2013-10-07 19:03:33 +0400
committerDmitry Antipov2013-10-07 19:03:33 +0400
commitbd74250fd7b09431788d1745cee23a2c6de6deeb (patch)
treec9d1da41e5fe33a03ab4e3b792bfc02dc26f673b /src
parentda3e5ebb8d6b69f82191ac6e6dc63926f210db68 (diff)
downloademacs-bd74250fd7b09431788d1745cee23a2c6de6deeb.tar.gz
emacs-bd74250fd7b09431788d1745cee23a2c6de6deeb.zip
* insdel.c (insert_from_gap): Prefer ptrdiff_t to int where needed.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/insdel.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7483748919d..322629f41c0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-10-07 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * insdel.c (insert_from_gap): Prefer ptrdiff_t to int where needed.
4
12013-10-07 Paul Eggert <eggert@cs.ucla.edu> 52013-10-07 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 emacs_read and emacs_write now use void *, not char *. 7 emacs_read and emacs_write now use void *, not char *.
diff --git a/src/insdel.c b/src/insdel.c
index ebd096a2927..0eb80c04d99 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -988,8 +988,7 @@ insert_from_string_1 (Lisp_Object string, ptrdiff_t pos, ptrdiff_t pos_byte,
988void 988void
989insert_from_gap (ptrdiff_t nchars, ptrdiff_t nbytes, bool text_at_gap_tail) 989insert_from_gap (ptrdiff_t nchars, ptrdiff_t nbytes, bool text_at_gap_tail)
990{ 990{
991 int ins_charpos = GPT; 991 ptrdiff_t ins_charpos = GPT, ins_bytepos = GPT_BYTE;
992 int ins_bytepos = GPT_BYTE;
993 992
994 if (NILP (BVAR (current_buffer, enable_multibyte_characters))) 993 if (NILP (BVAR (current_buffer, enable_multibyte_characters)))
995 nchars = nbytes; 994 nchars = nbytes;