diff options
| author | Glenn Morris | 2014-02-26 20:17:40 -0800 |
|---|---|---|
| committer | Glenn Morris | 2014-02-26 20:17:40 -0800 |
| commit | b77cfcd762d06febbe7f1626f6176bad84c9c36b (patch) | |
| tree | 1bcae115cf1a0c5b70e6f79ab7701fe130120345 | |
| parent | 3b48a331d19b0eddf5adf0a3c82d8283c950df6f (diff) | |
| download | emacs-b77cfcd762d06febbe7f1626f6176bad84c9c36b.tar.gz emacs-b77cfcd762d06febbe7f1626f6176bad84c9c36b.zip | |
* emacs-lisp/crm.el (completing-read-multiple): Empower help-enable-auto-load.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/crm.el | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cee4d322d69..91eea5301bf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-02-27 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * emacs-lisp/crm.el (completing-read-multiple): | ||
| 4 | Empower help-enable-auto-load. | ||
| 5 | |||
| 1 | 2014-02-26 Glenn Morris <rgm@gnu.org> | 6 | 2014-02-26 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * startup.el (command-line): Don't init the tty in daemon mode. | 8 | * startup.el (command-line): Don't init the tty in daemon mode. |
diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el index c911d9d9293..15960192664 100644 --- a/lisp/emacs-lisp/crm.el +++ b/lisp/emacs-lisp/crm.el | |||
| @@ -240,6 +240,8 @@ exiting the minibuffer." | |||
| 240 | t)) | 240 | t)) |
| 241 | 241 | ||
| 242 | ;; superemulates behavior of completing_read in src/minibuf.c | 242 | ;; superemulates behavior of completing_read in src/minibuf.c |
| 243 | ;; Use \\<crm-local-completion-map> so that help-enable-auto-load can | ||
| 244 | ;; do its thing. Any keymap that is defined will do. | ||
| 243 | ;;;###autoload | 245 | ;;;###autoload |
| 244 | (defun completing-read-multiple | 246 | (defun completing-read-multiple |
| 245 | (prompt table &optional predicate require-match initial-input | 247 | (prompt table &optional predicate require-match initial-input |
| @@ -247,15 +249,15 @@ exiting the minibuffer." | |||
| 247 | "Read multiple strings in the minibuffer, with completion. | 249 | "Read multiple strings in the minibuffer, with completion. |
| 248 | By using this functionality, a user may specify multiple strings at a | 250 | By using this functionality, a user may specify multiple strings at a |
| 249 | single prompt, optionally using completion. | 251 | single prompt, optionally using completion. |
| 250 | 252 | \\<crm-local-completion-map> | |
| 251 | Multiple strings are specified by separating each of the strings with | 253 | Multiple strings are specified by separating each of the strings with |
| 252 | a prespecified separator regexp. For example, if the separator | 254 | a prespecified separator regexp. For example, if the separator |
| 253 | regexp is \",\", the strings 'alice', 'bob', and 'eve' would be | 255 | regexp is \",\", the strings 'alice', 'bob', and 'eve' would be |
| 254 | specified as 'alice,bob,eve'. | 256 | specified as 'alice,bob,eve'. |
| 255 | 257 | ||
| 256 | The default value for the separator regexp is the value of | 258 | The default value for the separator regexp is the value of |
| 257 | `crm-default-separator' (comma). The separator regexp may be | 259 | `crm-default-separator'. You can change the separator regexp by |
| 258 | changed by modifying the value of `crm-separator'. | 260 | modifying the value of `crm-separator'. |
| 259 | 261 | ||
| 260 | Contiguous strings of non-separator-characters are referred to as | 262 | Contiguous strings of non-separator-characters are referred to as |
| 261 | 'elements'. In the aforementioned example, the elements are: 'alice', | 263 | 'elements'. In the aforementioned example, the elements are: 'alice', |