diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-01-15 13:53:40 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-01-15 13:53:40 -0800 |
| commit | 9bd8f01cd6613795e6a7bb228b1aff342cc88c8b (patch) | |
| tree | aa566ea564a3d8e344c3015b997a6478e2010b5d /lisp/textmodes/fill.el | |
| parent | e6b1df09551fc02aedcba4dbf5ee91dad4686e9a (diff) | |
| parent | 2c0cfa64553dc1d4d376b42b56e52a007222736b (diff) | |
| download | emacs-9bd8f01cd6613795e6a7bb228b1aff342cc88c8b.tar.gz emacs-9bd8f01cd6613795e6a7bb228b1aff342cc88c8b.tar.bz2 emacs-9bd8f01cd6613795e6a7bb228b1aff342cc88c8b.zip | |
Merge from origin/emacs-26
2c0cfa6455 * ChangeLog.3: Update
4387bb44ae Update authors
bce51bd6f7 * lisp/gnus/message.el (message-do-auto-fill): Prevent do-...
bd2a2a1e84 Improve documentation of etags
7ba75b9637 Teach etags new interpreters for some languages
1f7f03742d * lisp/emacs-lisp/generator.el (iter-defun): Add 'doc-stri...
dbb4aac212 * lisp/emacs-lisp/syntax.el (syntax-propertize): Fix bug#2...
80463a43da Improve documentation of fill-separate-heterogeneous-words...
4bd2416d55 Fix documentation of some x-* functions
9c2b11484f Inherit query-on-exit flag to stderr process (Bug#30031)
3efb1e7def Fix Bug#30057
a9b884c60f Tag some unstable tests, and skip by default (bug#24503)
# Conflicts:
# test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
Diffstat (limited to 'lisp/textmodes/fill.el')
| -rw-r--r-- | lisp/textmodes/fill.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index a46f0b2a4cd..7f9538fb569 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el @@ -50,10 +50,11 @@ A value of nil means that any change in indentation starts a new paragraph." (put 'colon-double-space 'safe-local-variable 'booleanp) (defcustom fill-separate-heterogeneous-words-with-space nil - "Non-nil means that use a space to separate words of 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 is up to how the words are categorized." + "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." :type 'boolean :group 'fill :version "26.1") |