Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 45c6d97dd3690b62b4c43f6f4b79d6b7c9c1dee6..62899ab8298fafc89c221a2cf4681d34ec629208 100644 (file)
--- 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)