Mercurial > vim
view vimtutor.bat @ 34511:5397ce113043 v9.1.0161
patch 9.1.0161: expand() removes slash after env variable that ends with colon
Commit: https://github.com/vim/vim/commit/13a014452a7a020a119ac555a690c65b41f3126d
Author: zeertzjq <zeertzjq@outlook.com>
Date: Sat Mar 9 17:44:46 2024 +0100
patch 9.1.0161: expand() removes slash after env variable that ends with colon
Problem: expand() removes a slash after an environment variable that
ends with a colon on Windows.
Solution: Check the correct char for a colon (zeertzjq)
closes: #14161
Note: Vim still removes the path-separator at the end, if another path separator
follows directly after it, e.g. on:
```
echo $FOO='/usr/'
echo expand('$FOO/bar') == '/usr/bar'
```
see:
,----[ misc1.c:1630 ]
| // if var[] ends in a path separator and tail[] starts
| // with it, skip a character
| if (after_pathsep(dst, dst + c)
| #if defined(BACKSLASH_IN_FILENAME) || defined(AMIGA)
| && (dst == save_dst || dst[-1] != ':')
| #endif
| && vim_ispathsep(*tail))
| ++tail;
`----
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 09 Mar 2024 18:15:02 +0100 |
parents | 79aaaa134298 |
children |
line wrap: on
line source
:: Start Vim on a copy of the tutor file. @echo off :: Usage: vimtutor [-console] [xx] :: :: -console means gvim will not be used :: xx is a language code like "es" or "nl". :: When an xx argument is given, it tries loading that tutor. :: When this fails or no xx argument was given, it tries using 'v:lang' :: When that also fails, it uses the English version. :: Use Vim to copy the tutor, it knows the value of $VIMRUNTIME FOR %%d in (. %TMP% %TEMP%) DO ( call :test_dir_writable "%~dpf0" %%d IF NOT ERRORLEVEL 1 GOTO dir_ok ) echo No working directory is found GOTO end :test_dir_writable SET TUTORCOPY=%2\$tutor$ COPY %1 %TUTORCOPY% >nul 2>nul GOTO end :dir_ok SET xx=%1 IF NOT .%1==.-console GOTO use_gui SHIFT SET xx=%1 GOTO use_vim :use_gui :: Try making a copy of tutor with gvim. If gvim cannot be found, try using :: vim instead. If vim cannot be found, alert user to check environment and :: installation. :: The script tutor.vim tells Vim which file to copy. start "dummy" /b /w "%~dp0gvim.exe" -u NONE -c "so $VIMRUNTIME/tutor/tutor.vim" IF ERRORLEVEL 1 GOTO use_vim :: Start gvim without any .vimrc, set 'nocompatible' start "dummy" /b /w "%~dp0gvim.exe" -u NONE -c "set nocp" %TUTORCOPY% GOTO end :use_vim :: The script tutor.vim tells Vim which file to copy call vim -u NONE -c "so $VIMRUNTIME/tutor/tutor.vim" IF ERRORLEVEL 1 GOTO no_executable :: Start vim without any .vimrc, set 'nocompatible' call vim -u NONE -c "set nocp" %TUTORCOPY% GOTO end :no_executable ECHO. ECHO. ECHO No vim or gvim found in current directory or PATH. ECHO Check your installation or re-run install.exe :end :: remove the copy of the tutor IF EXIST %TUTORCOPY% DEL %TUTORCOPY% SET xx=