diff options
| author | Lars Ingebrigtsen | 2021-01-27 03:38:49 +0100 |
|---|---|---|
| committer | Eli Zaretskii | 2021-01-27 17:18:33 +0200 |
| commit | 932aba674c9a64dfd970d7c2343517c7f4c7a409 (patch) | |
| tree | 4884c707009ae0765ce6d9c37a401eebf43a4f59 /lisp | |
| parent | 809503431d47afb9d20e8463853298a595e1fcb2 (diff) | |
| download | emacs-932aba674c9a64dfd970d7c2343517c7f4c7a409.tar.gz emacs-932aba674c9a64dfd970d7c2343517c7f4c7a409.zip | |
Try to improve the read-regexp doc string
* lisp/replace.el (read-regexp): Attempt to clarify the semantics
(bug#46088).
(cherry picked from commit eded2a7ad7d456a417354a2797c18e9a578414d7)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/replace.el | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lisp/replace.el b/lisp/replace.el index 0288be82d27..a7695951255 100644 --- a/lisp/replace.el +++ b/lisp/replace.el | |||
| @@ -813,12 +813,14 @@ If DEFAULTS is a list of strings, the first element is the | |||
| 813 | default return value, but all the elements are accessible | 813 | default return value, but all the elements are accessible |
| 814 | using the history command \\<minibuffer-local-map>\\[next-history-element]. | 814 | using the history command \\<minibuffer-local-map>\\[next-history-element]. |
| 815 | 815 | ||
| 816 | If DEFAULTS is a non-nil symbol, then if `read-regexp-defaults-function' | 816 | DEFAULTS can be a symbol. If DEFAULTS is the symbol |
| 817 | is non-nil, we use that in place of DEFAULTS in the following: | 817 | `regexp-history-last', we use the first element of HISTORY (if |
| 818 | If DEFAULTS is the symbol `regexp-history-last', we use the first | 818 | specified) or `regexp-history'. If DEFAULTS is a symbol with a |
| 819 | element of HISTORY (if specified) or `regexp-history'. | 819 | function definition, we call it with no arguments and use what it |
| 820 | If DEFAULTS is a function, we call it with no arguments and use | 820 | returns, which should be either nil, a string, or a list of |
| 821 | what it returns, which should be either nil, a string, or a list of strings. | 821 | strings. Other symbol values for DEFAULTS are ignored. If |
| 822 | `read-regexp-defaults-function' is non-nil, its value is used | ||
| 823 | instead of DEFAULTS in the two cases described in this paragraph. | ||
| 822 | 824 | ||
| 823 | We append the standard values from `read-regexp-suggestions' to DEFAULTS | 825 | We append the standard values from `read-regexp-suggestions' to DEFAULTS |
| 824 | before using it. | 826 | before using it. |