diff options
| author | Karl Heuer | 1998-06-01 21:46:44 +0000 |
|---|---|---|
| committer | Karl Heuer | 1998-06-01 21:46:44 +0000 |
| commit | cd00fd369524fd43ac7b1fd8d49633635b6e6286 (patch) | |
| tree | 2c049f9d998c6a474d5d8fb35cc9b4d8dfc32f77 | |
| parent | 4c45295b186a715c26ab752e729a35810ce41c3d (diff) | |
| download | emacs-cd00fd369524fd43ac7b1fd8d49633635b6e6286.tar.gz emacs-cd00fd369524fd43ac7b1fd8d49633635b6e6286.zip | |
(apropos-variable): Fixed argument to apropos-command.
(apropos-command): Let `var-predicate' have higher priority than
`do-all'.
| -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." | |||
| 152 | " (regexp): ")) | 152 | " (regexp): ")) |
| 153 | current-prefix-arg)) | 153 | current-prefix-arg)) |
| 154 | (apropos-command regexp nil | 154 | (apropos-command regexp nil |
| 155 | (if arg | 155 | (if (or do-all apropos-do-all) |
| 156 | #'(lambda (symbol) | 156 | #'(lambda (symbol) |
| 157 | (and (boundp symbol) | 157 | (and (boundp symbol) |
| 158 | (get symbol 'variable-documentation))) | 158 | (get symbol 'variable-documentation))) |
| @@ -182,8 +182,8 @@ satisfy the predicate VAR-PREDICATE." | |||
| 182 | (or do-all (setq do-all apropos-do-all)) | 182 | (or do-all (setq do-all apropos-do-all)) |
| 183 | (setq apropos-accumulator | 183 | (setq apropos-accumulator |
| 184 | (apropos-internal apropos-regexp | 184 | (apropos-internal apropos-regexp |
| 185 | (if do-all 'functionp | 185 | (or var-predicate |
| 186 | (or var-predicate 'commandp)))) | 186 | (if do-all 'functionp 'commandp)))) |
| 187 | (let ((tem apropos-accumulator)) | 187 | (let ((tem apropos-accumulator)) |
| 188 | (while tem | 188 | (while tem |
| 189 | (if (get (car tem) 'apropos-inhibit) | 189 | (if (get (car tem) 'apropos-inhibit) |