diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-09-10 10:45:02 +0200 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-09-10 10:45:02 +0200 |
| commit | a26b14733bba6659548f00db634bc45ccd222447 (patch) | |
| tree | 4b0e1d39334c03a90ce718a3e051be60ca28822b /lisp/emacs-lisp/ert.el | |
| parent | 107514a6e21f2c434cdae0eca76fe0a60e287ac8 (diff) | |
| parent | 931b9f5953013c1e8844d0c723411b87ccfedb1a (diff) | |
| download | emacs-a26b14733bba6659548f00db634bc45ccd222447.tar.gz emacs-a26b14733bba6659548f00db634bc45ccd222447.tar.bz2 emacs-a26b14733bba6659548f00db634bc45ccd222447.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/ert.el')
| -rw-r--r-- | lisp/emacs-lisp/ert.el | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el index 241eece05b6..3c347c0b199 100644 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el @@ -1635,9 +1635,7 @@ Signals an error if no test name was read." nil))) (ert-test (setq default (ert-test-name default)))) (when add-default-to-prompt - (setq prompt (if (null default) - (format "%s: " prompt) - (format "%s (default %s): " prompt default)))) + (setq prompt (format-prompt prompt default))) (let ((input (completing-read prompt obarray #'ert-test-boundp t nil history default nil))) ;; completing-read returns an empty string if default was nil and @@ -2023,9 +2021,7 @@ and how to display message." (car ert--selector-history) "t"))) (read - (completing-read (if (null default) - "Run tests: " - (format "Run tests (default %s): " default)) + (completing-read (format-prompt "Run tests" default) obarray #'ert-test-boundp nil nil 'ert--selector-history default nil))) nil)) |