aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXue Fuqiao2013-09-12 20:04:18 +0800
committerXue Fuqiao2013-09-12 20:04:18 +0800
commit384a7d723ee9cfa2adde22670b1063be8d1a49b4 (patch)
treed9c204b3633ab54fdd57cd676f5a29b6afd31944
parent27e90f7752ed9d02cb98dd2dc2886a4f052240ab (diff)
downloademacs-384a7d723ee9cfa2adde22670b1063be8d1a49b4.tar.gz
emacs-384a7d723ee9cfa2adde22670b1063be8d1a49b4.zip
* doc/emacs/text.texi (Enriched Justification): Explain values of default-justification.
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/text.texi5
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 7ff13a70718..b263ca7671a 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
12013-09-12 Xue Fuqiao <xfq.free@gmail.com>
2
3 * text.texi (Enriched Justification): Explain values of default-justification.
4
12013-09-04 Xue Fuqiao <xfq.free@gmail.com> 52013-09-04 Xue Fuqiao <xfq.free@gmail.com>
2 6
3 * maintaining.texi (VC Ignore): Mention `vc-ignore' with prefix argument. 7 * maintaining.texi (VC Ignore): Mention `vc-ignore' with prefix argument.
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index e5743b064fb..b2cb5ee3d3b 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -2086,6 +2086,7 @@ newlines are used for filling. The @key{RET} (@code{newline}) and
2086commands, including Auto Fill (@pxref{Auto Fill}), insert only soft 2086commands, including Auto Fill (@pxref{Auto Fill}), insert only soft
2087newlines and delete only soft newlines, leaving hard newlines alone. 2087newlines and delete only soft newlines, leaving hard newlines alone.
2088 2088
2089@c FIXME: I don't see ‘unfilled’ in that node. --xfq
2089 Thus, when editing with Enriched mode, you should not use @key{RET} 2090 Thus, when editing with Enriched mode, you should not use @key{RET}
2090or @kbd{C-o} to break lines in the middle of filled paragraphs. Use 2091or @kbd{C-o} to break lines in the middle of filled paragraphs. Use
2091Auto Fill mode or explicit fill commands (@pxref{Fill Commands}) 2092Auto Fill mode or explicit fill commands (@pxref{Fill Commands})
@@ -2294,13 +2295,13 @@ commands do nothing on text with this setting. You can, however,
2294still indent the left margin. 2295still indent the left margin.
2295@end table 2296@end table
2296 2297
2297@c FIXME: We should explain the effect of these symbols. --xfq
2298@vindex default-justification 2298@vindex default-justification
2299 You can also specify justification styles using the Justification 2299 You can also specify justification styles using the Justification
2300submenu in the Text Properties menu. The default justification style 2300submenu in the Text Properties menu. The default justification style
2301is specified by the per-buffer variable @code{default-justification}. 2301is specified by the per-buffer variable @code{default-justification}.
2302Its value should be one of the symbols @code{left}, @code{right}, 2302Its value should be one of the symbols @code{left}, @code{right},
2303@code{full}, @code{center}, or @code{none}. 2303@code{full}, @code{center}, or @code{none}; their meanings correspond
2304to the commands above.
2304 2305
2305@node Enriched Properties 2306@node Enriched Properties
2306@subsection Setting Other Text Properties 2307@subsection Setting Other Text Properties