comparison src/ex_getln.c @ 17588:1348696d07cd v8.1.1791

patch 8.1.1791: 'completeslash' also applies to globpath() commit https://github.com/vim/vim/commit/50f91d22bd81819d5d946f6c38252c7922120ec6 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Aug 2 19:52:15 2019 +0200 patch 8.1.1791: 'completeslash' also applies to globpath() Problem: 'completeslash' also applies to globpath(). Solution: Add the WILD_IGNORE_COMPLETESLASH flag. (test by Yasuhiro Matsumoto, closes #4760)
author Bram Moolenaar <Bram@vim.org>
date Fri, 02 Aug 2019 20:00:07 +0200
parents 77c3f6428b6c
children 9efb4dda9720
comparison
equal deleted inserted replaced
17587:f4d6636bc399 17588:1348696d07cd
5030 ExpandFromContext( 5030 ExpandFromContext(
5031 expand_T *xp, 5031 expand_T *xp,
5032 char_u *pat, 5032 char_u *pat,
5033 int *num_file, 5033 int *num_file,
5034 char_u ***file, 5034 char_u ***file,
5035 int options) /* EW_ flags */ 5035 int options) // WILD_ flags
5036 { 5036 {
5037 #ifdef FEAT_CMDL_COMPL 5037 #ifdef FEAT_CMDL_COMPL
5038 regmatch_T regmatch; 5038 regmatch_T regmatch;
5039 #endif 5039 #endif
5040 int ret; 5040 int ret;
5094 /* Expand wildcards, supporting %:h and the like. */ 5094 /* Expand wildcards, supporting %:h and the like. */
5095 ret = expand_wildcards_eval(&pat, num_file, file, flags); 5095 ret = expand_wildcards_eval(&pat, num_file, file, flags);
5096 if (free_pat) 5096 if (free_pat)
5097 vim_free(pat); 5097 vim_free(pat);
5098 #ifdef BACKSLASH_IN_FILENAME 5098 #ifdef BACKSLASH_IN_FILENAME
5099 if (p_csl[0] != NUL) 5099 if (p_csl[0] != NUL && (options & WILD_IGNORE_COMPLETESLASH) == 0)
5100 { 5100 {
5101 int i; 5101 int i;
5102 5102
5103 for (i = 0; i < *num_file; ++i) 5103 for (i = 0; i < *num_file; ++i)
5104 { 5104 {