Merge from origin/emacs-25

[gnu-emacs] / lisp / obsolete / longlines.el

diff --git a/lisp/obsolete/longlines.el b/lisp/obsolete/longlines.el
index 7cb13ce600f14bfa99ab66cdea274ff3b3cf647b..ff194de8c0c3830ac1ad6210354fbf8841f812bb 100644 (file)
--- a/lisp/obsolete/longlines.el
+++ b/lisp/obsolete/longlines.el
@@ -1,6 +1,6 @@
 ;;; longlines.el --- automatically wrap long lines   -*- coding:utf-8 -*-
 
-;; Copyright (C) 2000-2001, 2004-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2001, 2004-2016 Free Software Foundation, Inc.
 
 ;; Authors:    Kai Grossjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 ;;             Alex Schroeder <alex@gnu.org>
@@ -464,7 +464,7 @@ This is called by `window-configuration-change-hook'."
 
 (defun longlines-search-function ()
   (cond
-   ((or isearch-word isearch-regexp) (isearch-search-fun-default))
+   ((or isearch-regexp-function isearch-regexp) (isearch-search-fun-default))
    (isearch-forward #'longlines-search-forward)
    (t #'longlines-search-backward)))