comparison src/search.c @ 648:9032e4668296 v7.0189

updated for version 7.0189
author vimboss
date Mon, 30 Jan 2006 00:14:18 +0000
parents 9e359e5759f6
children 9090f866cd57
comparison
equal deleted inserted replaced
647:19106f131c87 648:9032e4668296
519 int at_first_line; 519 int at_first_line;
520 int extra_col; 520 int extra_col;
521 int match_ok; 521 int match_ok;
522 long nmatched; 522 long nmatched;
523 int submatch = 0; 523 int submatch = 0;
524 int save_called_emsg = called_emsg;
524 #ifdef FEAT_SEARCH_EXTRA 525 #ifdef FEAT_SEARCH_EXTRA
525 int break_loop = FALSE; 526 int break_loop = FALSE;
526 #else 527 #else
527 # define break_loop FALSE 528 # define break_loop FALSE
528 #endif 529 #endif
550 } 551 }
551 #endif 552 #endif
552 else 553 else
553 extra_col = 1; 554 extra_col = 1;
554 555
555 /* 556 /*
556 * find the string 557 * find the string
557 */ 558 */
558 called_emsg = FALSE; 559 called_emsg = FALSE;
559 do /* loop for count */ 560 do /* loop for count */
560 { 561 {
561 start_pos = *pos; /* remember start pos for detecting no match */ 562 start_pos = *pos; /* remember start pos for detecting no match */
562 found = 0; /* default: not found */ 563 found = 0; /* default: not found */
863 } 864 }
864 while (--count > 0 && found); /* stop after count matches or no match */ 865 while (--count > 0 && found); /* stop after count matches or no match */
865 866
866 vim_free(regmatch.regprog); 867 vim_free(regmatch.regprog);
867 868
869 called_emsg |= save_called_emsg;
870
868 if (!found) /* did not find it */ 871 if (!found) /* did not find it */
869 { 872 {
870 if (got_int) 873 if (got_int)
871 EMSG(_(e_interr)); 874 EMSG(_(e_interr));
872 else if ((options & SEARCH_MSG) == SEARCH_MSG) 875 else if ((options & SEARCH_MSG) == SEARCH_MSG)