diff options
author | Tomi Ollila <tomi.ollila@iki.fi> | 2012-01-13 10:17:28 +0200 |
---|---|---|
committer | David Bremner <bremner@debian.org> | 2012-01-22 09:18:20 -0400 |
commit | a04642043fa8f071e0dbc73a204fcc91dc3c8401 (patch) | |
tree | a63b5737ee1dfe9ec6038486853885cd14e643bd /test | |
parent | da9f39216555934327a91ebc6b3b726b0a989dcf (diff) |
test: make (kill-emacs) from emacsclient work with emacs 23.(1|2)
emacsclient --eval '(kill-emacs)' makes emacs versions 23.1
and 23.2 ask user input from running emacs. Redefining
yes-or-no-p function when kill-emacs is executed for these
emacs versions in test-lib.el avoids this test problem.
Diffstat (limited to 'test')
-rw-r--r-- | test/test-lib.el | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/test/test-lib.el b/test/test-lib.el index 3b817c37..59c58681 100644 --- a/test/test-lib.el +++ b/test/test-lib.el @@ -26,6 +26,13 @@ ;; `read' call. (setq read-file-name-function (lambda (&rest _) (read))) +;; Work around a bug in emacs 23.1 and emacs 23.2 which prevents +;; noninteractive (kill-emacs) from emacsclient. +(if (and (= emacs-major-version 23) (< emacs-minor-version 3)) + (defadvice kill-emacs (before disable-yes-or-no-p activate) + "Disable yes-or-no-p before executing kill-emacs" + (defun yes-or-no-p (prompt) t))) + (defun notmuch-test-wait () "Wait for process completion." (while (get-buffer-process (current-buffer)) |