1 files changed, 4 insertions, 0 deletions

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index a563cb52d72..14f7e23d4c0 100644
--- 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)