diff options
| author | Richard M. Stallman | 1993-12-23 04:39:33 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1993-12-23 04:39:33 +0000 |
| commit | 12fbf178bb2ca7e953e867ebdb1c3a3aebc8d0c4 (patch) | |
| tree | 0c343b0232ef5610ce7aa504ee14579a4e403a5b | |
| parent | d1d1ddbd6ade29048745cc46cf9f4169678605c8 (diff) | |
| download | emacs-12fbf178bb2ca7e953e867ebdb1c3a3aebc8d0c4.tar.gz emacs-12fbf178bb2ca7e953e867ebdb1c3a3aebc8d0c4.zip | |
(apropos-match-keys): If REGEXP is nil, always act as if it matched.
| -rw-r--r-- | lisp/apropos.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/apropos.el b/lisp/apropos.el index f147b0b182a..77f204ce874 100644 --- a/lisp/apropos.el +++ b/lisp/apropos.el | |||
| @@ -268,7 +268,9 @@ Returns list of symbols and documentation found." | |||
| 268 | ;; in alist, and is not shadowed by a different local binding, | 268 | ;; in alist, and is not shadowed by a different local binding, |
| 269 | ;; record it | 269 | ;; record it |
| 270 | (and (symbolp command) | 270 | (and (symbolp command) |
| 271 | (if regexp (string-match regexp (symbol-name command))) | 271 | (if regexp |
| 272 | (string-match regexp (symbol-name command)) | ||
| 273 | t) | ||
| 272 | (setq item (assq command alist)) | 274 | (setq item (assq command alist)) |
| 273 | (if (or (vectorp sequence) (not (integerp key))) | 275 | (if (or (vectorp sequence) (not (integerp key))) |
| 274 | (setq key (vconcat sequence (vector key))) | 276 | (setq key (vconcat sequence (vector key))) |
| @@ -294,7 +296,9 @@ Returns list of symbols and documentation found." | |||
| 294 | (setq command (cdr command))) | 296 | (setq command (cdr command))) |
| 295 | ;; This is the same as the code in the previous case. | 297 | ;; This is the same as the code in the previous case. |
| 296 | (and (symbolp command) | 298 | (and (symbolp command) |
| 297 | (if regexp (string-match regexp (symbol-name command))) | 299 | (if regexp |
| 300 | (string-match regexp (symbol-name command)) | ||
| 301 | t) | ||
| 298 | (setq item (assq command alist)) | 302 | (setq item (assq command alist)) |
| 299 | (if (or (vectorp sequence) (not (integerp key))) | 303 | (if (or (vectorp sequence) (not (integerp key))) |
| 300 | (setq key (vconcat sequence (vector key))) | 304 | (setq key (vconcat sequence (vector key))) |