aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXue Fuqiao2013-08-17 12:31:22 +0800
committerXue Fuqiao2013-08-17 12:31:22 +0800
commitc9b39934d655610072cd42e39a46f6332e97dc41 (patch)
tree461262a9c326f797ecab4144909c60fe83f771cb
parentf33650d8cca5e0660814129e19d053488bd4caa3 (diff)
downloademacs-c9b39934d655610072cd42e39a46f6332e97dc41.tar.gz
emacs-c9b39934d655610072cd42e39a46f6332e97dc41.zip
* doc/emacs/text.texi (Filling): Add cross-reference for hard newlines.
-rw-r--r--doc/lispref/ChangeLog1
-rw-r--r--doc/lispref/text.texi3
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 16f3f5bd296..12eec54ef53 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -2,6 +2,7 @@
2 2
3 * text.texi (Maintaining Undo): Mention interactive call of 3 * text.texi (Maintaining Undo): Mention interactive call of
4 buffer-disable-undo. 4 buffer-disable-undo.
5 (Filling): Add cross-reference for hard newlines.
5 6
62013-08-16 Xue Fuqiao <xfq.free@gmail.com> 72013-08-16 Xue Fuqiao <xfq.free@gmail.com>
7 8
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 6205d10ce1b..babb5b71b8f 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -1613,7 +1613,8 @@ Manual}.
1613@defvar use-hard-newlines 1613@defvar use-hard-newlines
1614If this variable is non-@code{nil}, the filling functions do not delete 1614If this variable is non-@code{nil}, the filling functions do not delete
1615newlines that have the @code{hard} text property. These ``hard 1615newlines that have the @code{hard} text property. These ``hard
1616newlines'' act as paragraph separators. 1616newlines'' act as paragraph separators. @xref{Hard and Soft
1617Newlines,, Hard and Soft Newlines, emacs, The GNU Emacs Manual}.
1617@end defvar 1618@end defvar
1618 1619
1619@node Margins 1620@node Margins