From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Fri, 17 Jul 2015 11:22:24 +0000 (+0100)
Subject: * lisp/obsolete/longlines.el (longlines-search-function):
X-Git-Tag: emacs-25.0.90~1481
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eed81d277f5f095399611d52b4ff814622d44f1c;p=emacs.git

* lisp/obsolete/longlines.el (longlines-search-function):

Fallback on `isearch-search-fun-default'.
---

diff --git a/lisp/obsolete/longlines.el b/lisp/obsolete/longlines.el
index a27c43be9df..01939daa709 100644
--- a/lisp/obsolete/longlines.el
+++ b/lisp/obsolete/longlines.el
@@ -464,14 +464,9 @@ This is called by `window-configuration-change-hook'."
 
 (defun longlines-search-function ()
   (cond
-   (isearch-word
-    (if isearch-forward 'word-search-forward 'word-search-backward))
-   (isearch-regexp
-    (if isearch-forward 're-search-forward 're-search-backward))
-   (t
-    (if isearch-forward
-	'longlines-search-forward
-      'longlines-search-backward))))
+   ((or isearch-word isearch-regexp) (isearch-search-fun-default))
+   (isearch-forward #'longlines-search-forward)
+   (t #'longlines-search-backward)))
 
 (defun longlines-search-forward (string &optional bound noerror count)
   (let ((search-spaces-regexp " *[ \n]"))