summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorNoam Postavsky <npostavs@gmail.com>2016-10-06 21:20:28 -0400
committerNoam Postavsky <npostavs@gmail.com>2016-10-06 21:20:32 -0400
commitfb12af2084a751566ff5445654d75f5653f2253d (patch)
treef74f5430d29259671253c34392c72c7402f4345f /test
parentc4a5e7e18d357c168900215165b0cb41bad06a83 (diff)
parent623401267a66929a1c13c264e0dc40ba2599500f (diff)
downloademacs-fb12af2084a751566ff5445654d75f5653f2253d.tar.gz
; Merge: some backports from master
Regression in Emacs 25.1 * "Don't require isearch-update before isearch-done" This bug actually crashes in emacs-25 * "Avoid error in icalendar--read-element" Doc fixes * "Make a menu less ambiguous" * "Doc fix for url-http"
Diffstat (limited to 'test')
-rw-r--r--test/automated/isearch-tests.el8
1 files changed, 8 insertions, 0 deletions
diff --git a/test/automated/isearch-tests.el b/test/automated/isearch-tests.el
index 48c342403c9..52f312d0b97 100644
--- a/test/automated/isearch-tests.el
+++ b/test/automated/isearch-tests.el
@@ -28,5 +28,13 @@
(isearch-update)
(should (equal isearch--current-buffer (current-buffer)))))
+(ert-deftest isearch--test-done ()
+ ;; Normal operation.
+ (isearch-update)
+ (isearch-done)
+ (should-not isearch--current-buffer)
+ ;; Bug #21091: let `isearch-done' work without `isearch-update'.
+ (isearch-done))
+
(provide 'isearch-tests)
;;; isearch-tests.el ends here