[nongnu] elpa/iedit 79d0f4f3dc 155/301: Merge pull request #32 from mbneedham/master

[ELPA Syncer]

branch: elpa/iedit
commit 79d0f4f3dce5d497f100d1723530194d46cd6e68
Merge: acb9fa54f3 46d5f65019
Author: victorhge <victorhge@gmail.com>
Commit: victorhge <victorhge@gmail.com>

    Merge pull request #32 from mbneedham/master
    
    Small bugfix to clean up old occurrences when calling from isearch
---
 iedit-lib.el | 2 +-
 iedit.el     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/iedit-lib.el b/iedit-lib.el
index b3f1207d77..a3d639ecd5 100644
--- a/iedit-lib.el
+++ b/iedit-lib.el
@@ -773,7 +773,7 @@ Return nil if occurrence string is empty string."
     (if ov
         (let ((beg (overlay-start ov))
               (end (overlay-end ov)))
-          (if (and ov (/=  beg end))
+          (if (/=  beg end)
               (buffer-substring-no-properties beg end)
             nil))
       nil)))
diff --git a/iedit.el b/iedit.el
index d2aef7f43c..0a4e953e16 100644
--- a/iedit.el
+++ b/iedit.el
@@ -362,6 +362,8 @@ Keymap used within overlays:
     (isearch-exit)
     (setq mark-active nil)
     (run-hooks 'deactivate-mark-hook)
+    (when iedit-mode
+      (iedit-cleanup))
     (iedit-start regexp (point-min) (point-max))
     ;; TODO: reconsider how to avoid the loop in iedit-same-length
     (cond ((not iedit-occurrences-overlays)