diff options
| -rw-r--r-- | src/buffer.c | 10 | ||||
| -rw-r--r-- | src/eval.c | 3 | ||||
| -rw-r--r-- | src/ex_cmds_defs.h | 30 | ||||
| -rw-r--r-- | src/ex_docmd.c | 31 | ||||
| -rw-r--r-- | src/screen.c | 3 | ||||
| -rw-r--r-- | src/version.c | 5 | ||||
| -rw-r--r-- | src/window.c | 6 |
7 files changed, 2 insertions, 86 deletions
diff --git a/src/buffer.c b/src/buffer.c index 93f5fce8aa..e933c8ec24 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -790,8 +790,6 @@ do_bufdel ( return errormsg; } -#if defined(FEAT_LISTCMDS) || defined(FEAT_PYTHON) \ - || defined(FEAT_PYTHON3) || defined(PROTO) static int empty_curbuf(int close_others, int forceit, int action); @@ -1125,7 +1123,7 @@ do_buffer ( return OK; } -#endif + /* * Set current buffer to "buf". Executes autocommands and closes current @@ -1708,8 +1706,6 @@ static buf_T *buflist_findname_stat(char_u *ffname, struct stat *stp) return NULL; } -#if defined(FEAT_LISTCMDS) || defined(FEAT_EVAL) || defined(FEAT_PERL) \ - || defined(PROTO) /* * Find file in buffer list by a regexp pattern. * Return fnum of the found buffer. @@ -1818,7 +1814,6 @@ buflist_findpat ( EMSG2(_("E94: No matching buffer for %s"), pattern); return match; } -#endif /* @@ -4355,9 +4350,6 @@ char_u *buf_spname(buf_T *buf) return NULL; } -#if (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) \ - || defined(FEAT_PYTHON) || defined(FEAT_PYTHON3) \ - || defined(PROTO) /* * Find a window for buffer "buf". * If found OK is returned and "wp" and "tp" are set to the window and tabpage. diff --git a/src/eval.c b/src/eval.c index 32497a5e8f..4f96ea3794 100644 --- a/src/eval.c +++ b/src/eval.c @@ -5268,8 +5268,7 @@ list_equal ( return item1 == NULL && item2 == NULL; } -#if defined(FEAT_RUBY) || defined(FEAT_PYTHON) || defined(FEAT_PYTHON3) \ - || defined(FEAT_MZSCHEME) || defined(FEAT_LUA) || defined(PROTO) +#if defined(PROTO) /* * Return the dictitem that an entry in a hashtable points to. */ diff --git a/src/ex_cmds_defs.h b/src/ex_cmds_defs.h index 0f4b6564f2..a9f19b2e24 100644 --- a/src/ex_cmds_defs.h +++ b/src/ex_cmds_defs.h @@ -567,12 +567,6 @@ enum CMD_index RANGE|NOTADR|COUNT|TRLBAR|BANG), EX(CMD_ltag, "ltag", ex_tag, NOTADR|TRLBAR|BANG|WORD1), - EX(CMD_lua, "lua", ex_lua, - RANGE|EXTRA|NEEDARG|CMDWIN), - EX(CMD_luado, "luado", ex_luado, - RANGE|DFLALL|EXTRA|NEEDARG|CMDWIN), - EX(CMD_luafile, "luafile", ex_luafile, - RANGE|FILE1|NEEDARG|CMDWIN), EX(CMD_lunmap, "lunmap", ex_unmap, EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN), EX(CMD_lvimgrep, "lvimgrep", ex_vimgrep, @@ -685,10 +679,6 @@ enum CMD_index RANGE|WHOLEFOLD|COUNT|EXFLAGS|TRLBAR|CMDWIN|SBOXOK), EX(CMD_pclose, "pclose", ex_pclose, BANG|TRLBAR), - EX(CMD_perl, "perl", ex_perl, - RANGE|EXTRA|DFLALL|NEEDARG|SBOXOK|CMDWIN), - EX(CMD_perldo, "perldo", ex_perldo, - RANGE|EXTRA|DFLALL|NEEDARG|CMDWIN), EX(CMD_pedit, "pedit", ex_pedit, BANG|FILE1|EDITCMD|ARGOPT|TRLBAR), EX(CMD_pop, "pop", ex_tag, @@ -733,20 +723,6 @@ enum CMD_index RANGE|WHOLEFOLD|BANG|REGSTR|TRLBAR|ZEROR|CMDWIN|MODIFY), EX(CMD_pwd, "pwd", ex_pwd, TRLBAR|CMDWIN), - EX(CMD_python, "python", ex_python, - RANGE|EXTRA|NEEDARG|CMDWIN), - EX(CMD_pydo, "pydo", ex_pydo, - RANGE|DFLALL|EXTRA|NEEDARG|CMDWIN), - EX(CMD_pyfile, "pyfile", ex_pyfile, - RANGE|FILE1|NEEDARG|CMDWIN), - EX(CMD_py3, "py3", ex_py3, - RANGE|EXTRA|NEEDARG|CMDWIN), - EX(CMD_py3do, "py3do", ex_py3do, - RANGE|DFLALL|EXTRA|NEEDARG|CMDWIN), - EX(CMD_python3, "python3", ex_py3, - RANGE|EXTRA|NEEDARG|CMDWIN), - EX(CMD_py3file, "py3file", ex_py3file, - RANGE|FILE1|NEEDARG|CMDWIN), EX(CMD_quit, "quit", ex_quit, BANG|TRLBAR|CMDWIN), EX(CMD_quitall, "quitall", ex_quit_all, @@ -781,12 +757,6 @@ enum CMD_index NEEDARG|EXTRA|NOTRLCOM), EX(CMD_runtime, "runtime", ex_runtime, BANG|NEEDARG|FILES|TRLBAR|SBOXOK|CMDWIN), - EX(CMD_ruby, "ruby", ex_ruby, - RANGE|EXTRA|NEEDARG|CMDWIN), - EX(CMD_rubydo, "rubydo", ex_rubydo, - RANGE|DFLALL|EXTRA|NEEDARG|CMDWIN), - EX(CMD_rubyfile, "rubyfile", ex_rubyfile, - RANGE|FILE1|NEEDARG|CMDWIN), EX(CMD_rundo, "rundo", ex_rundo, NEEDARG|FILE1), EX(CMD_rviminfo, "rviminfo", ex_viminfo, diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 605bffd9d9..5f57a11f70 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -117,12 +117,6 @@ static int getargopt(exarg_T *eap); static int check_more(int, int); static linenr_T get_address(char_u **, int skip, int to_other_file); static void get_flags(exarg_T *eap); -#if !defined(FEAT_PERL) \ - || !defined(FEAT_PYTHON) || !defined(FEAT_PYTHON3) \ - || !defined(FEAT_TCL) \ - || !defined(FEAT_RUBY) \ - || !defined(FEAT_LUA) \ - || !defined(FEAT_MZSCHEME) # define HAVE_EX_SCRIPT_NI static void ex_script_ni(exarg_T *eap); #endif @@ -172,25 +166,6 @@ static void ex_nogui(exarg_T *eap); # define gui_mch_find_dialog ex_ni # define gui_mch_replace_dialog ex_ni # define ex_helpfind ex_ni -# define ex_lua ex_script_ni -# define ex_luado ex_ni -# define ex_luafile ex_ni -# define ex_mzscheme ex_script_ni -# define ex_mzfile ex_ni -# define ex_perl ex_script_ni -# define ex_perldo ex_ni -# define ex_python ex_script_ni -# define ex_pydo ex_ni -# define ex_pyfile ex_ni -# define ex_py3 ex_script_ni -# define ex_py3do ex_ni -# define ex_py3file ex_ni -# define ex_tcl ex_script_ni -# define ex_tcldo ex_ni -# define ex_tclfile ex_ni -# define ex_ruby ex_script_ni -# define ex_rubydo ex_ni -# define ex_rubyfile ex_ni static void ex_swapname(exarg_T *eap); static void ex_syncbind(exarg_T *eap); static void ex_read(exarg_T *eap); @@ -2019,17 +1994,11 @@ void *cookie; /*argument for fgetline() */ case CMD_leftabove: case CMD_let: case CMD_lockmarks: - case CMD_lua: case CMD_match: case CMD_mzscheme: - case CMD_perl: case CMD_psearch: - case CMD_python: - case CMD_py3: - case CMD_python3: case CMD_return: case CMD_rightbelow: - case CMD_ruby: case CMD_silent: case CMD_smagic: case CMD_snomagic: diff --git a/src/screen.c b/src/screen.c index bd895cf1d5..cc4e0bb9fe 100644 --- a/src/screen.c +++ b/src/screen.c @@ -419,8 +419,6 @@ redrawWinline ( } } -#if defined(FEAT_RUBY) || defined(FEAT_PERL) || defined(FEAT_VISUAL) || \ - (defined(FEAT_CLIPBOARD) && defined(FEAT_X11)) || defined(PROTO) /* * update all windows that are editing the current buffer */ @@ -429,7 +427,6 @@ void update_curbuf(int type) redraw_curbuf_later(type); update_screen(type); } -#endif /* * update_screen() diff --git a/src/version.c b/src/version.c index 052dfd5e4c..595b5f87a2 100644 --- a/src/version.c +++ b/src/version.c @@ -107,7 +107,6 @@ static char *(features[]) = { "+lispindent", "+listcmds", "+localmap", - "-lua", "+menu", "+mksession", "+modify_fname", @@ -137,17 +136,13 @@ static char *(features[]) = { "+multi_lang", "-mzscheme", "+path_extra", - "-perl", "+persistent_undo", "+postscript", "+printer", "+profile", - "-python", - "-python3", "+quickfix", "+reltime", "+rightleft", - "-ruby", "+scrollbind", "+signs", "+smartindent", diff --git a/src/window.c b/src/window.c index 699114978b..dbf0bf06ac 100644 --- a/src/window.c +++ b/src/window.c @@ -3298,8 +3298,6 @@ void win_goto(win_T *wp) } -#if (defined(FEAT_WINDOWS) && (defined(FEAT_PYTHON) || defined(FEAT_PYTHON3))) \ - || defined(PROTO) /* * Find the tabpage for window "win". */ @@ -3315,7 +3313,6 @@ tabpage_T *win_find_tabpage(win_T *win) return tp; return NULL; } -#endif /* * Move to window above or below "count" times. @@ -5171,8 +5168,6 @@ static win_T *restore_snapshot_rec(frame_T *sn, frame_T *fr) } -#if defined(FEAT_EVAL) || defined(FEAT_PYTHON) || defined(FEAT_PYTHON3) \ - || defined(PROTO) /* * Set "win" to be the curwin and "tp" to be the current tab page. * restore_win() MUST be called to undo. @@ -5257,7 +5252,6 @@ void restore_buffer(buf_T *save_curbuf) ++curbuf->b_nwindows; } } -#endif /* |