summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/lispref/ChangeLog8
-rw-r--r--doc/lispref/keymaps.texi14
-rw-r--r--doc/lispref/nonascii.texi2
-rw-r--r--doc/lispref/strings.texi4
4 files changed, 16 insertions, 12 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index a52a8e73dd1..90a1d24ce04 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,11 @@
+2011-03-16 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * strings.texi (String Conversion): Don't mention
+ string-make-(uni|multi)byte (bug#8262).
+ * nonascii.texi (Converting Representations): Fix up range.
+ * keymaps.texi (Key Binding Commands): Update code point, avoid
+ "unibyte character" and remove mention of unibyte bindings.
+
2011-03-07 Chong Yidong <cyd@stupidchicken.com>
* Version 23.3 released.
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index bc1937442f8..1d485ab67ba 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -1707,15 +1707,11 @@ or
@noindent
and your language environment is multibyte Latin-1, these commands
-actually bind the multibyte character with code 2294, not the unibyte
-Latin-1 character with code 246 (@kbd{M-v}). In order to use this
-binding, you need to enter the multibyte Latin-1 character as keyboard
-input. One way to do this is by using an appropriate input method
-(@pxref{Input Methods, , Input Methods, emacs, The GNU Emacs Manual}).
-
- If you want to use a unibyte character in the key binding, you can
-construct the key sequence string using @code{multibyte-char-to-unibyte}
-or @code{string-make-unibyte} (@pxref{Converting Representations}).
+actually bind the multibyte character with code 246, not the byte
+code 246 (@kbd{M-v}) sent by a Latin-1 terminal. In order to use this
+binding, you need to teach Emacs how to decode the keyboard by using an
+appropriate input method (@pxref{Input Methods, , Input Methods, emacs, The GNU
+Emacs Manual}).
@deffn Command global-set-key key binding
This function sets the binding of @var{key} in the current global map
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index cb075e10a94..3093613ccaa 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -171,7 +171,7 @@ acceptable because the buffer's representation is a choice made by the
user that cannot be overridden automatically.
Converting unibyte text to multibyte text leaves @acronym{ASCII}
-characters unchanged, and converts bytes with codes 128 through 159 to
+characters unchanged, and converts bytes with codes 128 through 255 to
the multibyte representation of raw eight-bit bytes.
Converting multibyte text to unibyte converts all @acronym{ASCII}
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi
index bb550346e9d..925c92050e4 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -555,8 +555,8 @@ strings and integers. @code{format} (@pxref{Formatting Strings}) and
@code{prin1-to-string} (@pxref{Output Functions}) can also convert
Lisp objects into strings. @code{read-from-string} (@pxref{Input
Functions}) can ``convert'' a string representation of a Lisp object
-into an object. The functions @code{string-make-multibyte} and
-@code{string-make-unibyte} convert the text representation of a string
+into an object. The functions @code{string-to-multibyte} and
+@code{string-to-unibyte} convert the text representation of a string
(@pxref{Converting Representations}).
@xref{Documentation}, for functions that produce textual descriptions