aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-07-10 14:09:30 +0000
committerGerd Moellmann2001-07-10 14:09:30 +0000
commit6ce5615d623f1cfdf02c8725f12390a786aa9cd7 (patch)
treef2b6c4a2bb11470a9ef7b5b6088f455fcf499424
parent6b05fae3af94b547924952a87d5ae03bd794f567 (diff)
downloademacs-6ce5615d623f1cfdf02c8725f12390a786aa9cd7.tar.gz
emacs-6ce5615d623f1cfdf02c8725f12390a786aa9cd7.zip
(describe-function-1): When printing FUNCTION's
documentation, don't assume FUNCTION is a symbol.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/help.el2
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 029acf33895..01f1c979e15 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12001-07-10 Gerd Moellmann <gerd@gnu.org> 12001-07-10 Gerd Moellmann <gerd@gnu.org>
2 2
3 * help.el (describe-function-1): When printing FUNCTION's
4 documentation, don't assume FUNCTION is a symbol.
5
3 * startup.el (normal-top-level): Don't operate on the initial 6 * startup.el (normal-top-level): Don't operate on the initial
4 frame if we failed to create one. 7 frame if we failed to create one.
5 8
diff --git a/lisp/help.el b/lisp/help.el
index c0447dcaedd..be391914692 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -749,7 +749,7 @@ It can also be nil, if the definition is not associated with any file."
749 (if doc 749 (if doc
750 (progn (terpri) 750 (progn (terpri)
751 (princ doc) 751 (princ doc)
752 (if (subrp (symbol-function function)) 752 (if (subrp def)
753 (with-current-buffer standard-output 753 (with-current-buffer standard-output
754 (beginning-of-line) 754 (beginning-of-line)
755 ;; Builtins get the calling sequence at the end of 755 ;; Builtins get the calling sequence at the end of