Mercurial > vim
changeset 13917:f6dcc1a8d584 v8.0.1829
patch 8.0.1829: MS-Windows: script for vimdiff can't handle ! chars
commit https://github.com/vim/vim/commit/12365ce49f671a62a1e647df205c9a020828ee1b
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun May 13 14:45:25 2018 +0200
patch 8.0.1829: MS-Windows: script for vimdiff can't handle ! chars
Problem: MS-Windows: script for vimdiff can't handle ! chars.
Solution: Escape the ! chars. (Hans Ginzel, closes https://github.com/vim/vim/issues/2896)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 13 May 2018 15:00:07 +0200 |
| parents | 6789408b611e |
| children | 9cef228c53d6 |
| files | src/dosinst.c src/version.c |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dosinst.c +++ b/src/dosinst.c @@ -1197,13 +1197,17 @@ install_vimrc(int idx) fprintf(fd, " let opt = '-a --binary '\n"); fprintf(fd, " if &diffopt =~ 'icase' | let opt = opt . '-i ' | endif\n"); fprintf(fd, " if &diffopt =~ 'iwhite' | let opt = opt . '-b ' | endif\n"); - /* Use quotes only when needed, they may cause trouble. */ + /* Use quotes only when needed, they may cause trouble. + * Always escape "!". */ fprintf(fd, " let arg1 = v:fname_in\n"); fprintf(fd, " if arg1 =~ ' ' | let arg1 = '\"' . arg1 . '\"' | endif\n"); + fprintf(fd, " let arg1 = substitute(arg1, '!', '\\!', 'g')\n"); fprintf(fd, " let arg2 = v:fname_new\n"); fprintf(fd, " if arg2 =~ ' ' | let arg2 = '\"' . arg2 . '\"' | endif\n"); + fprintf(fd, " let arg2 = substitute(arg2, '!', '\\!', 'g')\n"); fprintf(fd, " let arg3 = v:fname_out\n"); fprintf(fd, " if arg3 =~ ' ' | let arg3 = '\"' . arg3 . '\"' | endif\n"); + fprintf(fd, " let arg3 = substitute(arg3, '!', '\\!', 'g')\n"); /* If the path has a space: When using cmd.exe (Win NT/2000/XP) put * quotes around the diff command and rely on the default value of @@ -1225,6 +1229,7 @@ install_vimrc(int idx) fprintf(fd, " else\n"); fprintf(fd, " let cmd = $VIMRUNTIME . '\\diff'\n"); fprintf(fd, " endif\n"); + fprintf(fd, " let cmd = substitute(cmd, '!', '\\!', 'g')\n"); fprintf(fd, " silent execute '!' . cmd . ' ' . opt . arg1 . ' ' . arg2 . ' > ' . arg3\n"); fprintf(fd, " if exists('l:shxq_sav')\n"); fprintf(fd, " let &shellxquote=l:shxq_sav\n");