aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2017-12-12 00:52:14 +0300
committerZyX <kp-pav@yandex.ru>2017-12-12 00:52:14 +0300
commit45998deb5d325c7a44ce38b0c7d954919458f105 (patch)
treea51542280385c7018982e8f610ccc7c7c2f74f0c /src
parent1f9dd689b9f2b68edbc40cc3c60d46db853dda94 (diff)
downloadrneovim-45998deb5d325c7a44ce38b0c7d954919458f105.tar.gz
rneovim-45998deb5d325c7a44ce38b0c7d954919458f105.tar.bz2
rneovim-45998deb5d325c7a44ce38b0c7d954919458f105.zip
*: Fix linter errors
Diffstat (limited to 'src')
-rw-r--r--src/nvim/api/vim.c4
-rw-r--r--src/nvim/eval.c8
-rw-r--r--src/nvim/tui/tui.c34
3 files changed, 23 insertions, 23 deletions
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index f0db391abe..c0daac8085 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -900,9 +900,9 @@ typedef struct {
Object *ret_node_p;
} ExprASTConvStackItem;
-///@cond DOXYGEN_NOT_A_FUNCTION
+/// @cond DOXYGEN_NOT_A_FUNCTION
typedef kvec_withinit_t(ExprASTConvStackItem, 16) ExprASTConvStack;
-///@endcond
+/// @endcond
/// Parse a VimL expression
///
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 357ca52a3d..2d8c22cc7a 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -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)
{
- 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 (!tv_check_lock(tv_list_locked((l = argvars[0].vval.v_list)),
- N_("add() argument"),
- TV_TRANSLATE)) {
+ list_T *const l = argvars[0].vval.v_list;
+ if (!tv_check_lock(tv_list_locked(l), N_("add() argument"), TV_TRANSLATE)) {
tv_list_append_tv(l, &argvars[1]);
tv_copy(&argvars[0], rettv);
}
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index 9ff1acf64a..60897c08da 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -1515,22 +1515,24 @@ static void patch_terminfo_bugs(TUIData *data, const char *term,
// DECSCUSR (cursor shape) sequence is widely supported by several terminal
// types. https://github.com/gnachman/iTerm2/pull/92
// xterm extension: vertical bar
- if (!konsole && ((xterm && !vte_version) // anything claiming xterm compat
- // per MinTTY 0.4.3-1 release notes from 2009
- || putty
- // per https://bugzilla.gnome.org/show_bug.cgi?id=720821
- || (vte_version >= 3900)
- || tmux // per tmux manual page
- // https://lists.gnu.org/archive/html/screen-devel/2013-03/msg00000.html
- || screen
- || st // #7641
- || rxvt // per command.C
- // per analysis of VT100Terminal.m
- || iterm || iterm_pretending_xterm
- || teraterm // per TeraTerm "Supported Control Functions" doco
- // Some linux-type terminals (such as console-terminal-emulator
- // from the nosh toolset) implement the xterm extension.
- || (linuxvt && (xterm_version || (vte_version > 0) || colorterm)))) {
+ if (!konsole
+ && ((xterm && !vte_version) // anything claiming xterm compat
+ // per MinTTY 0.4.3-1 release notes from 2009
+ || putty
+ // per https://bugzilla.gnome.org/show_bug.cgi?id=720821
+ || (vte_version >= 3900)
+ || tmux // per tmux manual page
+ // https://lists.gnu.org/archive/html/screen-devel/2013-03/msg00000.html
+ || screen
+ || st // #7641
+ || rxvt // per command.C
+ // per analysis of VT100Terminal.m
+ || iterm || iterm_pretending_xterm
+ || teraterm // per TeraTerm "Supported Control Functions" doco
+ // Some linux-type terminals implement the xterm extension.
+ // Example: console-terminal-emulator from the nosh toolset.
+ || (linuxvt
+ && (xterm_version || (vte_version > 0) || colorterm)))) {
data->unibi_ext.set_cursor_style =
(int)unibi_add_ext_str(ut, "Ss", "\x1b[%p1%d q");
if (-1 == data->unibi_ext.reset_cursor_style) {