Mercurial > vim
comparison src/search.c @ 944:b2dcb8457067 v7.0.070
updated for version 7.0-070
author | vimboss |
---|---|
date | Tue, 29 Aug 2006 15:30:07 +0000 |
parents | 29bf49bad20d |
children | 0b211ebefd4e |
comparison
equal
deleted
inserted
replaced
943:e70aad5761b5 | 944:b2dcb8457067 |
---|---|
4824 p = find_word_end(p); | 4824 p = find_word_end(p); |
4825 i = (int)(p - aux); | 4825 i = (int)(p - aux); |
4826 | 4826 |
4827 if ((compl_cont_status & CONT_ADDING) && i == compl_length) | 4827 if ((compl_cont_status & CONT_ADDING) && i == compl_length) |
4828 { | 4828 { |
4829 /* get the next line */ | |
4830 /* IOSIZE > compl_length, so the STRNCPY works */ | 4829 /* IOSIZE > compl_length, so the STRNCPY works */ |
4831 STRNCPY(IObuff, aux, i); | 4830 STRNCPY(IObuff, aux, i); |
4832 if (!( depth < 0 | 4831 |
4833 && lnum < end_lnum | 4832 /* Get the next line: when "depth" < 0 from the current |
4834 && (line = ml_get(++lnum)) != NULL) | 4833 * buffer, otherwise from the included file. Jump to |
4835 && !( depth >= 0 | 4834 * exit_matched when past the last line. */ |
4836 && !vim_fgets(line = file_line, | 4835 if (depth < 0) |
4837 LSIZE, files[depth].fp))) | 4836 { |
4837 if (lnum >= end_lnum) | |
4838 goto exit_matched; | |
4839 line = ml_get(++lnum); | |
4840 } | |
4841 else if (vim_fgets(line = file_line, | |
4842 LSIZE, files[depth].fp)) | |
4838 goto exit_matched; | 4843 goto exit_matched; |
4839 | 4844 |
4840 /* we read a line, set "already" to check this "line" later | 4845 /* we read a line, set "already" to check this "line" later |
4841 * if depth >= 0 we'll increase files[depth].lnum far | 4846 * if depth >= 0 we'll increase files[depth].lnum far |
4842 * bellow -- Acevedo */ | 4847 * bellow -- Acevedo */ |