comparison src/search.c @ 681:9364d114ed8d v7.0204

updated for version 7.0204
author vimboss
date Wed, 22 Feb 2006 21:25:37 +0000
parents 513866ffe6af
children d7e33248b9c8
comparison
equal deleted inserted replaced
680:5b101ff9d4c4 681:9364d114ed8d
4497 incl_regmatch.endp[0] - incl_regmatch.startp[0], 4497 incl_regmatch.endp[0] - incl_regmatch.startp[0],
4498 FNAME_EXP|FNAME_INCL|FNAME_REL, 1L, p_fname); 4498 FNAME_EXP|FNAME_INCL|FNAME_REL, 1L, p_fname);
4499 else 4499 else
4500 /* Use text after match with 'include'. */ 4500 /* Use text after match with 'include'. */
4501 new_fname = file_name_in_line(incl_regmatch.endp[0], 0, 4501 new_fname = file_name_in_line(incl_regmatch.endp[0], 0,
4502 FNAME_EXP|FNAME_INCL|FNAME_REL, 1L, p_fname); 4502 FNAME_EXP|FNAME_INCL|FNAME_REL, 1L, p_fname, NULL);
4503 already_searched = FALSE; 4503 already_searched = FALSE;
4504 if (new_fname != NULL) 4504 if (new_fname != NULL)
4505 { 4505 {
4506 /* Check whether we have already searched in this file */ 4506 /* Check whether we have already searched in this file */
4507 for (i = 0;; i++) 4507 for (i = 0;; i++)
4827 4827
4828 if (i == compl_length) 4828 if (i == compl_length)
4829 goto exit_matched; 4829 goto exit_matched;
4830 } 4830 }
4831 4831
4832 add_r = ins_compl_add_infercase(aux, i, 4832 add_r = ins_compl_add_infercase(aux, i, p_ic,
4833 curr_fname == curbuf->b_fname ? NULL : curr_fname, 4833 curr_fname == curbuf->b_fname ? NULL : curr_fname,
4834 dir, reuse); 4834 dir, reuse);
4835 if (add_r == OK) 4835 if (add_r == OK)
4836 /* if dir was BACKWARD then honor it just once */ 4836 /* if dir was BACKWARD then honor it just once */
4837 dir = FORWARD; 4837 dir = FORWARD;