aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Winkler2013-03-17 05:33:57 -0500
committerRoland Winkler2013-03-17 05:33:57 -0500
commit9c44569ea2a18099307e0571d523d8637000a153 (patch)
tree80b9fcf95775b28f814998633572f8bb8f4540bc
parent327f1f6f6d934e58921179275547b2d09f219f32 (diff)
downloademacs-9c44569ea2a18099307e0571d523d8637000a153.tar.gz
emacs-9c44569ea2a18099307e0571d523d8637000a153.zip
completing-read-multiple: Ignore empty strings in the list of return values
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/crm.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c0de85ccf8..1f9724e17fd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-03-17 Roland Winkler <winkler@gnu.org>
2
3 * emacs-lisp/crm.el (completing-read-multiple): Ignore empty
4 strings in the list of return values.
5
12013-03-17 Jay Belanger <jay.p.belanger@gmail.com> 62013-03-17 Jay Belanger <jay.p.belanger@gmail.com>
2 7
3 * calc/calc-ext.el (math-read-number-fancy): Check for an explicit 8 * calc/calc-ext.el (math-read-number-fancy): Check for an explicit
diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el
index f88cb0ef9bb..e1e1847dd59 100644
--- a/lisp/emacs-lisp/crm.el
+++ b/lisp/emacs-lisp/crm.el
@@ -287,7 +287,8 @@ INHERIT-INPUT-METHOD."
287 prompt initial-input map 287 prompt initial-input map
288 nil hist def inherit-input-method))) 288 nil hist def inherit-input-method)))
289 (and def (string-equal input "") (setq input def)) 289 (and def (string-equal input "") (setq input def))
290 (split-string input crm-separator))) 290 ;; Ignore empty strings in the list of return values.
291 (split-string input crm-separator t)))
291 (remove-hook 'choose-completion-string-functions 292 (remove-hook 'choose-completion-string-functions
292 'crm--choose-completion-string))) 293 'crm--choose-completion-string)))
293 294