- make sure that we see string_insert only if we need it.
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Fri, 9 Jun 2006 07:12:27 +0000 (07:12 -0000)
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Fri, 9 Jun 2006 07:12:27 +0000 (07:12 -0000)
editors/vi.c

index 1e8f383..df37aff 100644 (file)
@@ -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;