aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2008-04-03 20:01:31 +0000
committerStefan Monnier2008-04-03 20:01:31 +0000
commitf1a6b2163ced8440664a1e0045f7124298386d01 (patch)
tree1869234c370a53e0388436f3325bf41627ed9b92 /src
parentac1491a77fca2b30cbccc3e86e12e0534455df17 (diff)
downloademacs-f1a6b2163ced8440664a1e0045f7124298386d01.tar.gz
emacs-f1a6b2163ced8440664a1e0045f7124298386d01.zip
(insert_from_buffer_1): Don't compare bytes in destination
buffer with byte-size of source buffer.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/insdel.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2093bb61752..5ae4fc6beb8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12008-04-03 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * insdel.c (insert_from_buffer_1): Don't compare bytes in destination
4 buffer with byte-size of source buffer.
5
12008-04-03 Chong Yidong <cyd@stupidchicken.com> 62008-04-03 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * callint.c (Fcall_interactively): Handle temporary region even 8 * callint.c (Fcall_interactively): Handle temporary region even
diff --git a/src/insdel.c b/src/insdel.c
index 2919c183ab7..884620d3899 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -1352,7 +1352,7 @@ insert_from_buffer_1 (buf, from, nchars, inherit)
1352 1352
1353 /* Get the intervals for the part of the string we are inserting. */ 1353 /* Get the intervals for the part of the string we are inserting. */
1354 intervals = BUF_INTERVALS (buf); 1354 intervals = BUF_INTERVALS (buf);
1355 if (outgoing_nbytes < BUF_Z_BYTE (buf) - BUF_BEG_BYTE (buf)) 1355 if (nchars < BUF_Z (buf) - BUF_BEG (buf))
1356 { 1356 {
1357 if (buf == current_buffer && PT <= from) 1357 if (buf == current_buffer && PT <= from)
1358 from += nchars; 1358 from += nchars;