diff options
| author | Karl Heuer <kwzh@gnu.org> | 1998-06-01 21:46:44 +0000 |
|---|---|---|
| committer | Karl Heuer <kwzh@gnu.org> | 1998-06-01 21:46:44 +0000 |
| commit | cd00fd369524fd43ac7b1fd8d49633635b6e6286 (patch) | |
| tree | 2c049f9d998c6a474d5d8fb35cc9b4d8dfc32f77 /lisp/apropos.el | |
| parent | 4c45295b186a715c26ab752e729a35810ce41c3d (diff) | |
| download | emacs-cd00fd369524fd43ac7b1fd8d49633635b6e6286.tar.gz | |
(apropos-variable): Fixed argument to apropos-command.
(apropos-command): Let `var-predicate' have higher priority than
`do-all'.
Diffstat (limited to 'lisp/apropos.el')
| -rw-r--r-- | lisp/apropos.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/apropos.el b/lisp/apropos.el index 34dabdf0b2c..0dfdbcea003 100644 --- a/lisp/apropos.el +++ b/lisp/apropos.el @@ -152,7 +152,7 @@ normal variables." " (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 @@ satisfy the predicate VAR-PREDICATE." (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) |