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

*: Fix linter errors

Browse Source
This commit is contained in:
ZyX 2017-12-12 00:52:14 +03:00
parent 1f9dd689b9
commit 45998deb5d
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/api/vim.c
View File

@ -900,9 +900,9 @@ typedef struct {
Object *ret_node_p; Object *ret_node_p;
} ExprASTConvStackItem; } ExprASTConvStackItem;
///@cond DOXYGEN_NOT_A_FUNCTION /// @cond DOXYGEN_NOT_A_FUNCTION
typedef kvec_withinit_t(ExprASTConvStackItem, 16) ExprASTConvStack; typedef kvec_withinit_t(ExprASTConvStackItem, 16) ExprASTConvStack;
///@endcond /// @endcond
/// Parse a VimL expression /// Parse a VimL expression
/// ///

8
src/nvim/eval.c
View File

@ -6543,12 +6543,10 @@ static void f_abs(typval_T *argvars, typval_T *rettv, FunPtr fptr)
*/ */
static void f_add(typval_T *argvars, typval_T *rettv, FunPtr fptr) static void f_add(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{ {
list_T *l; rettv->vval.v_number = 1; // Default: failed.
rettv->vval.v_number = 1; /* Default: Failed */
if (argvars[0].v_type == VAR_LIST) { if (argvars[0].v_type == VAR_LIST) {
if (!tv_check_lock(tv_list_locked((l = argvars[0].vval.v_list)), list_T *const l = argvars[0].vval.v_list;
N_("add() argument"), if (!tv_check_lock(tv_list_locked(l), N_("add() argument"), TV_TRANSLATE)) {
TV_TRANSLATE)) {
tv_list_append_tv(l, &argvars[1]); tv_list_append_tv(l, &argvars[1]);
tv_copy(&argvars[0], rettv); tv_copy(&argvars[0], rettv);
} }

34
src/nvim/tui/tui.c
View File

@ -1515,22 +1515,24 @@ static void patch_terminfo_bugs(TUIData *data, const char *term,
// DECSCUSR (cursor shape) sequence is widely supported by several terminal // DECSCUSR (cursor shape) sequence is widely supported by several terminal
// types. https://github.com/gnachman/iTerm2/pull/92 // types. https://github.com/gnachman/iTerm2/pull/92
// xterm extension: vertical bar // xterm extension: vertical bar
if (!konsole && ((xterm && !vte_version) // anything claiming xterm compat if (!konsole
// per MinTTY 0.4.3-1 release notes from 2009 && ((xterm && !vte_version) // anything claiming xterm compat
|| putty // per MinTTY 0.4.3-1 release notes from 2009
// per https://bugzilla.gnome.org/show_bug.cgi?id=720821 || putty
|| (vte_version >= 3900) // per https://bugzilla.gnome.org/show_bug.cgi?id=720821
|| tmux // per tmux manual page || (vte_version >= 3900)
// https://lists.gnu.org/archive/html/screen-devel/2013-03/msg00000.html || tmux // per tmux manual page
|| screen // https://lists.gnu.org/archive/html/screen-devel/2013-03/msg00000.html
|| st // #7641 || screen
|| rxvt // per command.C || st // #7641
// per analysis of VT100Terminal.m || rxvt // per command.C
|| iterm || iterm_pretending_xterm // per analysis of VT100Terminal.m
|| teraterm // per TeraTerm "Supported Control Functions" doco || iterm || iterm_pretending_xterm
// Some linux-type terminals (such as console-terminal-emulator || teraterm // per TeraTerm "Supported Control Functions" doco
// from the nosh toolset) implement the xterm extension. // Some linux-type terminals implement the xterm extension.
|| (linuxvt && (xterm_version || (vte_version > 0) || colorterm)))) { // Example: console-terminal-emulator from the nosh toolset.
|| (linuxvt
&& (xterm_version || (vte_version > 0) || colorterm)))) {
data->unibi_ext.set_cursor_style = data->unibi_ext.set_cursor_style =
(int)unibi_add_ext_str(ut, "Ss", "\x1b[%p1%d q"); (int)unibi_add_ext_str(ut, "Ss", "\x1b[%p1%d q");
if (-1 == data->unibi_ext.reset_cursor_style) { if (-1 == data->unibi_ext.reset_cursor_style) {