comparison lisp/prim/help.el @ 26:441bb1e64a06 r19-15b96

Import from CVS: tag r19-15b96
author cvs
date Mon, 13 Aug 2007 08:51:32 +0200
parents 4103f0995bd7
children ec9a17fef872
comparison
equal deleted inserted replaced
25:383a494979f8 26:441bb1e64a06
825 (princ ": " stream) 825 (princ ": " stream)
826 (let* ((def function) 826 (let* ((def function)
827 file-name 827 file-name
828 (doc (or (documentation function) 828 (doc (or (documentation function)
829 (gettext "not documented"))) 829 (gettext "not documented")))
830 aliases kbd-macro-p fndef macrop) 830 aliases home kbd-macro-p fndef macrop)
831 (while (symbolp def) 831 (while (symbolp def)
832 (or (eq def function) 832 (or (eq def function)
833 (if aliases 833 (if aliases
834 ;; I18N3 Need gettext due to concat 834 ;; I18N3 Need gettext due to concat
835 (setq aliases (concat aliases 835 (setq aliases (concat aliases
836 (format "\n which is an alias for %s, " 836 (format "\n which is an alias for %s, "
837 (symbol-name def)))) 837 (symbol-name def))))
838 (setq aliases (format "an alias for %s, " (symbol-name def))))) 838 (setq aliases (format "an alias for %s, " (symbol-name def)))))
839 (setq def (symbol-function def))) 839 (setq def (symbol-function def)))
840 (if (compiled-function-p def)
841 (setq home (compiled-function-annotation def)))
840 (if (eq 'macro (car-safe def)) 842 (if (eq 'macro (car-safe def))
841 (setq fndef (cdr def) 843 (setq fndef (cdr def)
842 macrop t) 844 macrop t)
843 (setq fndef def)) 845 (setq fndef def))
844 (if describe-function-show-arglist 846 (if describe-function-show-arglist
894 nil))) 896 nil)))
895 (or file-name 897 (or file-name
896 (setq file-name (describe-function-find-file function))) 898 (setq file-name (describe-function-find-file function)))
897 (if file-name 899 (if file-name
898 (princ (format ".\n -- loads from \"%s\"" file-name) stream)) 900 (princ (format ".\n -- loads from \"%s\"" file-name) stream))
901 (if home
902 (princ (format ".\n -- loaded from %s" home)))
899 (princ ".") 903 (princ ".")
900 (terpri) 904 (terpri)
901 (cond (kbd-macro-p 905 (cond (kbd-macro-p
902 (princ "These characters are executed:\n\n\t" stream) 906 (princ "These characters are executed:\n\n\t" stream)
903 (princ (key-description def) stream) 907 (princ (key-description def) stream)