comparison lisp/prim/help.el @ 104:cf808b4c4290 r20-1b4

Import from CVS: tag r20-1b4
author cvs
date Mon, 13 Aug 2007 09:16:51 +0200
parents 4be1180a9e89
children 360340f9fd5f
comparison
equal deleted inserted replaced
103:30eda07fe280 104:cf808b4c4290
822 (princ ": " stream) 822 (princ ": " stream)
823 (let* ((def function) 823 (let* ((def function)
824 file-name 824 file-name
825 (doc (or (documentation function) 825 (doc (or (documentation function)
826 (gettext "not documented"))) 826 (gettext "not documented")))
827 aliases kbd-macro-p fndef macrop) 827 aliases home kbd-macro-p fndef macrop)
828 (while (symbolp def) 828 (while (symbolp def)
829 (or (eq def function) 829 (or (eq def function)
830 (if aliases 830 (if aliases
831 ;; I18N3 Need gettext due to concat 831 ;; I18N3 Need gettext due to concat
832 (setq aliases (concat aliases 832 (setq aliases (concat aliases
833 (format "\n which is an alias for %s, " 833 (format "\n which is an alias for %s, "
834 (symbol-name def)))) 834 (symbol-name def))))
835 (setq aliases (format "an alias for %s, " (symbol-name def))))) 835 (setq aliases (format "an alias for %s, " (symbol-name def)))))
836 (setq def (symbol-function def))) 836 (setq def (symbol-function def)))
837 (if (compiled-function-p def)
838 (setq home (compiled-function-annotation def)))
837 (if (eq 'macro (car-safe def)) 839 (if (eq 'macro (car-safe def))
838 (setq fndef (cdr def) 840 (setq fndef (cdr def)
839 macrop t) 841 macrop t)
840 (setq fndef def)) 842 (setq fndef def))
841 (if describe-function-show-arglist 843 (if describe-function-show-arglist
891 nil))) 893 nil)))
892 (or file-name 894 (or file-name
893 (setq file-name (describe-function-find-file function))) 895 (setq file-name (describe-function-find-file function)))
894 (if file-name 896 (if file-name
895 (princ (format ".\n -- loads from \"%s\"" file-name) stream)) 897 (princ (format ".\n -- loads from \"%s\"" file-name) stream))
898 (if home
899 (princ (format ".\n -- loaded from %s" home)))
896 (princ ".") 900 (princ ".")
897 (terpri) 901 (terpri)
898 (cond (kbd-macro-p 902 (cond (kbd-macro-p
899 (princ "These characters are executed:\n\n\t" stream) 903 (princ "These characters are executed:\n\n\t" stream)
900 (princ (key-description def) stream) 904 (princ (key-description def) stream)