diff options
| author | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-11-01 23:11:09 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-11-01 23:19:25 -0400 |
| commit | 44c111e49f4c7c015bf66855fd6f2f69f1e02c07 (patch) | |
| tree | b8426fc57530a42fc38441cad72344e6b86a0785 /src | |
| parent | c45a859171090746c8b81f183474c22e489b8ad0 (diff) | |
| download | rneovim-44c111e49f4c7c015bf66855fd6f2f69f1e02c07.tar.gz rneovim-44c111e49f4c7c015bf66855fd6f2f69f1e02c07.tar.bz2 rneovim-44c111e49f4c7c015bf66855fd6f2f69f1e02c07.zip | |
vim-patch:8.0.1758: open_line() returns TRUE/FALSE for success/failure
Problem: open_line() returns TRUE/FALSE for success/failure.
Solution: Return OK or FAIL.
https://github.com/vim/vim/commit/24a2d7264fc2394f69a9a890b34d1f09cf63b14e
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/edit.c | 6 | ||||
| -rw-r--r-- | src/nvim/misc1.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index f7ce0afd36..2e2611692c 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -1096,7 +1096,7 @@ static int insert_handle_key(InsertState *s) cmdwin_result = CAR; return 0; } - if (ins_eol(s->c) && !p_im) { + if (!ins_eol(s->c) && !p_im) { return 0; // out of memory } auto_format(false, false); @@ -8356,7 +8356,7 @@ static bool ins_tab(void) /// Handle CR or NL in insert mode. /// -/// @return true when it can't undo. +/// @return false when it can't undo. static bool ins_eol(int c) { if (echeck_abbr(c + ABBR_OFF)) { @@ -8405,7 +8405,7 @@ static bool ins_eol(int c) // When inserting a line the cursor line must never be in a closed fold. foldOpenCursor(); - return !i; + return i; } /* diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c index 7e9d68a4b4..4032210213 100644 --- a/src/nvim/misc1.c +++ b/src/nvim/misc1.c @@ -98,7 +98,7 @@ open_line ( colnr_T newcol = 0; // new cursor column int newindent = 0; // auto-indent of the new line bool trunc_line = false; // truncate current line afterwards - bool retval = false; // return value, default is false + bool retval = false; // return value int extra_len = 0; // length of p_extra string int lead_len; // length of comment leader char_u *lead_flags; // position in 'comments' for comment leader @@ -922,7 +922,7 @@ open_line ( next_line = NULL; } - retval = TRUE; /* success! */ + retval = true; // success! theend: curbuf->b_p_pi = saved_pi; xfree(saved_line); |