(fill-region-as-paragraph): While deleting a

newline in multibyte buffer, if previous or next character is a
composite char, check the first component of the composite char.

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index a563cb52d72945e8ffc8cb4bfc1ad6783238c6a5..14f7e23d4c028ddf7b47e2af6ed72406a7318d44 100644 (file)
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -434,6 +434,10 @@ space does not end a sentence, so don't break a line there."
              (while (search-forward "\n" nil t)
                (let ((prev (char-before (match-beginning 0)))
                      (next (following-char)))
+                 (if (cmpcharp prev)
+                     (setq prev (composite-char-component prev 0)))
+                 (if (cmpcharp next)
+                     (setq next (composite-char-component next 0)))
                  (if (and (or (aref (char-category-set next) ?|)
                               (aref (char-category-set prev) ?|))
                           (or (get-charset-property (char-charset prev)