diff options
author | Paul Fox <pgf@brightstareng.com> | 2005-10-09 14:26:26 +0000 |
---|---|---|
committer | Paul Fox <pgf@brightstareng.com> | 2005-10-09 14:26:26 +0000 |
commit | 90372ed51a4a396715dfefef4c3716e6b2ceca11 (patch) | |
tree | ea936cbf2485760934dde5f8828aad9b0c620b50 | |
parent | ae907f38f0b35867795befa04640f7346c6be522 (diff) | |
download | busybox-w32-90372ed51a4a396715dfefef4c3716e6b2ceca11.tar.gz busybox-w32-90372ed51a4a396715dfefef4c3716e6b2ceca11.tar.bz2 busybox-w32-90372ed51a4a396715dfefef4c3716e6b2ceca11.zip |
make Hit_Return() available when CONFIG_FEATURE_VI_COLON is off. it's
needed elsewhere as well now.
-rw-r--r-- | editors/vi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/editors/vi.c b/editors/vi.c index 76e4d6684..cc2332543 100644 --- a/editors/vi.c +++ b/editors/vi.c | |||
@@ -284,12 +284,13 @@ static void refresh(int); // update the terminal from screen[] | |||
284 | static void Indicate_Error(void); // use flash or beep to indicate error | 284 | static void Indicate_Error(void); // use flash or beep to indicate error |
285 | #define indicate_error(c) Indicate_Error() | 285 | #define indicate_error(c) Indicate_Error() |
286 | 286 | ||
287 | static void Hit_Return(void); | ||
288 | |||
287 | #ifdef CONFIG_FEATURE_VI_SEARCH | 289 | #ifdef CONFIG_FEATURE_VI_SEARCH |
288 | static Byte *char_search(Byte *, Byte *, int, int); // search for pattern starting at p | 290 | static Byte *char_search(Byte *, Byte *, int, int); // search for pattern starting at p |
289 | static int mycmp(Byte *, Byte *, int); // string cmp based in "ignorecase" | 291 | static int mycmp(Byte *, Byte *, int); // string cmp based in "ignorecase" |
290 | #endif /* CONFIG_FEATURE_VI_SEARCH */ | 292 | #endif /* CONFIG_FEATURE_VI_SEARCH */ |
291 | #ifdef CONFIG_FEATURE_VI_COLON | 293 | #ifdef CONFIG_FEATURE_VI_COLON |
292 | static void Hit_Return(void); | ||
293 | static Byte *get_one_address(Byte *, int *); // get colon addr, if present | 294 | static Byte *get_one_address(Byte *, int *); // get colon addr, if present |
294 | static Byte *get_address(Byte *, int *, int *); // get two colon addrs, if present | 295 | static Byte *get_address(Byte *, int *, int *); // get two colon addrs, if present |
295 | static void colon(Byte *); // execute the "colon" mode cmds | 296 | static void colon(Byte *); // execute the "colon" mode cmds |
@@ -1146,6 +1147,7 @@ colon_s_fail: | |||
1146 | psb(":s expression missing delimiters"); | 1147 | psb(":s expression missing delimiters"); |
1147 | #endif | 1148 | #endif |
1148 | } | 1149 | } |
1150 | #endif /* CONFIG_FEATURE_VI_COLON */ | ||
1149 | 1151 | ||
1150 | static void Hit_Return(void) | 1152 | static void Hit_Return(void) |
1151 | { | 1153 | { |
@@ -1158,7 +1160,6 @@ static void Hit_Return(void) | |||
1158 | ; | 1160 | ; |
1159 | redraw(TRUE); // force redraw all | 1161 | redraw(TRUE); // force redraw all |
1160 | } | 1162 | } |
1161 | #endif /* CONFIG_FEATURE_VI_COLON */ | ||
1162 | 1163 | ||
1163 | //----- Synchronize the cursor to Dot -------------------------- | 1164 | //----- Synchronize the cursor to Dot -------------------------- |
1164 | static void sync_cursor(Byte * d, int *row, int *col) | 1165 | static void sync_cursor(Byte * d, int *row, int *col) |