aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Schmidt <john.schmidt.h@gmail.com>2014-03-18 17:16:01 +0100
committerThiago de Arruda <tpadilha84@gmail.com>2014-04-05 10:01:22 -0300
commitf226a4c2cdeb9ccac822398fcd242a23be9108be (patch)
treeccfe98bf9bc6a72a635e586367a3290385188f7d
parent84b06b77bdfd26aee3b803e7e851d8601b85d8d8 (diff)
downloadrneovim-f226a4c2cdeb9ccac822398fcd242a23be9108be.tar.gz
rneovim-f226a4c2cdeb9ccac822398fcd242a23be9108be.tar.bz2
rneovim-f226a4c2cdeb9ccac822398fcd242a23be9108be.zip
Remove ole
-rw-r--r--src/eval.c3
-rw-r--r--src/main.c4
-rw-r--r--src/ui.c6
3 files changed, 2 insertions, 11 deletions
diff --git a/src/eval.c b/src/eval.c
index 8c4159fa10..849605ba4a 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -10290,9 +10290,6 @@ static void f_has(typval_T *argvars, typval_T *rettv)
#endif
"multi_byte",
"multi_lang",
-#ifdef FEAT_OLE
- "ole",
-#endif
"path_extra",
"persistent_undo",
"postscript",
diff --git a/src/main.c b/src/main.c
index 0f541557a6..6fd39fee14 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2225,10 +2225,6 @@ static void usage(void)
#if (!defined(UNIX) && !defined(__EMX__)) || defined(ARCHIE)
main_msg(_("--literal\t\tDon't expand wildcards"));
#endif
-#ifdef FEAT_OLE
- main_msg(_("-register\t\tRegister this gvim for OLE"));
- main_msg(_("-unregister\t\tUnregister gvim for OLE"));
-#endif
main_msg(_("-v\t\t\tVi mode (like \"vi\")"));
main_msg(_("-e\t\t\tEx mode (like \"ex\")"));
main_msg(_("-E\t\t\tImproved Ex mode"));
diff --git a/src/ui.c b/src/ui.c
index f81741dd05..d0116add27 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -313,12 +313,10 @@ int vim_is_input_buf_empty(void)
return inbufcount == 0;
}
-#if defined(FEAT_OLE) || defined(PROTO)
-int vim_free_in_input_buf(void)
-{
+#ifdef PROTO
+int vim_free_in_input_buf(void) {
return INBUFLEN - inbufcount;
}
-
#endif