Merge from trunk and from gnulib stdio.

6 files changed, 25 insertions, 12 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index a0498bf46c2..c705aae4934 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,11 @@
+2011-03-19  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-10  Eli Zaretskii  <eliz@gnu.org>
 
         * modes.texi (Operator Precedence Grammars): Don't use characters
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index af24ff5aa43..2648c22ca01 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -1705,15 +1705,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 409ecc7e20c..6fcde611998 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -167,7 +167,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 ce080bc221f..d062c215952 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -554,8 +554,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
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 5dd5e3e4fdc..50f0e4e45b9 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -2,6 +2,11 @@
 
         * calc.texi (Logarithmic Units): Update the function names.
 
+2011-03-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * message.texi (Various Commands): Document format specs in the
+        ellipsis.
+
 2011-03-15  Antoine Levitt  <antoine.levitt@gmail.com>
 
         * message.texi (Insertion Variables): Document message-cite-style.
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 7d61ffd9efa..48d0028e452 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -1202,6 +1202,10 @@ The text is killed and replaced with the contents of the variable
 @code{message-elide-ellipsis}.  The default value is to use an ellipsis
 (@samp{[...]}).
 
+This is a format-spec string, and you can use @samp{%l} to say how
+many lines were removed, and @samp{%c} to say how many characters were
+removed.
+
 @item C-c M-k
 @kindex C-c M-k
 @findex message-kill-address