aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-05-26 17:18:52 +0200
committerJustin M. Keyes <justinkz@gmail.com>2018-06-04 02:09:27 +0200
commit787ae1b38bb388e2ee236e89091e87932fd0efb3 (patch)
tree33353254c3ab6445f0b224ee9fdaabb3566940d7
parentd00ef758c3a644759064565cdc7fc219ece0df3a (diff)
downloadrneovim-787ae1b38bb388e2ee236e89091e87932fd0efb3.tar.gz
rneovim-787ae1b38bb388e2ee236e89091e87932fd0efb3.tar.bz2
rneovim-787ae1b38bb388e2ee236e89091e87932fd0efb3.zip
startup: silent-mode is not `full_screen`
silent-mode (AKA batch-mode, -es/-Es) by definition should not behave like a UI. There are still some places that check `full_screen` to decide behavior, e.g. msg_start(). Future: maybe eliminate `full_screen`, check `ui_active()` instead?
-rw-r--r--src/nvim/main.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c
index c2cd87bb39..f4b21d712c 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -97,7 +97,6 @@ typedef struct {
char_u *tagname; // tag from -t argument
char_u *use_ef; // 'errorfile' from -q argument
- int want_full_screen;
bool input_isatty; // stdin is a terminal
bool output_isatty; // stdout is a terminal
bool err_isatty; // stderr is a terminal
@@ -271,15 +270,9 @@ int main(int argc, char **argv)
/* Don't redraw until much later. */
++RedrawingDisabled;
- /*
- * When listing swap file names, don't do cursor positioning et. al.
- */
- if (recoverymode && fname == NULL)
- params.want_full_screen = FALSE;
-
setbuf(stdout, NULL);
- full_screen = true;
+ full_screen = !silent_mode;
// Set the default values for the options that use Rows and Columns.
win_init_size();
@@ -1247,7 +1240,6 @@ static void init_params(mparm_T *paramp, int argc, char **argv)
memset(paramp, 0, sizeof(*paramp));
paramp->argc = argc;
paramp->argv = argv;
- paramp->want_full_screen = true;
paramp->use_debug_break_level = -1;
paramp->window_count = -1;
paramp->listen_addr = NULL;