aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMarcin Borkowski2018-01-24 10:32:40 +0100
committerMarcin Borkowski2018-01-24 10:32:40 +0100
commit96de0503cd04f3cba7c4db94789b958e9775e2c6 (patch)
tree86a459aa1c5e2739034c7a69e2d74a1e75ac7090 /doc
parent109da684c5124e22505917fe0255ca66f2a6bfc9 (diff)
parent521470987b198fcadff294a8e3c700be21b1a15c (diff)
downloademacs-96de0503cd04f3cba7c4db94789b958e9775e2c6.tar.gz
emacs-96de0503cd04f3cba7c4db94789b958e9775e2c6.zip
Merge branch 'fix/bug-20871-cur'
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/text.texi7
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index b7659976a98..7e49a46b179 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -637,8 +637,11 @@ line. If a function returns a non-@code{nil} value, Emacs will not
637break the line there. Functions you can use there include: 637break the line there. Functions you can use there include:
638@code{fill-single-word-nobreak-p} (don't break after the first word of 638@code{fill-single-word-nobreak-p} (don't break after the first word of
639a sentence or before the last); @code{fill-single-char-nobreak-p} 639a sentence or before the last); @code{fill-single-char-nobreak-p}
640(don't break after a one-letter word); and @code{fill-french-nobreak-p} 640(don't break after a one-letter word preceded by a whitespace
641(don't break after @samp{(} or before @samp{)}, @samp{:} or @samp{?}). 641character); @code{fill-french-nobreak-p} (don't break after @samp{(}
642or before @samp{)}, @samp{:} or @samp{?}); and
643@code{fill-polish-nobreak-p} (don't break after a one letter word,
644even if preceded by a non-whitespace character).
642 645
643@node Fill Prefix 646@node Fill Prefix
644@subsection The Fill Prefix 647@subsection The Fill Prefix