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

(apropos-command): Let `var-predicate' have higher priority than
`do-all'.

diff --git a/lisp/apropos.el b/lisp/apropos.el
index 34dabdf0b2c6248fc5f0fb73f48acbd414ae237c..0dfdbcea00380b174473d5d96cf7a5bd5fdbdfd3 100644 (file)
--- 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)