(substitute-key-definition): Doc fix (hide internal argument).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 614faaae8470b1253db1e39f5577fda14e1b8880..449470c23f80b46b464c8999e6f63507bc48566c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,16 +1,20 @@
+2006-02-13  Juanma Barranquero  <lekktu@gmail.com>
+
+       * subr.el (substitute-key-definition): Doc fix (hide internal arg).
+
 2006-02-12  Miles Bader  <miles@gnu.org>
 
        * net/rcirc.el (rcirc-format-response-string): Fix small bugs.
 
 2006-02-13  Mathias Dahl  <mathias.dahl@gmail.com>
 
-       * tumme.el: Removed history section.  If someone needs the it, it
+       * tumme.el: Remove history section.  If someone needs the it, it
        can always be found in CVS.
 
 2006-02-12  Mathias Dahl  <mathias.dahl@gmail.com>
 
-       * tumme.el (tumme-thumbnail-storage): Updated docstring. Added
-       info about the Thumbnail Managing Standard option.
+       * tumme.el (tumme-thumbnail-storage): Update docstring.  Add info
+       about the Thumbnail Managing Standard option.
 
 2006-02-12  Richard M. Stallman  <rms@gnu.org>
 
@@ -95,7 +99,7 @@
 
        * ido.el (ido-buffer-internal): Set mark for ido-insert-buffer.
        Don't use insert-buffer; do insert-buffer-substring directly.
-       (ido-file-internal): Set mark for ido-insert-file. Use insert-file-1.
+       (ido-file-internal): Set mark for ido-insert-file.  Use insert-file-1.
 
 2006-02-11  Martin Rudalics  <rudalics@gmx.at>
 

diff --git a/lisp/subr.el b/lisp/subr.el
index 298a1d7c92f17279f4dc065d95755cb7b87cbeae..c543ecffad3c321c02e85f25bc5ddd94c5e971f5 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -563,7 +563,8 @@ in KEYMAP as NEWDEF those keys which are defined as OLDDEF in OLDMAP.
 
 If you don't specify OLDMAP, you can usually get the same results
 in a cleaner way with command remapping, like this:
-  \(define-key KEYMAP [remap OLDDEF] NEWDEF)"
+  \(define-key KEYMAP [remap OLDDEF] NEWDEF)
+\n(fn OLDDEF NEWDEF KEYMAP &optional OLDMAP)"
   ;; Don't document PREFIX in the doc string because we don't want to
   ;; advertise it.  It's meant for recursive calls only.  Here's its
   ;; meaning