aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1999-05-22 19:49:39 +0000
committerRichard M. Stallman1999-05-22 19:49:39 +0000
commit0ab0e672f893bbe7a18a641fd1c3c1bad6184ef4 (patch)
treec5c379a60cf00b61ba8a7774febbdf95fdc770ad
parentccbb360e3f437b135f8c91bde55c05758a99f587 (diff)
downloademacs-0ab0e672f893bbe7a18a641fd1c3c1bad6184ef4.tar.gz
emacs-0ab0e672f893bbe7a18a641fd1c3c1bad6184ef4.zip
(describe-function-1): Extra arg, interactive-p.
(describe-key, describe-function): Use it.
-rw-r--r--lisp/help.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/help.el b/lisp/help.el
index 5166c8bc164..9d0c4e856aa 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -327,7 +327,7 @@ If FUNCTION is nil, applies `message' to it, thus printing it."
327 (princ " runs the command ") 327 (princ " runs the command ")
328 (prin1 defn) 328 (prin1 defn)
329 (princ "\n which is ") 329 (princ "\n which is ")
330 (describe-function-1 defn nil) 330 (describe-function-1 defn nil (interactive-p))
331 (print-help-return-message))))))) 331 (print-help-return-message)))))))
332 332
333(defun describe-mode () 333(defun describe-mode ()
@@ -591,7 +591,7 @@ It can also be nil, if the definition is not associated with any file."
591 ;; Use " is " instead of a colon so that 591 ;; Use " is " instead of a colon so that
592 ;; it is easier to get out the function name using forward-sexp. 592 ;; it is easier to get out the function name using forward-sexp.
593 (princ " is ") 593 (princ " is ")
594 (describe-function-1 function nil) 594 (describe-function-1 function nil (interactive-p))
595 (print-help-return-message) 595 (print-help-return-message)
596 (save-excursion 596 (save-excursion
597 (set-buffer standard-output) 597 (set-buffer standard-output)
@@ -599,7 +599,7 @@ It can also be nil, if the definition is not associated with any file."
599 (buffer-string))) 599 (buffer-string)))
600 (message "You didn't specify a function"))) 600 (message "You didn't specify a function")))
601 601
602(defun describe-function-1 (function parens) 602(defun describe-function-1 (function parens interactive-p)
603 (let* ((def (if (symbolp function) 603 (let* ((def (if (symbolp function)
604 (symbol-function function) 604 (symbol-function function)
605 function)) 605 function))
@@ -685,7 +685,7 @@ It can also be nil, if the definition is not associated with any file."
685 (if doc 685 (if doc
686 (progn (terpri) 686 (progn (terpri)
687 (princ doc) 687 (princ doc)
688 (help-setup-xref (list #'describe-function function) (interactive-p))) 688 (help-setup-xref (list #'describe-function function) interactive-p))
689 (princ "not documented"))))) 689 (princ "not documented")))))
690 690
691(defun variable-at-point () 691(defun variable-at-point ()