Skip to content

Commit

Permalink
Merge branch 'pull/57'
Browse files Browse the repository at this point in the history
Closes: #57

* pull/57:
  Apply style fixes for consistency
  doc: update AUTHORS and HISTORY
  Set the list's 'title' with last search string
  • Loading branch information
wincent committed Dec 20, 2018
2 parents 59ea1b9 + 34a600a commit b164729
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 0 deletions.
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,7 @@ Other contributors that have submitted patches include (in alphabetical order):
- Daniel Silva
- Filip Szymański
- Joe Lencioni
- Jon Parise
- Nelo-Thara Wallus
- Tom Dooner
- Vaibhav Sagar
Expand All @@ -577,6 +578,12 @@ Other contributors that have submitted patches include (in alphabetical order):
## History<a name="ferret-history" href="#user-content-ferret-history"></a>


### master (not yet released)<a name="ferret-master-not-yet-released" href="#user-content-ferret-master-not-yet-released"></a>

- Try to avoid &quot;press ENTER to continue&quot; prompts.
- Put search term in <strong>`w:quickfix_title`</strong> for use in statuslines (https://github.com/wincent/ferret/pull/57).


### 3.0.3 (23 March 2018)<a name="ferret-303-23-march-2018" href="#user-content-ferret-303-23-march-2018"></a>

- Fix for <strong>[`:Lack`](#user-content-lack)</strong> results opening in quickfix listing in Neovim (https://github.com/wincent/ferret/issues/47).
Expand Down
14 changes: 14 additions & 0 deletions autoload/ferret/private/shared.vim
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,20 @@ function! s:autojump()
return l:autojump
endfunction

function! s:set_title(type, title)
if has('patch-7.4.2200')
if a:type ==# 'qf'
call setqflist([], 'a', {'title' : a:title})
else
call setloclist(0, [], 'a', {'title' : a:title})
endif
elseif a:type ==# 'qf'
let w:quickfix_title=a:title
endif
endfunction

function! ferret#private#shared#finalize_search(output, ack)
let l:lastsearch = get(g:, 'ferret_lastsearch', '')
let l:original_errorformat=&errorformat
let l:autojump=s:autojump()
if a:ack
Expand All @@ -45,6 +58,7 @@ function! ferret#private#shared#finalize_search(output, ack)
else
call s:swallow(l:prefix . 'getexpr a:1', a:output)
endif
call s:set_title(l:post, 'Search `' . l:lastsearch . '`')
let l:before=winnr()
let l:len=ferret#private#post(l:post)
if l:len
Expand Down
7 changes: 7 additions & 0 deletions doc/ferret.txt
Original file line number Diff line number Diff line change
Expand Up @@ -650,12 +650,19 @@ order):
- Daniel Silva
- Filip Szymański
- Joe Lencioni
- Jon Parise
- Nelo-Thara Wallus
- Tom Dooner
- Vaibhav Sagar

HISTORY *ferret-history*

master (not yet released) ~

- Try to avoid "press ENTER to continue" prompts.
- Put search term in |w:quickfix_title| for use in statuslines
(https://github.com/wincent/ferret/pull/57).

3.0.3 (23 March 2018) ~

- Fix for |:Lack| results opening in quickfix listing in Neovim
Expand Down
3 changes: 3 additions & 0 deletions plugin/ferret.vim
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@
" - Daniel Silva
" - Filip Szymański
" - Joe Lencioni
" - Jon Parise
" - Nelo-Thara Wallus
" - Tom Dooner
" - Vaibhav Sagar
Expand All @@ -359,6 +360,8 @@
" ## master (not yet released)
"
" - Try to avoid "press ENTER to continue" prompts.
" - Put search term in |w:quickfix_title| for use in statuslines
" (https://github.com/wincent/ferret/pull/57).
"
" ## 3.0.3 (23 March 2018)
"
Expand Down

0 comments on commit b164729

Please sign in to comment.