Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-234
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-235
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-236
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-237
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-238
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-239
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-240
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-241
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-242
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-243
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-244
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-245
   (Ffield_beginning, find_field): Undo change of 2006-04-23.

 * emacs@sv.gnu.org/emacs--devo--0--patch-246
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-247
   Rcirc patch from Ryan Yeske

 * emacs@sv.gnu.org/emacs--devo--0--patch-248
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-249
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-250
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-251
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-87
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-88
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-89
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-90
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-91
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-92
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-93
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-94
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-95
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-553

1 files changed, 26 insertions, 6 deletions

diff --git a/src/textprop.c b/src/textprop.c
index 65823d9fa3f..e2f9c531735 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1602,10 +1602,12 @@ Return t if any property was actually removed, nil otherwise.  */)
         }
     }
 
-  if (BUFFERP (object))
-    modify_region (XBUFFER (object), XINT (start), XINT (end));
-
-  /* We are at the beginning of an interval, with len to scan */
+  /* We are at the beginning of an interval, with len to scan.
+     The flag `modified' records if changes have been made.
+     When object is a buffer, we must call modify_region before changes are
+     made and signal_after_change when we are done.
+     We call modify_region before calling remove_properties iff modified == 0,
+     and we call signal_after_change before returning iff modified != 0. */
   for (;;)
     {
       if (i == 0)
@@ -1614,10 +1616,20 @@ Return t if any property was actually removed, nil otherwise.  */)
       if (LENGTH (i) >= len)
         {
           if (! interval_has_some_properties_list (properties, i))
-            return modified ? Qt : Qnil;
+            if (modified)
+              {
+                if (BUFFERP (object))
+                  signal_after_change (XINT (start), XINT (end) - XINT (start),
+                                       XINT (end) - XINT (start));
+                return Qt;
+              }
+            else
+              return Qnil;
 
           if (LENGTH (i) == len)
             {
+              if (!modified && BUFFERP (object))
+                modify_region (XBUFFER (object), XINT (start), XINT (end));
               remove_properties (Qnil, properties, i, object);
               if (BUFFERP (object))
                 signal_after_change (XINT (start), XINT (end) - XINT (start),
@@ -1629,6 +1641,8 @@ Return t if any property was actually removed, nil otherwise.  */)
           unchanged = i;
           i = split_interval_left (i, len);
           copy_properties (unchanged, i);
+          if (!modified && BUFFERP (object))
+            modify_region (XBUFFER (object), XINT (start), XINT (end));
           remove_properties (Qnil, properties, i, object);
           if (BUFFERP (object))
             signal_after_change (XINT (start), XINT (end) - XINT (start),
@@ -1636,8 +1650,14 @@ Return t if any property was actually removed, nil otherwise.  */)
           return Qt;
         }
 
+      if (interval_has_some_properties_list (properties, i))
+        {
+          if (!modified && BUFFERP (object))
+            modify_region (XBUFFER (object), XINT (start), XINT (end));
+          remove_properties (Qnil, properties, i, object);
+          modified = 1;
+        }
       len -= LENGTH (i);
-      modified += remove_properties (Qnil, properties, i, object);
       i = next_interval (i);
     }
 }