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

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

1 files changed, 6 insertions, 3 deletions

diff --git a/lisp/simple.el b/lisp/simple.el
index 24e7597ff4d..d8acf1f9c25 100644
--- 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")