aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatsumi Yamaoka2015-06-29 23:13:45 +0000
committerKatsumi Yamaoka2015-06-29 23:13:45 +0000
commit3fa319bd841dfd0451fcd0e937af9582bdb81ef7 (patch)
tree0a90403551dca7aebf39722e263caee7fc1b5091
parentea399306a304d8f7e0feb46c2215e47d0eae6864 (diff)
downloademacs-3fa319bd841dfd0451fcd0e937af9582bdb81ef7.tar.gz
emacs-3fa319bd841dfd0451fcd0e937af9582bdb81ef7.zip
* lisp/isearch.el (isearch-exit): Don't call isearch-done twice (bug#20925).
-rw-r--r--lisp/isearch.el4
1 files changed, 2 insertions, 2 deletions
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'."
1184 (if (and search-nonincremental-instead 1184 (if (and search-nonincremental-instead
1185 (= 0 (length isearch-string))) 1185 (= 0 (length isearch-string)))
1186 (let ((isearch-nonincremental t)) 1186 (let ((isearch-nonincremental t))
1187 (isearch-edit-string))) 1187 (isearch-edit-string)) ;; this calls isearch-done as well
1188 (isearch-done) 1188 (isearch-done))
1189 (isearch-clean-overlays)) 1189 (isearch-clean-overlays))
1190 1190
1191(defun isearch-fail-pos (&optional msg) 1191(defun isearch-fail-pos (&optional msg)