aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2003-02-12 11:41:37 +0000
committerJuanma Barranquero2003-02-12 11:41:37 +0000
commita01ba4f1b109b74a54de704fd4cf1cfb397dcae0 (patch)
tree0843ef4febcaea2b9f0ea4c02fd69b814231b6d5
parent295fff2c70e4b6dfef984ec01bc3ba05ff2ad5d2 (diff)
downloademacs-a01ba4f1b109b74a54de704fd4cf1cfb397dcae0.tar.gz
emacs-a01ba4f1b109b74a54de704fd4cf1cfb397dcae0.zip
(describe-function-1): Change output for keyboard macros.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/help-fns.el3
2 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 91676997b43..773d4a06b3a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12003-02-12 Luc Teirlinck <teirllm@mail.auburn.edu>
2
3 * help-fns.el (describe-function-1): Change output for keyboard
4 macros.
5
12003-02-12 Andreas Schwab <schwab@suse.de> 62003-02-12 Andreas Schwab <schwab@suse.de>
2 7
3 * progmodes/sh-script.el (sh-mode-map): Don't remap 8 * progmodes/sh-script.el (sh-mode-map): Don't remap
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 4b5a2e03208..cda2e7d19f2 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -323,6 +323,9 @@ The usage info is built from ARGLIST. DOC can be nil."
323 function))))) 323 function)))))
324 usage) 324 usage)
325 (car usage)) 325 (car usage))
326 ((or (stringp def)
327 (vectorp def))
328 (format "\nMacro: %s" (format-kbd-macro def)))
326 (t "[Missing arglist. Please make a bug report.]"))) 329 (t "[Missing arglist. Please make a bug report.]")))
327 (terpri)) 330 (terpri))
328 (let ((obsolete (and 331 (let ((obsolete (and