diff options
author | Tom Tromey <tromey@redhat.com> | 2013-06-03 12:25:05 -0600 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 2013-06-03 12:25:05 -0600 |
commit | 68359abba96d7ec4db8aab3d3dd9cf1105c3bab5 (patch) | |
tree | 862703e7e1a1888170136a8296a5750d6b2ae2eb /lisp/emacs-lisp/crm.el | |
parent | cbcba8ce7f980b01c18c0fd561ef6687b1361507 (diff) | |
parent | e2d8a6f0a229b4ebe26484b892ec4f14888f58b6 (diff) | |
download | emacs-68359abba96d7ec4db8aab3d3dd9cf1105c3bab5.tar.gz emacs-68359abba96d7ec4db8aab3d3dd9cf1105c3bab5.tar.bz2 emacs-68359abba96d7ec4db8aab3d3dd9cf1105c3bab5.zip |
merge from trunk; clean up some issues
Diffstat (limited to 'lisp/emacs-lisp/crm.el')
-rw-r--r-- | lisp/emacs-lisp/crm.el | 5 |
1 files changed, 3 insertions, 2 deletions
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 contents of the minibuffer are 'alice,bob,eve' and point is between 'l' and 'i', pressing TAB operates on the element 'alice'. -The return value of this function is a list of the read strings. +The return value of this function is a list of the read strings +with empty strings removed. See the documentation for `completing-read' for details on the arguments: PROMPT, TABLE, PREDICATE, REQUIRE-MATCH, INITIAL-INPUT, HIST, DEF, and @@ -287,7 +288,7 @@ INHERIT-INPUT-METHOD." prompt initial-input map nil hist def inherit-input-method))) (and def (string-equal input "") (setq input def)) - ;; Ignore empty strings in the list of return values. + ;; Remove empty strings in the list of read strings. (split-string input crm-separator t))) (remove-hook 'choose-completion-string-functions 'crm--choose-completion-string))) |