diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2006-02-13 11:05:37 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2006-02-13 11:05:37 +0000 |
| commit | 50d16788f2586ba58b3f10824ab770633b6e0870 (patch) | |
| tree | da0be4584b7aff8f9b01cb2cf967a7b7f0924739 /lisp | |
| parent | 2d488bd1dbd17113f08a40d67d5dfb7dab3e26e9 (diff) | |
| download | emacs-50d16788f2586ba58b3f10824ab770633b6e0870.tar.gz | |
(substitute-key-definition): Doc fix (hide internal argument).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 12 | ||||
| -rw-r--r-- | lisp/subr.el | 3 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 614faaae847..449470c23f8 100644 --- 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 298a1d7c92f..c543ecffad3 100644 --- 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 |