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 pull request #9011 from janlazo/vim-8.0.1428

Browse Source 
vim-patch:8.0.{1428,1443}
This commit is contained in:
Justin M. Keyes 2018-09-18 07:21:24 +02:00 committed by GitHub
commit 0a4d7ce669
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/ex_getln.c
View File

@ -1787,7 +1787,7 @@ static int command_line_not_changed(CommandLineState *s)
/// as a trailing \|, which can happen while typing a pattern. /// as a trailing \|, which can happen while typing a pattern.
static int empty_pattern(char_u *p) static int empty_pattern(char_u *p)
{ {
int n = STRLEN(p); size_t n = STRLEN(p);
// remove trailing \v and the like // remove trailing \v and the like
while (n >= 2 && p[n - 2] == '\\' while (n >= 2 && p[n - 2] == '\\'

5
src/nvim/undo.c
View File

@ -1901,7 +1901,8 @@ void undo_time(long step, bool sec, bool file, bool absolute)
// When "target" is 0; Back to origin. // When "target" is 0; Back to origin.
if (target == 0) { if (target == 0) {
goto found; mark = lastmark; // avoid that GCC complains
goto target_zero;
} }
/* /*
@ -2020,7 +2021,7 @@ void undo_time(long step, bool sec, bool file, bool absolute)
} }
} }
found: target_zero:
// If we found it: Follow the path to go to where we want to be. // If we found it: Follow the path to go to where we want to be.
if (uhp != NULL || target == 0) { if (uhp != NULL || target == 0) {
// First go up the tree as much as needed. // First go up the tree as much as needed.