diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/fileio.c | 2 | ||||
| -rw-r--r-- | src/nvim/main.c | 13 | ||||
| -rw-r--r-- | src/nvim/version.c | 1 |
3 files changed, 5 insertions, 11 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 863e44ed9c..2667d13b78 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -6828,7 +6828,7 @@ void unblock_autocmds(void) /* When v:termresponse was set while autocommands were blocked, trigger * the autocommands now. Esp. useful when executing a shell command - * during startup (vimdiff). */ + * during startup (nvim -d). */ if (autocmd_blocked == 0 && get_vim_var_str(VV_TERMRESPONSE) != old_termresponse) apply_autocmds(EVENT_TERMRESPONSE, NULL, NULL, FALSE, curbuf); diff --git a/src/nvim/main.c b/src/nvim/main.c index ba27606bab..6e24806c56 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -204,7 +204,7 @@ int main(int argc, char **argv) /* * Figure out the way to work from the command name argv[0]. - * "vimdiff" starts diff mode, "rvim" sets "restricted", etc. + * "view" sets "readonlymode", "rvim" sets "restricted", etc. */ parse_command_name(¶ms); @@ -454,7 +454,7 @@ int main(int argc, char **argv) edit_buffers(¶ms); if (params.diff_mode) { - /* set options in each window for "vimdiff". */ + /* set options in each window for "nvim -d". */ FOR_ALL_WINDOWS_IN_TAB(wp, curtab) { diff_win_options(wp, TRUE); } @@ -867,11 +867,10 @@ static void init_locale(void) #endif /* - * Check for: [r][g][vi|vim|view][diff][ex[im]] + * Check for: [r][g][vi|vim|view][ex[im]] * If the executable name starts with "r" we disable shell commands. * If the next character is "g" we run the GUI version. * If the next characters are "view" we start in readonly mode. - * If the next characters are "diff" or "vimdiff" we start in diff mode. * If the next characters are "ex" we start in Ex mode. If it's followed * by "im" use improved Ex mode. */ @@ -902,10 +901,6 @@ static void parse_command_name(mparm_T *parmp) parse_string(&initstr, "vim", 3); /* consume "vim" if it's there */ } - /* Catch "[r][g]vimdiff" and "[r][g]viewdiff". */ - if (parse_string(&initstr, "diff", 4)) - parmp->diff_mode = TRUE; - if (parse_string(&initstr, "ex", 2)) { if (parse_string(&initstr, "im", 2)) exmode_active = EXMODE_VIM; @@ -2076,7 +2071,7 @@ static void usage(void) mch_msg(_(" -e Ex mode (like \"ex\")\n")); mch_msg(_(" -E Improved Ex mode\n")); mch_msg(_(" -s Silent (batch) mode (only for \"ex\")\n")); - mch_msg(_(" -d Diff mode (like \"vimdiff\")\n")); + mch_msg(_(" -d Diff mode\n")); mch_msg(_(" -R Readonly mode (like \"view\")\n")); mch_msg(_(" -Z Restricted mode (like \"rvim\")\n")); mch_msg(_(" -m Modifications (writing files) not allowed\n")); diff --git a/src/nvim/version.c b/src/nvim/version.c index 892382ab65..8a5a3dc07d 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -59,7 +59,6 @@ static char *(features[]) = { "+cursorbind", "+cursorshape", "+dialog_con", - "+diff", "+digraphs", "-dnd", "-ebcdic", |