aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2010-04-01 11:24:53 -0400
committerChong Yidong2010-04-01 11:24:53 -0400
commit8a14dec7ef880dea69f1102cc93387a13d73c301 (patch)
treeb908f6778d17eed91c7fef1708f126d250865127
parent8cc8cecf9cf106e52e6a58c64f91d534bdd59532 (diff)
downloademacs-8a14dec7ef880dea69f1102cc93387a13d73c301.tar.gz
emacs-8a14dec7ef880dea69f1102cc93387a13d73c301.zip
Fix markup mistake in nonascii.texi.
* nonascii.texi (Text Representations): Don't mark enable-multibyte-characters as a user option.
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/nonascii.texi4
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 6f119b5d288..52587432152 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12010-04-01 Chong Yidong <cyd@stupidchicken.com>
2
3 * nonascii.texi (Text Representations): Don't mark
4 enable-multibyte-characters as a user option.
5
12010-03-31 Eli Zaretskii <eliz@gnu.org> 62010-03-31 Eli Zaretskii <eliz@gnu.org>
2 7
3 * control.texi (Handling Errors): How to re-throw a signal caught 8 * control.texi (Handling Errors): How to re-throw a signal caught
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index cedec9570a8..dfcb3e4730b 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -95,7 +95,7 @@ strings except for manipulating encoded text or binary non-text data.
95The representation for a string is determined and recorded in the string 95The representation for a string is determined and recorded in the string
96when the string is constructed. 96when the string is constructed.
97 97
98@defopt enable-multibyte-characters 98@defvar enable-multibyte-characters
99This variable specifies the current buffer's text representation. 99This variable specifies the current buffer's text representation.
100If it is non-@code{nil}, the buffer contains multibyte text; otherwise, 100If it is non-@code{nil}, the buffer contains multibyte text; otherwise,
101it contains unibyte encoded text or binary non-text data. 101it contains unibyte encoded text or binary non-text data.
@@ -105,7 +105,7 @@ You cannot set this variable directly; instead, use the function
105 105
106The @samp{--unibyte} command line option does its job by setting the 106The @samp{--unibyte} command line option does its job by setting the
107default value to @code{nil} early in startup. 107default value to @code{nil} early in startup.
108@end defopt 108@end defvar
109 109
110@defun position-bytes position 110@defun position-bytes position
111Buffer positions are measured in character units. This function 111Buffer positions are measured in character units. This function