Mercurial > vim
diff src/search.c @ 5118:5569d11ef585 v7.3.1302
updated for version 7.3.1302
Problem: Test 17 fails on MS-Windows. Includes line break in file name
everywhere.
Solution: Fix 'fileformat'. Omit CR-LF from a line read from an included
file.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 03 Jul 2013 22:28:36 +0200 |
| parents | 8875401008da |
| children | 839ebe7c1b2f |
line wrap: on
line diff
--- a/src/search.c +++ b/src/search.c @@ -4825,7 +4825,7 @@ find_pattern_in_path(ptr, dir, len, whol if (inc_opt != NULL && strstr((char *)inc_opt, "\\zs") != NULL) /* Use text from '\zs' to '\ze' (or end) of 'include'. */ new_fname = find_file_name_in_path(incl_regmatch.startp[0], - (int)(incl_regmatch.endp[0] - incl_regmatch.startp[0]), + (int)(incl_regmatch.endp[0] - incl_regmatch.startp[0]), FNAME_EXP|FNAME_INCL|FNAME_REL, 1L, p_fname); else /* Use text after match with 'include'. */ @@ -5352,7 +5352,15 @@ exit_matched: depth_displayed = depth; } if (depth >= 0) /* we could read the line */ + { files[depth].lnum++; + /* Remove any CR and LF from the line. */ + i = (int)STRLEN(line); + if (i > 0 && line[i - 1] == '\n') + line[--i] = NUL; + if (i > 0 && line[i - 1] == '\r') + line[--i] = NUL; + } else if (!already) { if (++lnum > end_lnum)