From: Glenn Morris Date: Sun, 25 Apr 2021 16:16:09 +0000 (-0700) Subject: Merge from origin/emacs-27 X-Git-Tag: emacs-28.0.90~2730 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6dabbddb5fc2a605bd23b3460d791b8e63bcf8f7;p=emacs.git Merge from origin/emacs-27 7d5b973959 (origin/emacs-27) * doc/misc/cl.texi (For Clauses): Minor ... 4570781f8d ; * doc/lispref/files.texi (Directory Names): Add missing ... 1b52fd538d Minor update for make-tarball.txt 8efb8491b2 * doc/misc/cl.texi (Iteration Clauses): fix `never' clause... 0873134682 ; Fix Texinfo in last change to minibuf.texi. cad8913c89 Improve filling-related documentation 2b7eed23eb ; * doc/lispref/keymaps.texi (Easy Menu): Fix typo. 47fc92cefc Fix reference to "yanking" in the main Emacs manual 1789dcdb35 Improve documentation of 'map-y-or-n-p' --- 6dabbddb5fc2a605bd23b3460d791b8e63bcf8f7 diff --cc lisp/textmodes/fill.el index 61514d6761b,6d283bd6f14..3914bdeb83e --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el @@@ -49,11 -51,14 +49,13 @@@ A value of nil means that any change i (defcustom fill-separate-heterogeneous-words-with-space nil "Non-nil means to use a space to separate words of a different kind. - This will be done with a word in the end of a line and a word in - the beginning of the next line when concatenating them for - filling those lines. Whether to use a space depends on how the - words are categorized." + For example, when an English word at the end of a line and a CJK word + at the beginning of the next line are joined into a single line, they + will be separated by a space if this variable is non-nil. + Whether to use a space to separate such words also depends on the entry + in `fill-nospace-between-words-table' for the characters before and + after the newline." :type 'boolean - :group 'fill :version "26.1") (defvar fill-paragraph-function nil