[Emacs-diffs] master eed81d2: * lisp/obsolete/longlines.el (longlines-search-function):

[Artur Malabarba]

branch: master
commit eed81d277f5f095399611d52b4ff814622d44f1c
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>

    * lisp/obsolete/longlines.el (longlines-search-function):
    
    Fallback on `isearch-search-fun-default'.
---
 lisp/obsolete/longlines.el |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/lisp/obsolete/longlines.el b/lisp/obsolete/longlines.el
index a27c43b..01939da 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]"))