aboutsummaryrefslogtreecommitdiffstats
path: root/src/buffer.c
diff options
context:
space:
mode:
authorKaroly Lorentey2006-02-28 17:35:08 +0000
committerKaroly Lorentey2006-02-28 17:35:08 +0000
commitbdf36482bbea390390ae7ab1461b14b807c4fb1f (patch)
treeb5233d2eecc5dc15e0d4590bb8b006978470c1f9 /src/buffer.c
parent769ca8d5851c58825954d69ffc9b6033db650204 (diff)
parent3ea32d7481523bbb0c54b90606687dcba5c5a405 (diff)
downloademacs-bdf36482bbea390390ae7ab1461b14b807c4fb1f.tar.gz
emacs-bdf36482bbea390390ae7ab1461b14b807c4fb1f.zip
Merged from emacs@sv.gnu.org
Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-120 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-121 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-122 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-123 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-124 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-125 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-126 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-127 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-40 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-41 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-42 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-523
Diffstat (limited to 'src/buffer.c')
-rw-r--r--src/buffer.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/buffer.c b/src/buffer.c
index e1caaac5f89..baa977ab853 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3679,6 +3679,10 @@ modify_overlay (buf, start, end)
3679 /* If multiple windows show this buffer, we must do other windows. */ 3679 /* If multiple windows show this buffer, we must do other windows. */
3680 else if (buffer_shared > 1) 3680 else if (buffer_shared > 1)
3681 windows_or_buffers_changed = 1; 3681 windows_or_buffers_changed = 1;
3682 /* If we modify an overlay at the end of the buffer, we cannot
3683 be sure that window end is still valid. */
3684 else if (end >= ZV && start <= ZV)
3685 windows_or_buffers_changed = 1;
3682 3686
3683 ++BUF_OVERLAY_MODIFF (buf); 3687 ++BUF_OVERLAY_MODIFF (buf);
3684} 3688}
@@ -4120,6 +4124,7 @@ DEFUN ("overlay-put", Foverlay_put, Soverlay_put, 3, 3, 0,
4120 == OVERLAY_POSITION (OVERLAY_END (overlay)))) 4124 == OVERLAY_POSITION (OVERLAY_END (overlay))))
4121 Fdelete_overlay (overlay); 4125 Fdelete_overlay (overlay);
4122 } 4126 }
4127
4123 return value; 4128 return value;
4124} 4129}
4125 4130