diff options
Diffstat (limited to 'src/nvim')
| -rw-r--r-- | src/nvim/fileio.c | 4 | ||||
| -rw-r--r-- | src/nvim/lua/executor.c | 3 | ||||
| -rw-r--r-- | src/nvim/mark.c | 3 | ||||
| -rw-r--r-- | src/nvim/regexp.c | 2 | ||||
| -rw-r--r-- | src/nvim/testing.c | 3 | ||||
| -rw-r--r-- | src/nvim/tui/tui.c | 9 |
6 files changed, 15 insertions, 9 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index e89bb41745..b68399e428 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -2973,8 +2973,8 @@ int buf_check_timestamp(buf_T *buf) // checked out of CVS). Always warn when the buffer was // changed. if (reason[2] == 'n') { - mesg = _( - "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as well"); + mesg = + _("W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as well"); mesg2 = _("See \":help W12\" for more info."); } else if (reason[1] == 'h') { mesg = _("W11: Warning: File \"%s\" has changed since editing started"); diff --git a/src/nvim/lua/executor.c b/src/nvim/lua/executor.c index 12304b6f11..c61569eb9a 100644 --- a/src/nvim/lua/executor.c +++ b/src/nvim/lua/executor.c @@ -474,7 +474,8 @@ static int nlua_wait(lua_State *lstate) (int)timeout, got_int || (is_function ? nlua_wait_condition(lstate, &pcall_status, - &callback_result) : false)); + &callback_result) : + false)); // Stop dummy timer time_watcher_stop(tw); diff --git a/src/nvim/mark.c b/src/nvim/mark.c index 532c20b874..356a4326f6 100644 --- a/src/nvim/mark.c +++ b/src/nvim/mark.c @@ -1062,7 +1062,8 @@ void ex_changes(exarg_T *eap) } snprintf(IObuff, IOSIZE, "%c %3d %5" PRIdLINENR " %4d ", i == curwin->w_changelistidx ? '>' : ' ', - i > curwin->w_changelistidx ? i - curwin->w_changelistidx : curwin->w_changelistidx - i, + i > + curwin->w_changelistidx ? i - curwin->w_changelistidx : curwin->w_changelistidx - i, curbuf->b_changelist[i].mark.lnum, curbuf->b_changelist[i].mark.col); msg_outtrans(IObuff, 0); diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index dc7ff30513..db17cfc19b 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -14162,7 +14162,7 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start, regsubs_T *subm #ifdef REGEXP_DEBUG nfa_set_code(skip->c); fprintf(log_fd, - "> Not trying to match pattern, output state %d is already in list %d. char %d: %s\n", // NOLINT(whitespace/line_length) + "> Not trying to match pattern, output state %d is already in list %d. char %d: %s\n", abs(skip->id), skip_lid, skip->c, code); #endif break; diff --git a/src/nvim/testing.c b/src/nvim/testing.c index 4120da745f..f5609a3fb2 100644 --- a/src/nvim/testing.c +++ b/src/nvim/testing.c @@ -42,7 +42,8 @@ typedef enum { #endif static const char e_assert_fails_second_arg[] - = N_("E856: \"assert_fails()\" second argument must be a string or a list with one or two strings"); + = N_( + "E856: \"assert_fails()\" second argument must be a string or a list with one or two strings"); static const char e_assert_fails_fourth_argument[] = N_("E1115: \"assert_fails()\" fourth argument must be a number"); static const char e_assert_fails_fifth_argument[] diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c index 93b891afff..21b820d71e 100644 --- a/src/nvim/tui/tui.c +++ b/src/nvim/tui/tui.c @@ -2226,9 +2226,12 @@ static void augment_terminfo(TUIData *tui, const char *term, int vte_version, in "\x1b[?2004l"); // For urxvt send BOTH xterm and old urxvt sequences. #8695 tui->unibi_ext.enable_focus_reporting = (int)unibi_add_ext_str(ut, "ext.enable_focus", - rxvt ? "\x1b[?1004h\x1b]777;focus;on\x7" : "\x1b[?1004h"); - tui->unibi_ext.disable_focus_reporting = (int)unibi_add_ext_str(ut, "ext.disable_focus", - rxvt ? "\x1b[?1004l\x1b]777;focus;off\x7" : "\x1b[?1004l"); + rxvt ? + "\x1b[?1004h\x1b]777;focus;on\x7" : + "\x1b[?1004h"); + tui->unibi_ext.disable_focus_reporting = + (int)unibi_add_ext_str(ut, "ext.disable_focus", + rxvt ? "\x1b[?1004l\x1b]777;focus;off\x7" : "\x1b[?1004l"); tui->unibi_ext.enable_mouse = (int)unibi_add_ext_str(ut, "ext.enable_mouse", "\x1b[?1002h\x1b[?1006h"); tui->unibi_ext.disable_mouse = (int)unibi_add_ext_str(ut, "ext.disable_mouse", |