1 files changed, 8 insertions, 8 deletions

diff --git a/include/libbb.h b/include/libbb.h
index f990b0ebd..ede44526b 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -583,10 +583,10 @@ extern unsigned long long bb_makedev(unsigned int major, unsigned int minor);
 #endif
 
 
-#if ENABLE_FEATURE_COMMAND_EDITING
+#if ENABLE_FEATURE_EDITING
 /* It's NOT just ENABLEd or disabled. It's a number: */
-#ifdef CONFIG_FEATURE_COMMAND_HISTORY
-#define MAX_HISTORY (CONFIG_FEATURE_COMMAND_HISTORY + 0)
+#ifdef CONFIG_FEATURE_EDITING_HISTORY
+#define MAX_HISTORY (CONFIG_FEATURE_EDITING_HISTORY + 0)
 #else
 #define MAX_HISTORY 0
 #endif
@@ -596,16 +596,16 @@ struct line_input_t {
 #if MAX_HISTORY
         int cnt_history;
         int cur_history;
-        USE_FEATURE_COMMAND_SAVEHISTORY(const char *hist_file;)
+        USE_FEATURE_EDITING_SAVEHISTORY(const char *hist_file;)
         char *history[MAX_HISTORY + 1];
 #endif
 };
 enum {
         DO_HISTORY = 1 * (MAX_HISTORY > 0),
-        SAVE_HISTORY = 2 * (MAX_HISTORY > 0) * ENABLE_FEATURE_COMMAND_SAVEHISTORY,
-        TAB_COMPLETION = 4 * ENABLE_FEATURE_COMMAND_TAB_COMPLETION,
-        USERNAME_COMPLETION = 8 * ENABLE_FEATURE_COMMAND_USERNAME_COMPLETION,
-        VI_MODE = 0x10 * ENABLE_FEATURE_COMMAND_EDITING_VI,
+        SAVE_HISTORY = 2 * (MAX_HISTORY > 0) * ENABLE_FEATURE_EDITING_SAVEHISTORY,
+        TAB_COMPLETION = 4 * ENABLE_FEATURE_TAB_COMPLETION,
+        USERNAME_COMPLETION = 8 * ENABLE_FEATURE_USERNAME_COMPLETION,
+        VI_MODE = 0x10 * ENABLE_FEATURE_EDITING_VI,
         WITH_PATH_LOOKUP = 0x20,
         FOR_SHELL = DO_HISTORY | SAVE_HISTORY | TAB_COMPLETION | USERNAME_COMPLETION,
 };