(auto-composition-after-change): Remove

`auto-composed' property instead of put nil to it.
(toggle-auto-composition): Likewise.

diff --git a/lisp/composite.el b/lisp/composite.el
index ddf56d35434ca6c96b40722e5cabc13c0c17049e..b7a4caab726b3a938a176790bb49bbb01071d396 100644 (file)
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -543,7 +543,7 @@ Auto Composition mode in all buffers (this is the default)."
                      end (1+ end))
              (setq func2 nil))))
        (if (< start end)
-           (put-text-property start end 'auto-composed nil))))))
+           (remove-text-properties start end '(auto-composed nil)))))))
 
 (defun turn-on-auto-composition-if-enabled ()
   (if enable-multibyte-characters
@@ -576,7 +576,8 @@ With arg, enable it iff arg is positive."
     (save-buffer-state nil
       (save-restriction
        (widen)
-       (put-text-property (point-min) (point-max) 'auto-composed nil)))))
+       (remove-text-properties (point-min) (point-max)
+                               '(auto-composed nil))))))
 
 (defun auto-compose-region (from to)
   "Force automatic character composition on the region FROM and TO."