From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Wed, 15 Feb 2017 05:59:29 +0000 (+0000)
Subject: Document fill-separate-heterogeneous-words-with-space (bug#25685)
X-Git-Tag: emacs-26.0.90~829
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8a9c468b6f5cf2ffc684270433f8d9173236a22d;p=emacs.git

Document fill-separate-heterogeneous-words-with-space (bug#25685)

* doc/lispref/text.texi (Filling):
Document fill-separate-heterogeneous-words-with-space (bug#25685).
---

diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 438c67be89b..9696c73c484 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -1649,6 +1649,13 @@ If this variable is non-@code{nil}, it should be a string of
 characters that can end a sentence without following spaces.
 @end defopt
 
+@defopt fill-separate-heterogeneous-words-with-space
+If this variable is non-@code{nil}, two words of different kind (e.g.,
+English and CJK) will be separated with a space when concatenating one
+that is in the end of a line and the other that is in the beginning of
+the next line for filling.
+@end defopt
+
 @defvar fill-paragraph-function
 This variable provides a way to override the filling of paragraphs.
 If its value is non-@code{nil}, @code{fill-paragraph} calls this