1 files changed, 7 insertions, 3 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 13200da0c..6a4b8e273 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -10606,7 +10606,7 @@ evalpipe(union node *n, int flags)
 }
 
 /* setinteractive needs this forward reference */
-#if ENABLE_FEATURE_EDITING
+#if ENABLE_FEATURE_TAB_COMPLETION
 static const char *get_builtin_name(int i) FAST_FUNC;
 #endif
 
@@ -10643,8 +10643,12 @@ setinteractive(int on)
 #if ENABLE_FEATURE_EDITING
                 if (!line_input_state) {
                         line_input_state = new_line_input_t(FOR_SHELL | WITH_PATH_LOOKUP);
+# if ENABLE_FEATURE_TAB_COMPLETION
                         line_input_state->get_exe_name = get_builtin_name;
+# endif
+# if EDITING_HAS_sh_get_var
                         line_input_state->sh_get_var = lookupvar;
+# endif
                 }
 #endif
         }
@@ -10888,7 +10892,7 @@ mklocal(char *name, int flags)
                                 setvareq(name, flags);
                         else
                                 /* "local VAR" unsets VAR: */
-                                setvar0(name, NULL);
+                                unsetvar(name);
                 }
         }
         lvp->vp = vp;
@@ -11157,7 +11161,7 @@ find_builtin(const char *name)
         return bp;
 }
 
-#if ENABLE_FEATURE_EDITING
+#if ENABLE_FEATURE_TAB_COMPLETION
 static const char * FAST_FUNC
 get_builtin_name(int i)
 {