diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-01-21 00:17:17 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-01-21 00:17:17 -0500 |
| commit | c3028e435392a7b647f79be826c054ef76b0d577 (patch) | |
| tree | f2d48e5e7c13e9faf67f1ef99317779f23a8df2f /src | |
| parent | 57207ea60e84b5af46f99d388b8e619955f96d09 (diff) | |
| parent | 44b01ca8637f5231a858b5a60d7dd4022a3e45f7 (diff) | |
| download | rneovim-c3028e435392a7b647f79be826c054ef76b0d577.tar.gz rneovim-c3028e435392a7b647f79be826c054ef76b0d577.tar.bz2 rneovim-c3028e435392a7b647f79be826c054ef76b0d577.zip | |
Merge pull request #1656 from fmoralesc/remove-easy-mode
Remove "easy" mode.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/main.c | 21 | ||||
| -rw-r--r-- | src/nvim/os_unix_defs.h | 4 |
2 files changed, 1 insertions, 24 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index 05b9778102..0b0948373a 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -82,7 +82,6 @@ typedef struct { int argc; char **argv; - int evim_mode; /* started as "evim" */ char_u *use_vimrc; /* vimrc from -u argument */ int n_commands; /* no. of commands from + or -c */ @@ -888,9 +887,8 @@ static void init_locale(void) #endif /* - * Check for: [r][e][g][vi|vim|view][diff][ex[im]] + * Check for: [r][g][vi|vim|view][diff][ex[im]] * If the executable name starts with "r" we disable shell commands. - * If the next character is "e" we run in Easy mode. * 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. @@ -913,9 +911,6 @@ static void parse_command_name(mparm_T *parmp) if (parse_char_i(&initstr, 'r')) restricted = TRUE; - if (parse_char_i(&initstr, 'e')) - parmp->evim_mode = TRUE; - /* "gvim" starts the GUI. Also accept "Gvim" for MS-Windows. */ if (parse_char_i(&initstr, 'g')) main_start_gui(); @@ -1113,10 +1108,6 @@ static void command_line_scan(mparm_T *parmp) p_write = FALSE; break; - case 'y': /* "-y" easy mode */ - parmp->evim_mode = TRUE; - break; - case 'N': /* "-N" Nocompatible */ /* No-op */ break; @@ -1896,15 +1887,6 @@ static void source_startup_scripts(mparm_T *parmp) int i; /* - * For "evim" source evim.vim first of all, so that the user can overrule - * any things he doesn't like. - */ - if (parmp->evim_mode) { - (void)do_source((char_u *)EVIM_FILE, FALSE, DOSO_NONE); - TIME_MSG("source evim file"); - } - - /* * If -u argument given, use only the initializations from that file and * nothing else. */ @@ -2155,7 +2137,6 @@ static void usage(void) main_msg(_("-E\t\t\tImproved Ex mode")); main_msg(_("-s\t\t\tSilent (batch) mode (only for \"ex\")")); main_msg(_("-d\t\t\tDiff mode (like \"vimdiff\")")); - main_msg(_("-y\t\t\tEasy mode (like \"evim\", modeless)")); main_msg(_("-R\t\t\tReadonly mode (like \"view\")")); main_msg(_("-Z\t\t\tRestricted mode (like \"rvim\")")); main_msg(_("-m\t\t\tModifications (writing files) not allowed")); diff --git a/src/nvim/os_unix_defs.h b/src/nvim/os_unix_defs.h index adea2ad22f..40230c7944 100644 --- a/src/nvim/os_unix_defs.h +++ b/src/nvim/os_unix_defs.h @@ -153,10 +153,6 @@ #endif -#ifndef EVIM_FILE -# define EVIM_FILE "$VIMRUNTIME/evim.vim" -#endif - # ifndef VIMINFO_FILE # define VIMINFO_FILE "$HOME/.nviminfo" # endif |