Mercurial > emacs

changeset 16194:aef021e2c167

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(gap_left, gap_right, modify_region): Compare overlay_unchanged_modified with OVERLAY_MODIFF.
author Richard M. Stallman <rms@gnu.org>
date Sun, 15 Sep 1996 01:57:44 +0000
parents 6ff2ef91c618
children e15e4bdcb8cc
files src/insdel.c
diffstat 1 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/insdel.c	Sun Sep 15 01:57:03 1996 +0000
+++ b/src/insdel.c	Sun Sep 15 01:57:44 1996 +0000
@@ -64,7 +64,8 @@
 
   if (!newgap)
     {
-      if (unchanged_modified == MODIFF)
+      if (unchanged_modified == MODIFF
+	  && overlay_unchanged_modified == OVERLAY_MODIFF)
 	{
 	  beg_unchanged = pos;
 	  end_unchanged = Z - pos - 1;
@@ -144,7 +145,9 @@
 
   pos--;
 
-  if (unchanged_modified == MODIFF)
+  if (unchanged_modified == MODIFF
+      && overlay_unchanged_modified == OVERLAY_MODIFF)
+
     {
       beg_unchanged = pos;
       end_unchanged = Z - pos - 1;
@@ -716,10 +719,13 @@
 
   prepare_to_modify_buffer (start, end);
 
-  if (start - 1 < beg_unchanged || unchanged_modified == MODIFF)
+  if (start - 1 < beg_unchanged
+      || (unchanged_modified == MODIFF
+	  && overlay_unchanged_modified == OVERLAY_MODIFF))
     beg_unchanged = start - 1;
   if (Z - end < end_unchanged
-      || unchanged_modified == MODIFF)
+      || (unchanged_modified == MODIFF
+	  && overlay_unchanged_modified == OVERLAY_MODIFF))
     end_unchanged = Z - end;
 
   if (MODIFF <= SAVE_MODIFF)