Mercurial > emacs
changeset 22326:a049e7c748d9
(apropos-variable): Fixed argument to apropos-command.
(apropos-command): Let `var-predicate' have higher priority than
`do-all'.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Mon, 01 Jun 1998 21:46:44 +0000 |
| parents | baef082e5d6d |
| children | c119045b2019 |
| files | lisp/apropos.el |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/apropos.el Mon Jun 01 21:11:47 1998 +0000 +++ b/lisp/apropos.el Mon Jun 01 21:46:44 1998 +0000 @@ -152,7 +152,7 @@ " (regexp): ")) current-prefix-arg)) (apropos-command regexp nil - (if arg + (if (or do-all apropos-do-all) #'(lambda (symbol) (and (boundp symbol) (get symbol 'variable-documentation))) @@ -182,8 +182,8 @@ (or do-all (setq do-all apropos-do-all)) (setq apropos-accumulator (apropos-internal apropos-regexp - (if do-all 'functionp - (or var-predicate 'commandp)))) + (or var-predicate + (if do-all 'functionp 'commandp)))) (let ((tem apropos-accumulator)) (while tem (if (get (car tem) 'apropos-inhibit)