(kinsoku): Check the variable enable-kinsoku.

1 files changed, 12 insertions, 11 deletions

diff --git a/lisp/international/kinsoku.el b/lisp/international/kinsoku.el
index 3aec1a0f1b1..b845774fe55 100644
--- a/lisp/international/kinsoku.el
+++ b/lisp/international/kinsoku.el
@@ -157,16 +157,17 @@ shorter.
 `Kinsoku' is a Japanese word which originally means ordering to stay
 in one place, and is used for the text processing described above in
 the context of text formatting."
-  (if (or (and
-	   ;; The character after point can't be placed at beginning
-	   ;; of line.  
-	   (aref (char-category-set (following-char)) ?>)
-	   ;; We at first try to dissolve this situation by making a
-	   ;; line longer.  If it fails, then try making a line
-	   ;; shorter.
-	   (not (kinsoku-longer)))
-	  ;; The character before point can't be placed at end of line.
-	  (aref (char-category-set (preceding-char)) ?<))
-      (kinsoku-shorter linebeg)))
+  (if enable-kinsoku
+      (if (or (and
+	       ;; The character after point can't be placed at beginning
+	       ;; of line.  
+	       (aref (char-category-set (following-char)) ?>)
+	       ;; We at first try to dissolve this situation by making a
+	       ;; line longer.  If it fails, then try making a line
+	       ;; shorter.
+	       (not (kinsoku-longer)))
+	      ;; The character before point can't be placed at end of line.
+	      (aref (char-category-set (preceding-char)) ?<))
+	  (kinsoku-shorter linebeg))))
 
 ;; kinsoku.el ends here