aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-02-26 20:17:40 -0800
committerGlenn Morris2014-02-26 20:17:40 -0800
commitb77cfcd762d06febbe7f1626f6176bad84c9c36b (patch)
tree1bcae115cf1a0c5b70e6f79ab7701fe130120345
parent3b48a331d19b0eddf5adf0a3c82d8283c950df6f (diff)
downloademacs-b77cfcd762d06febbe7f1626f6176bad84c9c36b.tar.gz
emacs-b77cfcd762d06febbe7f1626f6176bad84c9c36b.zip
* emacs-lisp/crm.el (completing-read-multiple): Empower help-enable-auto-load.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/crm.el8
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 @@
12014-02-27 Glenn Morris <rgm@gnu.org>
2
3 * emacs-lisp/crm.el (completing-read-multiple):
4 Empower help-enable-auto-load.
5
12014-02-26 Glenn Morris <rgm@gnu.org> 62014-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.
248By using this functionality, a user may specify multiple strings at a 250By using this functionality, a user may specify multiple strings at a
249single prompt, optionally using completion. 251single prompt, optionally using completion.
250 252\\<crm-local-completion-map>
251Multiple strings are specified by separating each of the strings with 253Multiple strings are specified by separating each of the strings with
252a prespecified separator regexp. For example, if the separator 254a prespecified separator regexp. For example, if the separator
253regexp is \",\", the strings 'alice', 'bob', and 'eve' would be 255regexp is \",\", the strings 'alice', 'bob', and 'eve' would be
254specified as 'alice,bob,eve'. 256specified as 'alice,bob,eve'.
255 257
256The default value for the separator regexp is the value of 258The 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
258changed by modifying the value of `crm-separator'. 260modifying the value of `crm-separator'.
259 261
260Contiguous strings of non-separator-characters are referred to as 262Contiguous 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',