IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #8498 from janlazo/vim-8.0.0523

Browse Source
This commit is contained in:
Justin M. Keyes 2018-06-08 08:15:37 +02:00 committed by GitHub
commit c500f22f3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 59 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/nvim/search.c
View File

@ -2123,7 +2123,7 @@ static int check_linecomment(char_u *line)
*/ */
void void
showmatch( showmatch(
int c /* char to show match for */ int c // char to show match for
) )
{ {
pos_T *lpos, save_cursor; pos_T *lpos, save_cursor;
@ -2377,8 +2377,14 @@ findpar (
++curr; ++curr;
curwin->w_cursor.lnum = curr; curwin->w_cursor.lnum = curr;
if (curr == curbuf->b_ml.ml_line_count && what != '}') { if (curr == curbuf->b_ml.ml_line_count && what != '}') {
if ((curwin->w_cursor.col = (colnr_T)STRLEN(ml_get(curr))) != 0) { char_u *line = ml_get(curr);
--curwin->w_cursor.col;
// Put the cursor on the last character in the last line and make the
// motion inclusive.
if ((curwin->w_cursor.col = (colnr_T)STRLEN(line)) != 0) {
curwin->w_cursor.col--;
curwin->w_cursor.col -=
(*mb_head_off)(line, line + curwin->w_cursor.col);
*pincl = true; *pincl = true;
} }
} else } else
@ -4118,17 +4124,17 @@ int linewhite(linenr_T lnum)
*/ */
void void
find_pattern_in_path( find_pattern_in_path(
char_u *ptr, /* pointer to search pattern */ char_u *ptr, // pointer to search pattern
int dir, /* direction of expansion */ int dir, // direction of expansion
size_t len, /* length of search pattern */ size_t len, // length of search pattern
int whole, /* match whole words only */ int whole, // match whole words only
int skip_comments, /* don't match inside comments */ int skip_comments, // don't match inside comments
int type, /* Type of search; are we looking for a type? int type, // Type of search; are we looking for a type?
a macro? */ // a macro?
long count, long count,
int action, /* What to do when we find it */ int action, // What to do when we find it
linenr_T start_lnum, /* first line to start searching */ linenr_T start_lnum, // first line to start searching
linenr_T end_lnum /* last line for searching */ linenr_T end_lnum // last line for searching
) )
{ {
SearchedFile *files; /* Stack of included files */ SearchedFile *files; /* Stack of included files */

12
src/nvim/testdir/test_normal.vim
View File

@ -2387,3 +2387,15 @@ func Test_changelist()
%bwipe! %bwipe!
let &ul = save_ul let &ul = save_ul
endfunc endfunc
func Test_delete_until_paragraph()
if !has('multi_byte')
return
endif
new
normal grádv}
call assert_equal('á', getline(1))
normal grád}
call assert_equal('', getline(1))
bwipe!
endfunc