sascha/vlfi
1
0
Fork 0
mirror of https://github.com/m00natic/vlfi.git synced 2025-02-24 05:48:06 +00:00
Code Issues Releases Wiki Activity

Fix small issues with forward search and add report progress.

Browse Source
This commit is contained in:
Andrey Kotlarski 2013-03-29 17:38:21 +02:00
parent 81e4fe19ac
commit c812288ab7
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
vlfi.el
View File

@ -228,26 +228,34 @@ OP-TYPE specifies the file operation being performed over FILENAME."
(let ((start vlfi-start-pos)
(end vlfi-end-pos)
(pos (point))
(to-find count))
(catch 'end-of-file
(while (not (zerop to-find))
(cond ((re-search-forward regexp nil t)
(setq to-find (1- to-find)))
((= vlfi-end-pos vlfi-file-size)
(throw 'end-of-file nil))
(t (vlfi-next-batch 1)))))
(or (zerop to-find)
(if (< to-find count)
(message "Moved to the %d match which is last"
(- count to-find))
(let ((inhibit-read-only t))
(insert-file-contents buffer-file-name nil start end))
(goto-char pos)
(setq vlfi-start-pos start
vlfi-end-pos end)
(set-buffer-modified-p nil)
(vlfi-update-buffer-name)
(message "Not found")))))
(to-find count)
(search-reporter (make-progress-reporter
(concat "Searching for " regexp)
vlfi-start-pos vlfi-file-size)))
(unwind-protect
(catch 'end-of-file
(while (not (zerop to-find))
(cond ((re-search-forward regexp nil t)
(setq to-find (1- to-find)))
((= vlfi-end-pos vlfi-file-size)
(throw 'end-of-file nil))
(t (vlfi-next-batch 1)
(progress-reporter-update search-reporter
vlfi-end-pos)))))
(progress-reporter-done search-reporter)
(or (zerop to-find)
(if (< to-find count)
(message "Moved to the %d match which is last"
(- count to-find))
(let ((inhibit-read-only t))
(erase-buffer)
(insert-file-contents buffer-file-name nil start end))
(goto-char pos)
(setq vlfi-start-pos start
vlfi-end-pos end)
(set-buffer-modified-p nil)
(vlfi-update-buffer-name)
(message "Not found"))))))
(provide 'vlfi)