aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2014-02-26 04:02:21 +0200
committerDmitry Gutov2014-02-26 04:02:21 +0200
commit40ff7f86b6e030763327fd306702ba0928e5b09e (patch)
tree640f91f67af9b6a0540aba669372d9140e394e26
parent0e46275b4d2f06f8d60302db2e94083d66349cbc (diff)
downloademacs-40ff7f86b6e030763327fd306702ba0928e5b09e.tar.gz
emacs-40ff7f86b6e030763327fd306702ba0928e5b09e.zip
* lisp/emacs-lisp/ert.el (ert-run-tests-interactively): `read' the
result of `completing-read' in the interactive form. Fixes: debbugs:16854
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/ert.el11
2 files changed, 11 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 07812f6fced..56ff5b1c506 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-02-26 Dmitry Gutov <dgutov@yandex.ru>
2
3 * emacs-lisp/ert.el (ert-run-tests-interactively): `read' the
4 result of `completing-read' in the interactive form. (Bug#16854)
5
12014-02-25 Glenn Morris <rgm@gnu.org> 62014-02-25 Glenn Morris <rgm@gnu.org>
2 7
3 * image.el (image-animate, image-animate-timeout): 8 * image.el (image-animate, image-animate-timeout):
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index ee058a8f607..34041aab9a8 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -1882,11 +1882,12 @@ and how to display message."
1882 ;; defined without cl. 1882 ;; defined without cl.
1883 (car ert--selector-history) 1883 (car ert--selector-history)
1884 "t"))) 1884 "t")))
1885 (completing-read (if (null default) 1885 (read
1886 "Run tests: " 1886 (completing-read (if (null default)
1887 (format "Run tests (default %s): " default)) 1887 "Run tests: "
1888 obarray #'ert-test-boundp nil nil 1888 (format "Run tests (default %s): " default))
1889 'ert--selector-history default nil)) 1889 obarray #'ert-test-boundp nil nil
1890 'ert--selector-history default nil)))
1890 nil)) 1891 nil))
1891 (unless message-fn (setq message-fn 'message)) 1892 (unless message-fn (setq message-fn 'message))
1892 (let ((output-buffer-name output-buffer-name) 1893 (let ((output-buffer-name output-buffer-name)