(enable-kinsoku): Name changed form do-kinsoku.

(fill-region-as-paragraph): Do `kinsoku' processing only if both
enable-kinsoku and enable-multibyte-characters are non-nil.

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 805a11eceed46759da14c4cf74abdaecaf9a0e56..47ae163cbcfff0cee2e482d80557f0624395d6fd 100644 (file)
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -51,9 +51,11 @@ A value of nil means that any change in indentation starts a new paragraph."
   "Mode-specific function to fill a paragraph, or nil if there is none.
 If the function returns nil, then `fill-paragraph' does its normal work.")
 
-(defvar do-kinsoku t
-  "*Non-nil means do `kinsoku' processing.
-See the document of `kinsoku' for more detail.")
+(defvar enable-kinsoku t
+  "*Non-nil means enable `kinsoku' processing on filling paragraph.
+`Kinsoku' processing is to prohibit specific characters to be placed
+at beginning or end of line.  See the documentation of kinsoku for
+ more detail.")
 
 (defun set-fill-prefix ()
   "Set the fill prefix to the current line up to point.
@@ -391,7 +393,8 @@ space does not end a sentence, so don't break a line there."
                  ;; Normally, move back over the single space between the words.
                  (if (= (preceding-char) ?\ ) (forward-char -1))
                  ;; Do KINSOKU processing.
-                 (if do-kinsoku (kinsoku linebeg)))
+                 (if (and enable-multibyte-characters enable-kinsoku)
+                     (kinsoku linebeg)))
 
                ;; If the left margin and fill prefix by themselves
                ;; pass the fill-column, keep at least one word.