comparison lisp/help.el @ 4654:cdc51540fed7

Automated merge with ssh://aidan-guest@hg.debian.org//hg/xemacs/xemacs
author Aidan Kehoe <kehoea@parhasard.net>
date Wed, 15 Jul 2009 00:21:01 +0100
parents 48b45a606961
children e9b88e997479
comparison
equal deleted inserted replaced
4652:f3dddd098242 4654:cdc51540fed7
1190 (nth 1 fndef)) 1190 (nth 1 fndef))
1191 ((subrp fndef) 1191 ((subrp fndef)
1192 (let* ((doc (documentation function)) 1192 (let* ((doc (documentation function))
1193 (args (and doc 1193 (args (and doc
1194 (string-match 1194 (string-match
1195 "[\n\t ]*\narguments: ?(\\(.*\\))\n?\\'" 1195 "[\n\t ]*\narguments: ?(\\([^)]*\\))\n?\\'"
1196 doc) 1196 doc)
1197 (match-string 1 doc)))) 1197 (match-string 1 doc)))
1198 (args (and args (replace-in-string args
1199 "[ ]*\\\\\n[ ]*"
1200 " " t))))
1198 ;; If there are no arguments documented for the 1201 ;; If there are no arguments documented for the
1199 ;; subr, rather don't print anything. 1202 ;; subr, rather don't print anything.
1200 (cond ((null args) t) 1203 (cond ((null args) t)
1201 ((equal args "") nil) 1204 ((equal args "") nil)
1202 (args)))) 1205 (args))))
1400 (t "a ")) 1403 (t "a "))
1401 "%s" 1404 "%s"
1402 (cond 1405 (cond
1403 ((eq 'neither macro-p) 1406 ((eq 'neither macro-p)
1404 "") 1407 "")
1405 (macrop " macro") 1408 (macro-p " macro")
1406 (t " function")))) 1409 (t " function"))))
1407 string))))) 1410 string)))))
1408 (cond ((or (stringp def) (vectorp def)) 1411 (cond ((or (stringp def) (vectorp def))
1409 (princ "a keyboard macro.") 1412 (princ "a keyboard macro.")
1410 (setq kbd-macro-p t)) 1413 (setq kbd-macro-p t))