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

2 files changed, 7 insertions, 1 deletions

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