diff options
| author | aldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-06-09 07:12:27 +0000 |
|---|---|---|
| committer | aldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-06-09 07:12:27 +0000 |
| commit | 75bf8b0f243110227b6552aff250d6517780421c (patch) | |
| tree | 624901aad97d153f82074108b34d8c58376e8683 | |
| parent | 08ad5044acb38645e409f77daace450c001cd1c8 (diff) | |
| download | busybox-w32-75bf8b0f243110227b6552aff250d6517780421c.tar.gz busybox-w32-75bf8b0f243110227b6552aff250d6517780421c.tar.bz2 busybox-w32-75bf8b0f243110227b6552aff250d6517780421c.zip | |
- make sure that we see string_insert only if we need it.
git-svn-id: svn://busybox.net/trunk/busybox@15346 69ca8d6d-28ef-0310-b511-8ec308f3f277
| -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 1e8f3835d..df37affac 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 | |||
| 302 | #ifdef CONFIG_FEATURE_VI_SETOPTS | 302 | #ifdef CONFIG_FEATURE_VI_SETOPTS |
| 303 | static void showmatching(Byte *); // show the matching pair () [] {} | 303 | static void showmatching(Byte *); // show the matching pair () [] {} |
| 304 | #endif /* CONFIG_FEATURE_VI_SETOPTS */ | 304 | #endif /* CONFIG_FEATURE_VI_SETOPTS */ |
| 305 | #if defined(CONFIG_FEATURE_VI_YANKMARK) || defined(CONFIG_FEATURE_VI_SEARCH) || defined(CONFIG_FEATURE_VI_CRASHME) | 305 | #if defined(CONFIG_FEATURE_VI_YANKMARK) || (defined(CONFIG_FEATURE_VI_COLON) && defined(CONFIG_FEATURE_VI_SEARCH)) || defined(CONFIG_FEATURE_VI_CRASHME) |
| 306 | static Byte *string_insert(Byte *, Byte *); // insert the string at 'p' | 306 | static Byte *string_insert(Byte *, Byte *); // insert the string at 'p' |
| 307 | #endif /* CONFIG_FEATURE_VI_YANKMARK || CONFIG_FEATURE_VI_SEARCH || CONFIG_FEATURE_VI_CRASHME */ | 307 | #endif /* CONFIG_FEATURE_VI_YANKMARK || CONFIG_FEATURE_VI_SEARCH || CONFIG_FEATURE_VI_CRASHME */ |
| 308 | #ifdef CONFIG_FEATURE_VI_YANKMARK | 308 | #ifdef CONFIG_FEATURE_VI_YANKMARK |
| @@ -2008,7 +2008,7 @@ static void end_cmd_q(void) | |||
| 2008 | } | 2008 | } |
| 2009 | #endif /* CONFIG_FEATURE_VI_DOT_CMD */ | 2009 | #endif /* CONFIG_FEATURE_VI_DOT_CMD */ |
| 2010 | 2010 | ||
| 2011 | #if defined(CONFIG_FEATURE_VI_YANKMARK) || defined(CONFIG_FEATURE_VI_SEARCH) || defined(CONFIG_FEATURE_VI_CRASHME) | 2011 | #if defined(CONFIG_FEATURE_VI_YANKMARK) || (defined(CONFIG_FEATURE_VI_COLON) && defined(CONFIG_FEATURE_VI_SEARCH)) || defined(CONFIG_FEATURE_VI_CRASHME) |
| 2012 | static Byte *string_insert(Byte * p, Byte * s) // insert the string at 'p' | 2012 | static Byte *string_insert(Byte * p, Byte * s) // insert the string at 'p' |
| 2013 | { | 2013 | { |
| 2014 | int cnt, i; | 2014 | int cnt, i; |