From cd00fd369524fd43ac7b1fd8d49633635b6e6286 Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Mon, 1 Jun 1998 21:46:44 +0000 Subject: [PATCH] (apropos-variable): Fixed argument to apropos-command. (apropos-command): Let `var-predicate' have higher priority than `do-all'. --- lisp/apropos.el | 6 +++--- 1 file 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) -- 2.39.2