diff options
author | Bram Moolenaar <Bram@vim.org> | 2014-08-29 12:58:44 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2014-08-29 12:58:44 +0200 |
commit | e4df164692fef1a3c94149e1e2af68d44d335bf9 (patch) | |
tree | 983243c06916767b26eac240452e4a6d46e2994a /src/misc1.c | |
parent | 49f9dd7b916fb32bfd0cc9a50f8c4f9bb1bb760b (diff) | |
download | vim-git-e4df164692fef1a3c94149e1e2af68d44d335bf9.tar.gz |
updated for version 7.4.423v7.4.423
Problem: expand("$shell") does not work as documented.
Solution: Do not escape the $ when expanding environment variables.
Diffstat (limited to 'src/misc1.c')
-rw-r--r-- | src/misc1.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/misc1.c b/src/misc1.c index 6ae72cfbb..e3e7da824 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -78,7 +78,8 @@ get_indent_str(ptr, ts, list) if (!list || lcs_tab1) /* count a tab for what it is worth */ count += ts - (count % ts); else - /* in list mode, when tab is not set, count screen char width for Tab: ^I */ + /* In list mode, when tab is not set, count screen char width + * for Tab, displays: ^I */ count += ptr2cells(ptr); } else if (*ptr == ' ') @@ -10767,7 +10768,7 @@ gen_expand_wildcards(num_pat, pat, num_file, file, flags) vim_free(p); ga_clear_strings(&ga); i = mch_expand_wildcards(num_pat, pat, num_file, file, - flags); + flags|EW_KEEPDOLLAR); recursive = FALSE; return i; } |