# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 896737604 0
# Node ID a049e7c748d96fadfd19e9ffe2851cf8d90f43c0
# Parent  baef082e5d6d95f55e8f4ec1dbd0006480fa3610
(apropos-variable): Fixed argument to apropos-command.
(apropos-command): Let `var-predicate' have higher priority than
`do-all'.

diff -r baef082e5d6d -r a049e7c748d9 lisp/apropos.el
--- 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)