aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Paul Wallington2003-01-14 20:47:21 +0000
committerJohn Paul Wallington2003-01-14 20:47:21 +0000
commit5760219d1dac0d542ee79671bd4f3bc5c96f6b2a (patch)
tree7aa4e159ef7f493c86a82e180c8a47e8d0d1e2c0
parentcbcf7a8e454a7f7443ea8643f497f6d69b526fe1 (diff)
downloademacs-5760219d1dac0d542ee79671bd4f3bc5c96f6b2a.tar.gz
emacs-5760219d1dac0d542ee79671bd4f3bc5c96f6b2a.zip
(apropos): Restore autoload cookie. Fix error
message typo.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/apropos.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3aacc0d233a..7002714c4d3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12003-01-14 John Paul Wallington <jpw@shootybangbang.com>
2
3 * apropos.el (apropos): Restore autoload cookie. Fix error
4 message typo.
5
12003-01-14 Kim F. Storm <storm@cua.dk> 62003-01-14 Kim F. Storm <storm@cua.dk>
2 7
3 * subr.el (process-put, process-get): New functions. 8 * subr.el (process-put, process-get): New functions.
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 159ad669d3e..63450adbc62 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -440,6 +440,8 @@ satisfy the predicate VAR-PREDICATE."
440 "(not documented)")) 440 "(not documented)"))
441 (error "(error retrieving documentation)"))) 441 (error "(error retrieving documentation)")))
442 442
443
444;;;###autoload
443(defun apropos (apropos-regexp &optional do-all) 445(defun apropos (apropos-regexp &optional do-all)
444 "Show all bound symbols whose names match APROPOS-REGEXP. 446 "Show all bound symbols whose names match APROPOS-REGEXP.
445With optional prefix DO-ALL or if `apropos-do-all' is non-nil, also 447With optional prefix DO-ALL or if `apropos-do-all' is non-nil, also
@@ -473,7 +475,7 @@ time-consuming. Returns list of symbols and documentation found."
473 (void-function 475 (void-function
474 "(alias for undefined function)") 476 "(alias for undefined function)")
475 (error 477 (error
476 "(error retrieving function documentation"))) 478 "(error retrieving function documentation)")))
477 (substring doc 0 (string-match "\n" doc)) 479 (substring doc 0 (string-match "\n" doc))
478 "(not documented)")) 480 "(not documented)"))
479 (when (boundp symbol) 481 (when (boundp symbol)