Merge from emacs-24; up to 2012-12-15T12:19:04Z!juri@jurta.org

4 files changed, 12 insertions, 2 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index d2f44eabb0e..bcd9c0c0693 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-10  Glenn Morris  <rgm@gnu.org>
+
+        * trouble.texi (Checklist): Update bug keybinding.
+
 2013-02-09  Eli Zaretskii  <eliz@gnu.org>
 
         * msdog.texi (Text and Binary): Delete the description of
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index 97c0ff97530..1c667bc56cb 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -662,7 +662,7 @@ will be sent to the Emacs maintainers at @email{bug-gnu-emacs@@gnu.org}.
 (If you want to suggest an improvement or new feature, use the same
 address.)  If you cannot send mail from inside Emacs, you can copy the
 text of your report to your normal mail client (if your system
-supports it, you can type @kbd{C-c m} to have Emacs do this for you)
+supports it, you can type @kbd{C-c M-i} to have Emacs do this for you)
 and send it to that address.  Or you can simply send an email to that
 address describing the problem.
 
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 90b2349387f..a61d84a77b1 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-10  Glenn Morris  <rgm@gnu.org>
+
+        * keymaps.texi (Creating Keymaps): Update make-keymap result.
+
 2013-02-09  Eli Zaretskii  <eliz@gnu.org>
 
         * modes.texi (%-Constructs): Remove the description of %t.
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 7c66bbec801..54211d1aa0b 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -327,10 +327,12 @@ these characters to @code{nil}, and does not bind any other kind of
 event.  The argument @var{prompt} specifies a
 prompt string, as in @code{make-sparse-keymap}.
 
+@c This example seems kind of pointless, but I guess it serves
+@c to contrast the result with make-sparse-keymap above.
 @example
 @group
 (make-keymap)
-    @result{} (keymap #^[t nil nil nil @dots{} nil nil keymap])
+    @result{} (keymap #^[nil nil keymap nil nil nil @dots{}])
 @end group
 @end example