From: Kenichi Handa <handa@m17n.org>
Date: Wed, 19 Jul 2000 03:44:55 +0000 (+0000)
Subject: (code_convert_region): Delete text properties before shrinking the
X-Git-Tag: emacs-pretest-21.0.90~2739
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e077cc80af15ba30231f3e921389415c6a22a59d;p=emacs.git

(code_convert_region): Delete text properties before shrinking the
conversion region.
---

diff --git a/src/coding.c b/src/coding.c
index b2a33c89cd1..17be6af296d 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -4718,6 +4718,7 @@ code_convert_region (from, from_byte, to, to_byte, coding, encodep, replace)
   if (replace)
     {
       int saved_from = from;
+      int saved_inhibit_modification_hooks;
 
       prepare_to_modify_buffer (from, to, &from);
       if (saved_from != from)
@@ -4726,6 +4727,14 @@ code_convert_region (from, from_byte, to, to_byte, coding, encodep, replace)
 	  from_byte = CHAR_TO_BYTE (from), to_byte = CHAR_TO_BYTE (to);
 	  len_byte = to_byte - from_byte;
 	}
+
+      /* The code conversion routine can not preserve text properties
+	 for now.  So, we must remove all text properties in the
+	 region.  Here, we must suppress all modification hooks.  */
+      saved_inhibit_modification_hooks = inhibit_modification_hooks;
+      inhibit_modification_hooks = 1;
+      Fset_text_properties (make_number (from), make_number (to), Qnil, Qnil);
+      inhibit_modification_hooks = saved_inhibit_modification_hooks;
     }
 
   if (! encodep && CODING_REQUIRE_DETECTION (coding))
@@ -4842,17 +4851,6 @@ code_convert_region (from, from_byte, to, to_byte, coding, encodep, replace)
       len -= total_skip; len_byte -= total_skip;
     }
 
-  /* The code conversion routine can not preserve text properties for
-     now.  So, we must remove all text properties in the region.
-     Here, we must suppress all modification hooks.  */
-  if (replace)
-    {
-      int saved_inhibit_modification_hooks = inhibit_modification_hooks;
-      inhibit_modification_hooks = 1;
-      Fset_text_properties (make_number (from), make_number (to), Qnil, Qnil);
-      inhibit_modification_hooks = saved_inhibit_modification_hooks;
-    }
-
   /* For converion, we must put the gap before the text in addition to
      making the gap larger for efficient decoding.  The required gap
      size starts from 2000 which is the magic number used in make_gap.