From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Fri, 9 Jun 2006 07:12:27 +0000 (-0000)
Subject: - make sure that we see string_insert only if we need it.
X-Git-Tag: 1_2_0~175
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1e23b6fdb50bcc86bcf0be9a49e616762939b21a;p=oweals%2Fbusybox.git

- make sure that we see string_insert only if we need it.
---

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
 #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;