mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-16 00:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove vimdiff

Browse Source 
While we're here:
- Remove references to the '+diff' feature, which has since been made
  non-optional.
- Update a few Vim instances with Nvim.
This commit is contained in:
Michael Reed
2015-01-19 19:37:13 -05:00
parent 054aabbe06
commit 7b98b4c442
31 changed files with 47 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nvim/main.c
View File

@@ -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(&params);
@@ -454,7 +454,7 @@ int main(int argc, char **argv)
edit_buffers(&params);
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"));