less: make '/' (regex search) scan input if no matches are found
authorDenis Vlasenko <vda.linux@googlemail.com>
Thu, 8 Mar 2007 18:12:01 +0000 (18:12 -0000)
committerDenis Vlasenko <vda.linux@googlemail.com>
Thu, 8 Mar 2007 18:12:01 +0000 (18:12 -0000)
in input taken so far.

miscutils/less.c

index 207f5864e95bd3832310567e04d7ddb6d2ec8a50..31055a6c7891d362791b887fc572fd3e6be3df94 100644 (file)
@@ -845,15 +845,10 @@ static void regex_process(void)
                free(err);
                return;
        }
+
        pattern_valid = 1;
        match_pos = 0;
-
        fill_match_lines(0);
-
-       if (num_matches == 0 || max_fline <= max_displayed_line) {
-               buffer_print();
-               return;
-       }
        while (match_pos < num_matches) {
                if (match_lines[match_pos] > cur_fline)
                        break;
@@ -861,8 +856,11 @@ static void regex_process(void)
        }
        if (option_mask32 & LESS_STATE_MATCH_BACKWARDS)
                match_pos--;
-       normalize_match_pos(match_pos);
-       buffer_line(match_lines[match_pos]);
+
+       /* It's possible that no matches are found yet.
+        * goto_match() will read input looking for match,
+        * if needed */
+       goto_match(match_pos);
 }
 #endif