aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Winkler2013-03-31 10:19:19 -0500
committerRoland Winkler2013-03-31 10:19:19 -0500
commita77e2924c91c20b2b5ca121f52d2c71245c56c74 (patch)
tree8b243dab161be9aa545137071a9808cfada5b3af
parent2bd8a4a8675b92b9dfed0a145493abb48e048d2d (diff)
downloademacs-a77e2924c91c20b2b5ca121f52d2c71245c56c74.tar.gz
emacs-a77e2924c91c20b2b5ca121f52d2c71245c56c74.zip
emacs-lisp/crm.el (completing-read-multiple): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/crm.el5
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a471252797..0067dfe305b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-03-31 Roland Winkler <winkler@gnu.org>
2
3 * emacs-lisp/crm.el (completing-read-multiple): Doc fix.
4
12013-03-31 Stefan Monnier <monnier@iro.umontreal.ca> 52013-03-31 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * hi-lock.el (hi-lock-mode): Cleanup after revert-buffer (bug#13891). 7 * hi-lock.el (hi-lock-mode): Cleanup after revert-buffer (bug#13891).
diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el
index e1e1847dd59..b8e327625e7 100644
--- a/lisp/emacs-lisp/crm.el
+++ b/lisp/emacs-lisp/crm.el
@@ -263,7 +263,8 @@ Completion is available on a per-element basis. For example, if the
263contents of the minibuffer are 'alice,bob,eve' and point is between 263contents of the minibuffer are 'alice,bob,eve' and point is between
264'l' and 'i', pressing TAB operates on the element 'alice'. 264'l' and 'i', pressing TAB operates on the element 'alice'.
265 265
266The return value of this function is a list of the read strings. 266The return value of this function is a list of the read strings
267with empty strings removed.
267 268
268See the documentation for `completing-read' for details on the arguments: 269See the documentation for `completing-read' for details on the arguments:
269PROMPT, TABLE, PREDICATE, REQUIRE-MATCH, INITIAL-INPUT, HIST, DEF, and 270PROMPT, TABLE, PREDICATE, REQUIRE-MATCH, INITIAL-INPUT, HIST, DEF, and
@@ -287,7 +288,7 @@ INHERIT-INPUT-METHOD."
287 prompt initial-input map 288 prompt initial-input map
288 nil hist def inherit-input-method))) 289 nil hist def inherit-input-method)))
289 (and def (string-equal input "") (setq input def)) 290 (and def (string-equal input "") (setq input def))
290 ;; Ignore empty strings in the list of return values. 291 ;; Remove empty strings in the list of read strings.
291 (split-string input crm-separator t))) 292 (split-string input crm-separator t)))
292 (remove-hook 'choose-completion-string-functions 293 (remove-hook 'choose-completion-string-functions
293 'crm--choose-completion-string))) 294 'crm--choose-completion-string)))