(do-auto-fill): Don't check kinsoku-enable here.

Don't call kinsoku directly, intead call fill-find-break-point.

diff --git a/lisp/simple.el b/lisp/simple.el
index 24e7597ff4dca61c202b0db8764b00c3f93bd0e1..d8acf1f9c257fb614133e22f3b88108d44cb7e43 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2986,9 +2986,12 @@ Setting this variable automatically makes it local to the current buffer.")
                            (skip-chars-backward " \t")
                          ;; Break the line after/before \c|.
                          (forward-char 1))))
-                   (if (and enable-kinsoku enable-multibyte-characters)
-                       (kinsoku (save-excursion
-                                  (forward-line 0) (point))))
+                   (if enable-multibyte-characters
+                       (let ((charset (charset-after (1- (point)))))
+                         (if (eq charset 'ascii)
+                             (setq charset (charset-after (point))))
+                         (if (not (eq charset 'ascii))
+                             (fill-find-break-point charset after-prefix))))
                    ;; Let fill-point be set to the place where we end up.
                    ;; But move back before any whitespace here.
                    (skip-chars-backward " \t")