+16
-11
lines changedFilter options
+16
-11
lines changed Original file line number Diff line number Diff line change
@@ -4313,18 +4313,22 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout, bool do_buf_event, handle
4313 4313 4314 4314
#define PUSH_PREVIEW_LINES() \
4315 4315
do { \
4316 -
linenr_T match_lines = current_match.end.lnum \
4317 -
- current_match.start.lnum +1; \
4318 -
if (preview_lines.subresults.size > 0) { \
4319 -
linenr_T last = kv_last(preview_lines.subresults).end.lnum; \
4320 -
if (last == current_match.start.lnum) { \
4321 -
preview_lines.lines_needed += match_lines - 1; \
4316 +
if (preview) { \
4317 +
linenr_T match_lines = current_match.end.lnum \
4318 +
- current_match.start.lnum +1; \
4319 +
if (preview_lines.subresults.size > 0) { \
4320 +
linenr_T last = kv_last(preview_lines.subresults).end.lnum; \
4321 +
if (last == current_match.start.lnum) { \
4322 +
preview_lines.lines_needed += match_lines - 1; \
4323 +
} else { \
4324 +
preview_lines.lines_needed += match_lines; \
4325 +
} \
4326 +
} else { \
4327 +
preview_lines.lines_needed += match_lines; \
4322 4328
} \
4323 -
} else { \
4324 -
preview_lines.lines_needed += match_lines; \
4329 +
kv_push(preview_lines.subresults, current_match); \
4325 4330
} \
4326 -
kv_push(preview_lines.subresults, current_match); \
4327 -
} while (0)
4331 +
} while (0)
4328 4332 4329 4333
// Push the match to preview_lines.
4330 4334
PUSH_PREVIEW_LINES();
@@ -4,6 +4,7 @@ local clear, feed = helpers.clear, helpers.feed
4 4
local source = helpers.source
5 5
local command = helpers.command
6 6
local assert_alive = helpers.assert_alive
7 +
local uname = helpers.uname
7 8 8 9
local function new_screen(opt)
9 10
local screen = Screen.new(25, 5)
@@ -824,7 +825,7 @@ describe('cmdline redraw', function()
824 825
end)
825 826 826 827
it('with <Cmd>', function()
827 -
if 'openbsd' == helpers.uname() then
828 +
if string.find(uname(), 'bsd') then
828 829
pending('FIXME #10804')
829 830
end
830 831
command('cmap a <Cmd>call sin(0)<CR>') -- no-op
You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4