From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Fri, 27 Nov 2015 11:23:35 +0000 (+0000)
Subject: * lisp/isearch.el: Ensure we still support `isearch-new-word'
X-Git-Tag: emacs-25.0.90~630
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=60e1dfd82061dd8afd02d70844a03bc8a2ab7792;p=emacs.git

* lisp/isearch.el: Ensure we still support `isearch-new-word'

(isearch-new-regexp-function): Define variable.
(isearch-new-word): Define as an obsolete alias. (Bug#22018)
---

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 0a6b925d03e..65f8d6fb925 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1213,6 +1213,14 @@ If MSG is non-nil, use variable `isearch-message', otherwise `isearch-string'."
 	  (length succ-msg)
 	0))))
 
+(defvar isearch-new-regexp-function nil
+  "Holds the next `isearch-regexp-function' inside `with-isearch-suspended'.
+If this is set inside code wrapped by the macro
+`with-isearch-suspended', then the value set will be used as the
+`isearch-regexp-function' once isearch resumes.")
+(define-obsolete-variable-alias 'isearch-new-word
+  'isearch-new-regexp-function "25.1")
+
 (defmacro with-isearch-suspended (&rest body)
   "Exit Isearch mode, run BODY, and reinvoke the pending search.
 You can update the global isearch variables by setting new values to