]> git.eshelyaron.com Git - emacs.git/commitdiff
* lisp/obsolete/longlines.el (longlines-search-function):
authorArtur Malabarba <bruce.connor.am@gmail.com>
Fri, 17 Jul 2015 11:22:24 +0000 (12:22 +0100)
committerArtur Malabarba <bruce.connor.am@gmail.com>
Fri, 17 Jul 2015 11:39:01 +0000 (12:39 +0100)
Fallback on `isearch-search-fun-default'.

lisp/obsolete/longlines.el

index a27c43be9dfee0b9b9e19a83411788d08c51b3c2..01939daa709bd74b521601c6bc59cf0c2956f3f4 100644 (file)
@@ -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]"))