Merge branch 'busybox' into merge

1 files changed, 3 insertions, 4 deletions

diff --git a/shell/ash.c b/shell/ash.c
index b34ed67a7..28c7fe2db 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -10611,7 +10611,7 @@ evalpipe(union node *n, int flags)
 }
 
 /* setinteractive needs this forward reference */
-#if EDITING_HAS_get_exe_name
+#if ENABLE_FEATURE_EDITING
 static const char *get_builtin_name(int i) FAST_FUNC;
 #endif
 
@@ -10648,9 +10648,8 @@ setinteractive(int on)
 #if ENABLE_FEATURE_EDITING
                 if (!line_input_state) {
                         line_input_state = new_line_input_t(FOR_SHELL | WITH_PATH_LOOKUP);
-# if EDITING_HAS_get_exe_name
                         line_input_state->get_exe_name = get_builtin_name;
-# endif
+                        line_input_state->sh_get_var = lookupvar;
                 }
 #endif
         }
@@ -11157,7 +11156,7 @@ find_builtin(const char *name)
         return bp;
 }
 
-#if EDITING_HAS_get_exe_name
+#if ENABLE_FEATURE_EDITING
 static const char * FAST_FUNC
 get_builtin_name(int i)
 {