[nongnu] elpa/iedit 9fd1b43170 229/301: Fix failed test cases for Emacs 25.1

[ELPA Syncer]

branch: elpa/iedit
commit 9fd1b43170982b2257a7d5c1d1c51907f272273c
Author: Victor Ren <victorhge@gmail.com>
Commit: Victor Ren <victorhge@gmail.com>

    Fix  failed test cases for Emacs 25.1
---
 iedit-tests.el |  8 ++++++--
 iedit.el       | 14 ++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/iedit-tests.el b/iedit-tests.el
index 46a420ce8e..efb9c44e0b 100644
--- a/iedit-tests.el
+++ b/iedit-tests.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2010, 2011, 2012 Victor Ren
 
-;; Time-stamp: <2016-06-18 18:00:27 Victor Ren>
+;; Time-stamp: <2016-09-20 00:28:29 Victor Ren>
 ;; Author: Victor Ren <victorhge@gmail.com>
 ;; Version: 0.97
 ;; X-URL: http://www.emacswiki.org/emacs/Iedit
@@ -43,7 +43,10 @@
      (when (get-buffer ,buffer-name)
        (kill-buffer ,buffer-name))
      (with-current-buffer (get-buffer-create ,buffer-name)
-       ,@body)))
+       ;; Give the current temp buffer a window. Otherwise `recenter' will
+       ;; trigger an error message.
+       (progn (set-window-buffer nil ,buffer-name)
+              ,@body))))
 
 (defun marker-position-list (l)
   "convert list of markers to positions"
@@ -242,6 +245,7 @@ fob")))))
      (should (string= iedit-initial-string-local "foo"))
      (iedit-mode)
      (with-temp-buffer
+       (set-window-buffer nil (current-buffer))
        (insert "bar foo foo")
        (goto-char 1)
        (iedit-mode 16)
diff --git a/iedit.el b/iedit.el
index 0bc4a1bdba..f44b9a3d59 100644
--- a/iedit.el
+++ b/iedit.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2010, 2011, 2012 Victor Ren
 
-;; Time-stamp: <2016-07-12 15:03:42 Victor Ren>
+;; Time-stamp: <2016-09-20 00:04:51 Victor Ren>
 ;; Author: Victor Ren <victorhge@gmail.com>
 ;; Keywords: occurrence region simultaneous refactoring
 ;; Version: 0.9.9
@@ -76,7 +76,9 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
+(eval-when-compile
+  (require 'cl)
+  (require 'sgml-mode))
 (require 'iedit-lib)
 
 (defcustom iedit-toggle-key-default (kbd "C-;")
@@ -380,15 +382,15 @@ Keymap used within overlays:
   "Start Iedit mode using last search string as the regexp."
   (interactive
    (let ((regexp (cond
-                  ((functionp isearch-word)
-                   (funcall isearch-word isearch-string))
-                  (isearch-word (word-search-regexp isearch-string))
+                  ((functionp isearch-regexp-function)
+                   (funcall isearch-regexp-function isearch-string))
+                  (isearch-regexp-function (word-search-regexp isearch-string))
                   (isearch-regexp isearch-string)
                   (t (regexp-quote isearch-string)))))
      (list regexp)))
   (or isearch-success
       (error "No match" ))
-  (if (or isearch-regexp isearch-word)
+  (if (or isearch-regexp isearch-regexp-function)
       nil
     (setq iedit-initial-string-local isearch-string))
   (let ((iedit-case-sensitive (not isearch-case-fold-search)))