* lisp/isearch.el (isearch-range-invisible): Use invisible-p.

Fixes: debbugs:8721

2 files changed, 10 insertions, 15 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf7977ced08..975ddde8bcc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-24  Dmitry Kurochkin  <dmitry.kurochkin@gmail.com>  (tiny change)
+
+        * isearch.el (isearch-range-invisible): Use invisible-p (bug#8721).
+
 2011-05-24  Leo Liu  <sdl.web@gmail.com>
 
         * vc/vc-bzr.el (vc-bzr-sha1-program): Rename from sha1-program.
@@ -13,15 +17,15 @@
         (mail-insert-from-field): Do not perform RFC2047 encoding.
         (mail-encode-header): New function.
         (sendmail-send-it): Set buffer-file-coding-system of the work
-        buffer to the return value of select-message-coding-system.  Call
-        mail-encode-header.
+        buffer to the return value of select-message-coding-system.
+        Call mail-encode-header.
 
         * mail/smtpmail.el (smtpmail-send-it): Call mail-encode-header.
 
 2011-05-24  Sean Neakums  <sneakums@zork.net>  (tiny change)
 
-        * mail/supercite.el (sc-default-cite-frame): Handle
-        sc-nested-citation-p when sc-cite-blank-lines-p is non-nil.
+        * mail/supercite.el (sc-default-cite-frame):
+        Handle sc-nested-citation-p when sc-cite-blank-lines-p is non-nil.
 
 2011-05-24  Glenn Morris  <rgm@gnu.org>
 
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 7db7f30dd89..008cf2ce58a 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2434,13 +2434,7 @@ update the match data, and return point."
         ;; If the following character is currently invisible,
         ;; skip all characters with that same `invisible' property value.
         ;; Do that over and over.
-        (while (and (< (point) end)
-                    (let ((prop
-                           (get-char-property (point) 'invisible)))
-                      (if (eq buffer-invisibility-spec t)
-                          prop
-                        (or (memq prop buffer-invisibility-spec)
-                            (assq prop buffer-invisibility-spec)))))
+        (while (and (< (point) end) (invisible-p (point)))
           (if (get-text-property (point) 'invisible)
               (progn
                 (goto-char (next-single-property-change (point) 'invisible
@@ -2456,10 +2450,7 @@ update the match data, and return point."
                 (while overlays
                   (setq o (car overlays)
                         invis-prop (overlay-get o 'invisible))
-                  (if (if (eq buffer-invisibility-spec t)
-                          invis-prop
-                        (or (memq invis-prop buffer-invisibility-spec)
-                            (assq invis-prop buffer-invisibility-spec)))
+                  (if (invisible-p invis-prop)
                       (if (overlay-get o 'isearch-open-invisible)
                           (setq ov-list (cons o ov-list))
                         ;; We found one overlay that cannot be