1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-14 17:44:38 +02:00
openwrt-xburst/package/busybox/patches/480-vi_search.patch
hauke 2db05e4bbb busybox: refresh busybox patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14590 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-02-21 15:07:45 +00:00

36 lines
995 B
Diff

--- a/editors/vi.c
+++ b/editors/vi.c
@@ -3313,7 +3313,7 @@ static void do_cmd(char c)
buf[1] = '\0';
q = get_input_line(buf); // get input line- use "status line"
if (q[0] && !q[1]) {
- if (last_search_pattern[0])
+ if (last_search_pattern)
last_search_pattern[0] = c;
goto dc3; // if no pat re-use old pat
}
@@ -3329,6 +3329,10 @@ static void do_cmd(char c)
if (cmdcnt-- > 1) {
do_cmd(c);
} // repeat cnt
+ if (last_search_pattern == 0) {
+ msg = "No previous regular expression";
+ goto dc2;
+ }
dir = BACK; // assume BACKWARD search
p = dot - 1;
if (last_search_pattern[0] == '?') {
@@ -3348,10 +3352,8 @@ static void do_cmd(char c)
msg = "No previous regular expression";
goto dc2;
}
- if (last_search_pattern[0] == '/') {
- dir = FORWARD; // assume FORWARD search
- p = dot + 1;
- }
+ dir = FORWARD; // assume FORWARD search
+ p = dot + 1;
if (last_search_pattern[0] == '?') {
dir = BACK;
p = dot - 1;