diff options
author | Miles Bader <miles@gnu.org> | 2007-07-15 04:47:46 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-07-15 04:47:46 +0000 |
commit | 8c406a9bc42ee77fcbbb4201fe8bda855eafd832 (patch) | |
tree | 14c8fa2e72341edd9db40b17079fd5208b1554c8 /src/editfns.c | |
parent | 9bdeb5e9bedd773cc6845bc29a98e1e2a208f1ff (diff) | |
parent | 6f8a87c027ebd6f9cfdac5c0df97d651227bec62 (diff) | |
download | emacs-8c406a9bc42ee77fcbbb4201fe8bda855eafd832.tar.gz |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 806-813)
- Merge from emacs--rel--22
- Update from CVS
* emacs--rel--22 (patch 51-58)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 233-236)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-230
Diffstat (limited to 'src/editfns.c')
-rw-r--r-- | src/editfns.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/editfns.c b/src/editfns.c index b615012c700..43dc59e78b3 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -4256,9 +4256,9 @@ Transposing beyond buffer boundaries is an error. */) (startr1, endr1, startr2, endr2, leave_markers) Lisp_Object startr1, endr1, startr2, endr2, leave_markers; { - register int start1, end1, start2, end2; - int start1_byte, start2_byte, len1_byte, len2_byte; - int gap, len1, len_mid, len2; + register EMACS_INT start1, end1, start2, end2; + EMACS_INT start1_byte, start2_byte, len1_byte, len2_byte; + EMACS_INT gap, len1, len_mid, len2; unsigned char *start1_addr, *start2_addr, *temp; INTERVAL cur_intv, tmp_interval1, tmp_interval_mid, tmp_interval2, tmp_interval3; |