aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Fox <pgf@brightstareng.com>2005-10-09 14:26:26 +0000
committerPaul Fox <pgf@brightstareng.com>2005-10-09 14:26:26 +0000
commit90372ed51a4a396715dfefef4c3716e6b2ceca11 (patch)
treeea936cbf2485760934dde5f8828aad9b0c620b50
parentae907f38f0b35867795befa04640f7346c6be522 (diff)
downloadbusybox-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.c5
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[]
284static void Indicate_Error(void); // use flash or beep to indicate error 284static 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
287static void Hit_Return(void);
288
287#ifdef CONFIG_FEATURE_VI_SEARCH 289#ifdef CONFIG_FEATURE_VI_SEARCH
288static Byte *char_search(Byte *, Byte *, int, int); // search for pattern starting at p 290static Byte *char_search(Byte *, Byte *, int, int); // search for pattern starting at p
289static int mycmp(Byte *, Byte *, int); // string cmp based in "ignorecase" 291static 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
292static void Hit_Return(void);
293static Byte *get_one_address(Byte *, int *); // get colon addr, if present 294static Byte *get_one_address(Byte *, int *); // get colon addr, if present
294static Byte *get_address(Byte *, int *, int *); // get two colon addrs, if present 295static Byte *get_address(Byte *, int *, int *); // get two colon addrs, if present
295static void colon(Byte *); // execute the "colon" mode cmds 296static 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
1150static void Hit_Return(void) 1152static 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 --------------------------
1164static void sync_cursor(Byte * d, int *row, int *col) 1165static void sync_cursor(Byte * d, int *row, int *col)