sascha/vlfi
1
0
Fork 0
mirror of https://github.com/m00natic/vlfi.git synced 2025-01-18 20:10:47 +00:00
Code Issues Releases Wiki Activity

Usability improvements to vlfi-occur.

Browse Source
This commit is contained in:
Andrey Kotlarski 2013-04-16 15:51:30 +03:00
parent 1dcd12288b
commit f14ef6ce9e
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
vlfi.el
View File

@ -598,6 +598,7 @@ The same for mouse EVENT."
(last-match-line 0)
(last-line-pos (point-min))
(file buffer-file-name)
(total-matches 0)
(match-end-pos (+ vlfi-start-pos (position-bytes (point))))
(occur-buffer (generate-new-buffer
(concat "*VLFI-occur " (file-name-nondirectory
@ -643,7 +644,12 @@ The same for mouse EVENT."
'chunk-start chunk-start
'chunk-end chunk-end
'mouse-face '(highlight)
'line-pos line-pos)))
'line-pos line-pos
'help-echo
(format "Move to line %d"
line))))
(setq last-match-line line
total-matches (1+ total-matches))
(let ((line-start (+ (line-beginning-position)
1))
(match-pos (match-beginning 10)))
@ -651,9 +657,10 @@ The same for mouse EVENT."
(+ line-start match-pos (- last-line-pos))
(+ line-start (match-end 10)
(- last-line-pos))
(list 'face 'match 'match-pos match-pos)))
(forward-line)
(setq last-match-line line)))))
(list 'face 'match 'match-pos match-pos
'help-echo
(format "Move to match %d"
total-matches))))))))
(let ((batch-move (- vlfi-end-pos batch-step)))
(vlfi-move-to-batch (if (< batch-move match-end-pos)
match-end-pos
@ -667,15 +674,21 @@ The same for mouse EVENT."
last-line-pos (point-min))
(progress-reporter-update reporter vlfi-end-pos)))
(progress-reporter-done reporter))
(if (zerop total-matches)
(progn (with-current-buffer occur-buffer
(set-buffer-modified-p nil))
(kill-buffer occur-buffer)
(message "No matches for \"%s\"" regexp))
(with-current-buffer occur-buffer
(goto-char (point-min))
(let ((match-count (count-lines (point-min) (point-max))))
(insert (propertize
(format "%d matches for \"%s\" in file \
\(from %d lines\): %s\n" match-count regexp line file)
'face 'underline)))
(format "%d matches from %d lines for \"%s\" \
in file: %s" total-matches line regexp file)
'face 'underline))
(set-buffer-modified-p nil)
(forward-char)
(vlfi-occur-mode))
(display-buffer occur-buffer))))
(display-buffer occur-buffer)))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; editing