Merge branch 'fix/bug-20871-cur'

author Marcin Borkowski <mbork@mbork.pl>

Wed, 24 Jan 2018 09:32:40 +0000 (10:32 +0100)

committer Marcin Borkowski <mbork@mbork.pl>

Wed, 24 Jan 2018 09:32:40 +0000 (10:32 +0100)
author Marcin Borkowski <mbork@mbork.pl>
Wed, 24 Jan 2018 09:32:40 +0000 (10:32 +0100)
committer Marcin Borkowski <mbork@mbork.pl>
Wed, 24 Jan 2018 09:32:40 +0000 (10:32 +0100)
diff --cc doc/emacs/text.texi
Simple merge
diff --cc etc/NEWS
Simple merge
diff --cc lisp/textmodes/fill.el
Simple merge
author	Marcin Borkowski <mbork@mbork.pl>
	Wed, 24 Jan 2018 09:32:40 +0000 (10:32 +0100)
committer	Marcin Borkowski <mbork@mbork.pl>
	Wed, 24 Jan 2018 09:32:40 +0000 (10:32 +0100)
		1	2
doc/emacs/text.texi	patch \|	diff1 \|	diff2 \|	blob \| history
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/textmodes/fill.el	patch \|	diff1 \|	diff2 \|	blob \| history