diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-06-17 23:19:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-17 23:19:59 +0200 |
| commit | c1c14faad935c7928779e93ebd6c827ac53ce2db (patch) | |
| tree | 165ff97f2e0f2f0944af1dc37bfec6bdf71794b3 /src | |
| parent | 3cc350696576f26fe1e978ef78125a1a6c7410ab (diff) | |
| parent | 487cf98c0b61ade023fc71d945a64e61f8374eac (diff) | |
| download | rneovim-c1c14faad935c7928779e93ebd6c827ac53ce2db.tar.gz rneovim-c1c14faad935c7928779e93ebd6c827ac53ce2db.tar.bz2 rneovim-c1c14faad935c7928779e93ebd6c827ac53ce2db.zip | |
Merge #8520 'Ex mode: always "improved" (gQ)'
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_docmd.c | 18 | ||||
| -rw-r--r-- | src/nvim/main.c | 10 |
2 files changed, 10 insertions, 18 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 9590a3715e..2f41080a41 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -188,15 +188,8 @@ static void restore_dbg_stuff(struct dbg_stuff *dsp) current_exception = dsp->current_exception; } - -/* - * do_exmode(): Repeatedly get commands for the "Ex" mode, until the ":vi" - * command is given. - */ -void -do_exmode ( - int improved /* TRUE for "improved Ex" mode */ -) +/// Repeatedly get commands for Ex mode, until the ":vi" command is given. +void do_exmode(int improved) { int save_msg_scroll; int prev_msg_row; @@ -232,11 +225,8 @@ do_exmode ( changedtick = curbuf->b_changedtick; prev_msg_row = msg_row; prev_line = curwin->w_cursor.lnum; - if (improved) { - cmdline_row = msg_row; - do_cmdline(NULL, getexline, NULL, 0); - } else - do_cmdline(NULL, getexmodeline, NULL, DOCMD_NOWAIT); + cmdline_row = msg_row; + do_cmdline(NULL, getexline, NULL, 0); lines_left = Rows - 1; if ((prev_line != curwin->w_cursor.lnum diff --git a/src/nvim/main.c b/src/nvim/main.c index 8d98f9e915..ea43b93b30 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -301,9 +301,11 @@ int main(int argc, char **argv) // Read ex-commands if invoked with "-es". // bool reading_tty = !headless_mode + && !silent_mode && (params.input_isatty || params.output_isatty || params.err_isatty); - bool reading_excmds = !params.input_isatty && silent_mode + bool reading_excmds = !params.input_isatty + && silent_mode && exmode_active == EXMODE_NORMAL; if (reading_tty || reading_excmds) { // One of the startup commands (arguments, sourced scripts or plugins) may @@ -872,7 +874,7 @@ static void command_line_scan(mparm_T *parmp) exmode_active = EXMODE_NORMAL; break; } - case 'E': { // "-E" Improved Ex mode + case 'E': { // "-E" Ex mode exmode_active = EXMODE_VIM; break; } @@ -1896,8 +1898,8 @@ static void usage(void) mch_msg("\n"); mch_msg(_(" -b Binary mode\n")); mch_msg(_(" -d Diff mode\n")); - mch_msg(_(" -e, -E Ex mode, Improved Ex mode\n")); - mch_msg(_(" -es Silent (batch) mode\n")); + mch_msg(_(" -e, -E Ex mode\n")); + mch_msg(_(" -es, -Es Silent (batch) mode\n")); mch_msg(_(" -h, --help Print this help message\n")); mch_msg(_(" -i <shada> Use this shada file\n")); mch_msg(_(" -m Modifications (writing files) not allowed\n")); |