From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Mon, 29 Jun 2015 23:13:45 +0000 (+0000)
Subject: * lisp/isearch.el (isearch-exit): Don't call isearch-done twice (bug#20925).
X-Git-Tag: emacs-25.0.90~1609
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3fa319bd841dfd0451fcd0e937af9582bdb81ef7;p=emacs.git

* lisp/isearch.el (isearch-exit): Don't call isearch-done twice (bug#20925).
---

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 45c6d97dd36..62899ab8298 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1184,8 +1184,8 @@ nonincremental search instead via `isearch-edit-string'."
   (if (and search-nonincremental-instead
 	   (= 0 (length isearch-string)))
       (let ((isearch-nonincremental t))
-	(isearch-edit-string)))
-  (isearch-done)
+	(isearch-edit-string)) ;; this calls isearch-done as well
+    (isearch-done))
   (isearch-clean-overlays))
 
 (defun isearch-fail-pos (&optional msg)