diff options
| author | Bernhard Reutner-Fischer | 2006-06-09 07:12:27 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer | 2006-06-09 07:12:27 +0000 |
| commit | 1e23b6fdb50bcc86bcf0be9a49e616762939b21a (patch) | |
| tree | 624901aad97d153f82074108b34d8c58376e8683 /editors | |
| parent | 7ba12c695785aafced6dade9b45de74bea514b56 (diff) | |
| download | busybox-1e23b6fdb50bcc86bcf0be9a49e616762939b21a.zip busybox-1e23b6fdb50bcc86bcf0be9a49e616762939b21a.tar.gz | |
- make sure that we see string_insert only if we need it.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/vi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editors/vi.c b/editors/vi.c index 1e8f383..df37aff 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -302,7 +302,7 @@ static void window_size_get(int); // find out what size the window is #ifdef CONFIG_FEATURE_VI_SETOPTS static void showmatching(Byte *); // show the matching pair () [] {} #endif /* CONFIG_FEATURE_VI_SETOPTS */ -#if defined(CONFIG_FEATURE_VI_YANKMARK) || defined(CONFIG_FEATURE_VI_SEARCH) || defined(CONFIG_FEATURE_VI_CRASHME) +#if defined(CONFIG_FEATURE_VI_YANKMARK) || (defined(CONFIG_FEATURE_VI_COLON) && defined(CONFIG_FEATURE_VI_SEARCH)) || defined(CONFIG_FEATURE_VI_CRASHME) static Byte *string_insert(Byte *, Byte *); // insert the string at 'p' #endif /* CONFIG_FEATURE_VI_YANKMARK || CONFIG_FEATURE_VI_SEARCH || CONFIG_FEATURE_VI_CRASHME */ #ifdef CONFIG_FEATURE_VI_YANKMARK @@ -2008,7 +2008,7 @@ static void end_cmd_q(void) } #endif /* CONFIG_FEATURE_VI_DOT_CMD */ -#if defined(CONFIG_FEATURE_VI_YANKMARK) || defined(CONFIG_FEATURE_VI_SEARCH) || defined(CONFIG_FEATURE_VI_CRASHME) +#if defined(CONFIG_FEATURE_VI_YANKMARK) || (defined(CONFIG_FEATURE_VI_COLON) && defined(CONFIG_FEATURE_VI_SEARCH)) || defined(CONFIG_FEATURE_VI_CRASHME) static Byte *string_insert(Byte * p, Byte * s) // insert the string at 'p' { int cnt, i; |