averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-11 15:37:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'vim/master'

Browse Source
This commit is contained in:
Kazuki Sakamoto
2016-06-14 22:17:35 -07:00
parent 8f65bea132 36f0f0686c
commit 7d06ae4c39
5 changed files with 137 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui.c
+7 -2
View File
@@ -5409,10 +5409,15 @@ gui_do_findrepl(
}
else
{
/* Search for the next match. */
int searchflags = SEARCH_MSG + SEARCH_MARK;
/* Search for the next match.
* Don't skip text under cursor for single replace. */
if (type == FRD_REPLACE)
searchflags += SEARCH_START;
i = msg_scroll;
(void)do_search(NULL, down ? '/' : '?', ga.ga_data, 1L,
SEARCH_MSG + SEARCH_MARK, NULL);
searchflags, NULL);
msg_scroll = i; /* don't let an error message set msg_scroll */
}
src/mark.c
+20 -4
View File
@@ -1674,13 +1674,29 @@ write_viminfo_filemarks(FILE *fp)
idx = NMARKS;
for (i = NMARKS; i < NMARKS + EXTRA_MARKS; i++)
{
if (vi_namedfm != NULL
&& vi_namedfm[vi_idx].fmark.mark.lnum != 0
&& (vi_namedfm[vi_idx].time_set > namedfm[idx].time_set
xfmark_T *vi_fm = vi_namedfm != NULL ? &vi_namedfm[vi_idx] : NULL;
if (vi_fm != NULL
&& vi_fm->fmark.mark.lnum != 0
&& (vi_fm->time_set > namedfm[idx].time_set
|| namedfm[idx].fmark.mark.lnum == 0))
fm = &vi_namedfm[vi_idx++];
{
fm = vi_fm;
++vi_idx;
}
else
{
fm = &namedfm[idx++];
if (vi_fm != NULL
&& vi_fm->fmark.mark.lnum == fm->fmark.mark.lnum
&& vi_fm->time_set == fm->time_set
&& ((vi_fm->fmark.fnum != 0
&& vi_fm->fmark.fnum == fm->fmark.fnum)
|| (vi_fm->fname != NULL
&& fm->fname != NULL
&& STRCMP(vi_fm->fname, fm->fname) == 0)))
++vi_idx; /* skip duplicate */
}
write_one_filemark(fp, fm, '\'', i - NMARKS + '0');
}
src/ops.c
+1 -1
View File
@@ -6011,7 +6011,7 @@ handle_viminfo_register(garray_T *values, int force)
return;
flags = vp[0].bv_nr;
name = vp[1].bv_nr;
if (name < 0 || name > NUM_REGISTERS)
if (name < 0 || name >= NUM_REGISTERS)
return;
type = vp[2].bv_nr;
if (type != MCHAR && type != MLINE && type != MBLOCK)
src/testdir/test_quickfix.vim
+101 -19
View File
@@ -80,9 +80,9 @@ function XageTests(cchar)
let Xnewer = a:cchar . 'newer'
let Xgetexpr = a:cchar . 'getexpr'
if a:cchar == 'c'
let Xgetlist = 'getqflist()'
let Xgetlist = function('getqflist')
else
let Xgetlist = 'getloclist(0)'
let Xgetlist = function('getloclist', [0])
endif
" Jumping to a non existent list should return error
@@ -99,21 +99,21 @@ function XageTests(cchar)
" Go back two lists
exe Xolder
exe 'let l = ' . Xgetlist
let l = Xgetlist()
call assert_equal('Line2', l[0].text)
" Go forward two lists
exe Xnewer
exe 'let l = ' . Xgetlist
let l = Xgetlist()
call assert_equal('Line3', l[0].text)
" Test for the optional count argument
exe Xolder . ' 2'
exe 'let l = ' . Xgetlist
let l = Xgetlist()
call assert_equal('Line1', l[0].text)
exe Xnewer . ' 2'
exe 'let l = ' . Xgetlist
let l = Xgetlist()
call assert_equal('Line3', l[0].text)
endfunction
@@ -187,9 +187,9 @@ function XfileTests(cchar)
let Xgetfile = a:cchar . 'getfile'
let Xaddfile = a:cchar . 'addfile'
if a:cchar == 'c'
let Xgetlist = 'getqflist()'
let Xgetlist = function('getqflist')
else
let Xgetlist = 'getloclist(0)'
let Xgetlist = function('getloclist', [0])
endif
call writefile(['Xtestfile1:700:10:Line 700',
@@ -197,7 +197,7 @@ function XfileTests(cchar)
enew!
exe Xfile . ' Xqftestfile1'
exe 'let l = ' . Xgetlist
let l = Xgetlist()
call assert_true(len(l) == 2 &&
\ l[0].lnum == 700 && l[0].col == 10 && l[0].text ==# 'Line 700' &&
\ l[1].lnum == 800 && l[1].col == 15 && l[1].text ==# 'Line 800')
@@ -210,7 +210,7 @@ function XfileTests(cchar)
call writefile(['Xtestfile3:900:30:Line 900'], 'Xqftestfile1')
exe Xaddfile . ' Xqftestfile1'
exe 'let l = ' . Xgetlist
let l = Xgetlist()
call assert_true(len(l) == 3 &&
\ l[2].lnum == 900 && l[2].col == 30 && l[2].text ==# 'Line 900')
@@ -219,7 +219,7 @@ function XfileTests(cchar)
enew!
exe Xgetfile . ' Xqftestfile1'
exe 'let l = ' . Xgetlist
let l = Xgetlist()
call assert_true(len(l) == 2 &&
\ l[0].lnum == 222 && l[0].col == 77 && l[0].text ==# 'Line 222' &&
\ l[1].lnum == 333 && l[1].col == 88 && l[1].text ==# 'Line 333')
@@ -239,16 +239,16 @@ function XbufferTests(cchar)
let Xgetbuffer = a:cchar . 'getbuffer'
let Xaddbuffer = a:cchar . 'addbuffer'
if a:cchar == 'c'
let Xgetlist = 'getqflist()'
let Xgetlist = function('getqflist')
else
let Xgetlist = 'getloclist(0)'
let Xgetlist = function('getloclist', [0])
endif
enew!
silent! call setline(1, ['Xtestfile7:700:10:Line 700',
\ 'Xtestfile8:800:15:Line 800'])
exe Xbuffer . "!"
exe 'let l = ' . Xgetlist
let l = Xgetlist()
call assert_true(len(l) == 2 &&
\ l[0].lnum == 700 && l[0].col == 10 && l[0].text ==# 'Line 700' &&
\ l[1].lnum == 800 && l[1].col == 15 && l[1].text ==# 'Line 800')
@@ -257,7 +257,7 @@ function XbufferTests(cchar)
silent! call setline(1, ['Xtestfile9:900:55:Line 900',
\ 'Xtestfile10:950:66:Line 950'])
exe Xgetbuffer
exe 'let l = ' . Xgetlist
let l = Xgetlist()
call assert_true(len(l) == 2 &&
\ l[0].lnum == 900 && l[0].col == 55 && l[0].text ==# 'Line 900' &&
\ l[1].lnum == 950 && l[1].col == 66 && l[1].text ==# 'Line 950')
@@ -266,11 +266,12 @@ function XbufferTests(cchar)
silent! call setline(1, ['Xtestfile11:700:20:Line 700',
\ 'Xtestfile12:750:25:Line 750'])
exe Xaddbuffer
exe 'let l = ' . Xgetlist
let l = Xgetlist()
call assert_true(len(l) == 4 &&
\ l[1].lnum == 950 && l[1].col == 66 && l[1].text ==# 'Line 950' &&
\ l[2].lnum == 700 && l[2].col == 20 && l[2].text ==# 'Line 700' &&
\ l[3].lnum == 750 && l[3].col == 25 && l[3].text ==# 'Line 750')
enew!
endfunction
@@ -339,15 +340,15 @@ endfunc
function XqfTitleTests(cchar)
let Xgetexpr = a:cchar . 'getexpr'
if a:cchar == 'c'
let Xgetlist = 'getqflist()'
let Xgetlist = function('getqflist')
else
let Xgetlist = 'getloclist(0)'
let Xgetlist = function('getloclist', [0])
endif
let Xopen = a:cchar . 'open'
let Xclose = a:cchar . 'close'
exe Xgetexpr . " ['file:1:1:message']"
exe 'let l = ' . Xgetlist
let l = Xgetlist()
if a:cchar == 'c'
call setqflist(l, 'r')
else
@@ -638,6 +639,87 @@ function! Test_efm1()
call delete('Xtestfile')
endfunction
" Test for quickfix directory stack support
function! s:dir_stack_tests(cchar)
let Xgetexpr = a:cchar . 'getexpr'
if a:cchar == 'c'
let Xgetlist = function('getqflist')
else
let Xgetlist = function('getloclist', [0])
endif
let save_efm=&efm
set efm=%DEntering\ dir\ '%f',%f:%l:%m,%XLeaving\ dir\ '%f'
let l = "Entering dir 'dir1/a'\n" .
\ 'habits2.txt:1:Nine Healthy Habits' . "\n" .
\ "Entering dir 'b'\n" .
\ 'habits3.txt:2:0 Hours of television' . "\n" .
\ 'habits2.txt:7:5 Small meals' . "\n" .
\ "Entering dir 'dir1/c'\n" .
\ 'habits4.txt:3:1 Hour of exercise' . "\n" .
\ "Leaving dir 'dir1/c'\n" .
\ "Leaving dir 'dir1/a'\n" .
\ 'habits1.txt:4:2 Liters of water' . "\n" .
\ "Entering dir 'dir2'\n" .
\ 'habits5.txt:5:3 Cups of hot green tea' . "\n" .
\ "Leaving dir 'dir2'\n"
exe Xgetexpr . " l"
let qf = Xgetlist()
call assert_equal('dir1/a/habits2.txt', bufname(qf[1].bufnr))
call assert_equal(1, qf[1].lnum)
call assert_equal('dir1/a/b/habits3.txt', bufname(qf[3].bufnr))
call assert_equal(2, qf[3].lnum)
call assert_equal('dir1/a/habits2.txt', bufname(qf[4].bufnr))
call assert_equal(7, qf[4].lnum)
call assert_equal('dir1/c/habits4.txt', bufname(qf[6].bufnr))
call assert_equal(3, qf[6].lnum)
call assert_equal('habits1.txt', bufname(qf[9].bufnr))
call assert_equal(4, qf[9].lnum)
call assert_equal('dir2/habits5.txt', bufname(qf[11].bufnr))
call assert_equal(5, qf[11].lnum)
let &efm=save_efm
endfunction
" Tests for %D and %X errorformat options
function! Test_efm_dirstack()
" Create the directory stack and files
call mkdir('dir1')
call mkdir('dir1/a')
call mkdir('dir1/a/b')
call mkdir('dir1/c')
call mkdir('dir2')
let lines = ["Nine Healthy Habits",
\ "0 Hours of television",
\ "1 Hour of exercise",
\ "2 Liters of water",
\ "3 Cups of hot green tea",
\ "4 Short mental breaks",
\ "5 Small meals",
\ "6 AM wake up time",
\ "7 Minutes of laughter",
\ "8 Hours of sleep (at least)",
\ "9 PM end of the day and off to bed"
\ ]
call writefile(lines, 'habits1.txt')
call writefile(lines, 'dir1/a/habits2.txt')
call writefile(lines, 'dir1/a/b/habits3.txt')
call writefile(lines, 'dir1/c/habits4.txt')
call writefile(lines, 'dir2/habits5.txt')
call s:dir_stack_tests('c')
call s:dir_stack_tests('l')
call delete('dir1', 'rf')
call delete('dir2', 'rf')
call delete('habits1.txt')
endfunction
function XquickfixChangedByAutocmd(cchar)
let Xolder = a:cchar . 'older'
let Xgetexpr = a:cchar . 'getexpr'
src/version.c
+8
View File
@@ -768,6 +768,14 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1938,
/**/
1937,
/**/
1936,
/**/
1935,
/**/
1934,
/**/