aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <janedmundlazo@hotmail.com>2018-08-29 00:17:30 -0400
committerJan Edmund Lazo <janedmundlazo@hotmail.com>2018-08-29 00:17:30 -0400
commit9fab77c7fb6d50cc5b2438695f73df75d192f11f (patch)
tree70fb8bdc76c2ba25b491365c08704234b6392dbc
parent7c38f60b3babe332de2b61fa829e0ea6ba27fb3a (diff)
downloadrneovim-9fab77c7fb6d50cc5b2438695f73df75d192f11f.tar.gz
rneovim-9fab77c7fb6d50cc5b2438695f73df75d192f11f.tar.bz2
rneovim-9fab77c7fb6d50cc5b2438695f73df75d192f11f.zip
globals: cmd_silent is bool
-rw-r--r--src/nvim/eval.c2
-rw-r--r--src/nvim/ex_cmds2.c2
-rw-r--r--src/nvim/getchar.c6
-rw-r--r--src/nvim/globals.h2
-rw-r--r--src/nvim/message.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index e65a4d489c..d750a47588 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -11235,7 +11235,7 @@ void get_user_input(const typval_T *const argvars,
}
}
- int cmd_silent_save = cmd_silent;
+ const bool cmd_silent_save = cmd_silent;
cmd_silent = false; // Want to see the prompt.
// Only the part of the message after the last NL is considered as
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index f7da5b6c97..f5822535ba 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -123,7 +123,7 @@ void do_debug(char_u *cmd)
int save_msg_scroll = msg_scroll;
int save_State = State;
int save_did_emsg = did_emsg;
- int save_cmd_silent = cmd_silent;
+ const bool save_cmd_silent = cmd_silent;
int save_msg_silent = msg_silent;
int save_emsg_silent = emsg_silent;
int save_redir_off = redir_off;
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 8dae82d137..4b12ceb95c 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -448,7 +448,7 @@ void flush_buffers(int flush_typeahead)
}
typebuf.tb_maplen = 0;
typebuf.tb_silent = 0;
- cmd_silent = FALSE;
+ cmd_silent = false;
typebuf.tb_no_abbr_cnt = 0;
}
@@ -959,7 +959,7 @@ int ins_typebuf(char_u *str, int noremap, int offset, int nottyped, bool silent)
typebuf.tb_maplen += addlen;
if (silent || typebuf.tb_silent > offset) {
typebuf.tb_silent += addlen;
- cmd_silent = TRUE;
+ cmd_silent = true;
}
if (typebuf.tb_no_abbr_cnt && offset == 0) /* and not used for abbrev.s */
typebuf.tb_no_abbr_cnt += addlen;
@@ -1723,7 +1723,7 @@ static int vgetorpeek(int advance)
*typebuf.tb_buf = (char_u)c;
gotchars(typebuf.tb_buf, 1);
}
- cmd_silent = FALSE;
+ cmd_silent = false;
break;
} else if (typebuf.tb_len > 0) {
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index a31f6950e9..3bb18d2b5f 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -751,7 +751,7 @@ EXTERN cmdmod_T cmdmod; /* Ex command modifiers */
EXTERN int msg_silent INIT(= 0); // don't print messages
EXTERN int emsg_silent INIT(= 0); // don't print error messages
EXTERN bool emsg_noredir INIT(= false); // don't redirect error messages
-EXTERN int cmd_silent INIT(= false); // don't echo the command line
+EXTERN bool cmd_silent INIT(= false); // don't echo the command line
/* Values for swap_exists_action: what to do when swap file already exists */
#define SEA_NONE 0 /* don't use dialog */
diff --git a/src/nvim/message.c b/src/nvim/message.c
index 4b0824c90f..e550bf0a37 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -541,7 +541,7 @@ int emsg(const char_u *s_)
// Reset msg_silent, an error causes messages to be switched back on.
msg_silent = 0;
- cmd_silent = FALSE;
+ cmd_silent = false;
if (global_busy) { // break :global command
global_busy++;