[Emacs-diffs] /srv/bzr/emacs/trunk r105697: Add `wdired-isearch-filter-read-only' to lisp/wdired.el.

[Juri Linkov]

------------------------------------------------------------
revno: 105697
fixes bug(s): http://debbugs.gnu.org/6362
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Fri 2011-09-09 18:49:00 +0300
message:
  Add `wdired-isearch-filter-read-only' to lisp/wdired.el.
  
  * lisp/wdired.el (wdired-change-to-wdired-mode): Set buffer-local
  `isearch-filter-predicate' to `wdired-isearch-filter-read-only'.
  (wdired-isearch-filter-read-only): New function.
modified:
  lisp/ChangeLog
  lisp/wdired.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-09 09:52:26 +0000
+++ b/lisp/ChangeLog    2011-09-09 15:49:00 +0000
@@ -1,3 +1,9 @@
+2011-09-09  Juri Linkov  <address@hidden>
+
+       * wdired.el (wdired-change-to-wdired-mode): Set buffer-local
+       `isearch-filter-predicate' to `wdired-isearch-filter-read-only'.
+       (wdired-isearch-filter-read-only): New function.  (Bug#6362)
+
 2011-09-09  Alan Mackenzie  <address@hidden>
 
        * progmodes/cc-mode.el (awk-mode): Prevent `define-derived-mode'

=== modified file 'lisp/wdired.el'
--- a/lisp/wdired.el    2011-05-09 17:47:01 +0000
+++ b/lisp/wdired.el    2011-09-09 15:49:00 +0000
@@ -216,6 +216,8 @@
        (buffer-substring (point-min) (point-max)))
   (set (make-local-variable 'wdired-old-point) (point))
   (set (make-local-variable 'query-replace-skip-read-only) t)
+  (set (make-local-variable 'isearch-filter-predicate)
+       'wdired-isearch-filter-read-only)
   (use-local-map wdired-mode-map)
   (force-mode-line-update)
   (setq buffer-read-only nil)
@@ -241,6 +243,11 @@
                 "Press \\[wdired-finish-edit] when finished \
 or \\[wdired-abort-changes] to abort changes")))
 
+(defun wdired-isearch-filter-read-only (beg end)
+  "Skip matches that have a read-only property."
+  (and (isearch-filter-visible beg end)
+       (not (text-property-not-all (min beg end) (max beg end)
+                                  'read-only nil))))
 
 ;; Protect the buffer so only the filenames can be changed, and put
 ;; properties so filenames (old and new) can be easily found.