Commit cd00fd36 authored by Karl Heuer's avatar Karl Heuer
Browse files

(apropos-variable): Fixed argument to apropos-command.

(apropos-command): Let `var-predicate' have higher priority than
parent 4c45295b
...@@ -152,7 +152,7 @@ normal variables." ...@@ -152,7 +152,7 @@ normal variables."
" (regexp): ")) " (regexp): "))
current-prefix-arg)) current-prefix-arg))
(apropos-command regexp nil (apropos-command regexp nil
(if arg (if (or do-all apropos-do-all)
#'(lambda (symbol) #'(lambda (symbol)
(and (boundp symbol) (and (boundp symbol)
(get symbol 'variable-documentation))) (get symbol 'variable-documentation)))
...@@ -182,8 +182,8 @@ satisfy the predicate VAR-PREDICATE." ...@@ -182,8 +182,8 @@ satisfy the predicate VAR-PREDICATE."
(or do-all (setq do-all apropos-do-all)) (or do-all (setq do-all apropos-do-all))
(setq apropos-accumulator (setq apropos-accumulator
(apropos-internal apropos-regexp (apropos-internal apropos-regexp
(if do-all 'functionp (or var-predicate
(or var-predicate 'commandp)))) (if do-all 'functionp 'commandp))))
(let ((tem apropos-accumulator)) (let ((tem apropos-accumulator))
(while tem (while tem
(if (get (car tem) 'apropos-inhibit) (if (get (car tem) 'apropos-inhibit)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment