Mercurial > vim
view src/os_dos.h @ 36242:b2a5d49fcedb
runtime(comment): consider &tabstop in lines after whitespace indent
Commit: https://github.com/vim/vim/commit/7b27fc49a8c4ce480f759dc33082e6150fb94238
Author: Konfekt <Konfekt@users.noreply.github.com>
Date: Sat Oct 5 16:17:04 2024 +0200
runtime(comment): consider &tabstop in lines after whitespace indent
The count `strlen()` in
```vim
line = printf(indent_start .. substitute(cms, '%s\@!', '%%', 'g'),
strpart(getline(lnum), strlen(indent_start)))
```
is too large if the block of lines to be operated on contains different
whitespace indenting (tab vs. spaces).
Considering using `2gcc` on the first line with 4 spaces as indenting
and on the next line using a single tab character (with &tabstop value
of 8):
Using `strlen(indent_start) = 4` for an initial indent of 4 spaces is
correct for the first line, but wrong for the next line and will
therefore wrongly comment out the tab-indented line (and possibly
deleting some content).
The new check is still too simple because it assumes that as soon as
there's a tab the whole indent is made of tabs; it's a start of entering
the mixed tab and whitespace indent rabbit hole.
fixes: #15797
closes: #15805
Signed-off-by: Konfekt <Konfekt@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 05 Oct 2024 16:30:07 +0200 |
parents | 695b50472e85 |
children |
line wrap: on
line source
/* vi:set ts=8 sts=4 sw=4 noet: * * VIM - Vi IMproved by Bram Moolenaar * * Do ":help uganda" in Vim to read copying and usage conditions. * Do ":help credits" in Vim to see a list of people who contributed. */ /* * Common MS-DOS and Win32 (Windows NT and Windows 95) defines. * * Names for the EXRC, HELP and temporary files. * Some of these may have been defined in the makefile or feature.h. */ #ifndef SYS_VIMRC_FILE # define SYS_VIMRC_FILE "$VIM\\vimrc" #endif #ifndef USR_VIMRC_FILE # define USR_VIMRC_FILE "$HOME\\_vimrc" #endif #ifndef USR_VIMRC_FILE2 # define USR_VIMRC_FILE2 "$HOME\\vimfiles\\vimrc" #endif #ifndef USR_VIMRC_FILE3 # define USR_VIMRC_FILE3 "$VIM\\_vimrc" #endif #ifndef VIM_DEFAULTS_FILE # define VIM_DEFAULTS_FILE "$VIMRUNTIME\\defaults.vim" #endif #ifndef EVIM_FILE # define EVIM_FILE "$VIMRUNTIME\\evim.vim" #endif #ifndef USR_EXRC_FILE # define USR_EXRC_FILE "$HOME\\_exrc" #endif #ifndef USR_EXRC_FILE2 # define USR_EXRC_FILE2 "$VIM\\_exrc" #endif #ifdef FEAT_GUI # ifndef SYS_GVIMRC_FILE # define SYS_GVIMRC_FILE "$VIM\\gvimrc" # endif # ifndef USR_GVIMRC_FILE # define USR_GVIMRC_FILE "$HOME\\_gvimrc" # endif # ifndef USR_GVIMRC_FILE2 # define USR_GVIMRC_FILE2 "$HOME\\vimfiles\\gvimrc" # endif # ifndef USR_GVIMRC_FILE3 # define USR_GVIMRC_FILE3 "$VIM\\_gvimrc" # endif # ifndef SYS_MENU_FILE # define SYS_MENU_FILE "$VIMRUNTIME\\menu.vim" # endif #endif #ifndef SYS_OPTWIN_FILE # define SYS_OPTWIN_FILE "$VIMRUNTIME\\optwin.vim" #endif #ifdef FEAT_VIMINFO # ifndef VIMINFO_FILE # define VIMINFO_FILE "$HOME\\_viminfo" # endif # ifndef VIMINFO_FILE2 # define VIMINFO_FILE2 "$VIM\\_viminfo" # endif #endif #ifndef VIMRC_FILE # define VIMRC_FILE "_vimrc" #endif #ifndef EXRC_FILE # define EXRC_FILE "_exrc" #endif #ifdef FEAT_GUI # ifndef GVIMRC_FILE # define GVIMRC_FILE "_gvimrc" # endif #endif #ifndef DFLT_HELPFILE # define DFLT_HELPFILE "$VIMRUNTIME\\doc\\help.txt" #endif #ifndef SYNTAX_FNAME # define SYNTAX_FNAME "$VIMRUNTIME\\syntax\\%s.vim" #endif #ifndef DFLT_BDIR # define DFLT_BDIR ".,$TEMP,c:\\tmp,c:\\temp" // default for 'backupdir' #endif #ifndef DFLT_VDIR # define DFLT_VDIR "$HOME/vimfiles/view" // default for 'viewdir' #endif #ifndef DFLT_DIR # define DFLT_DIR ".,$TEMP,c:\\tmp,c:\\temp" // default for 'directory' #endif #define DFLT_ERRORFILE "errors.err" #define DFLT_RUNTIMEPATH "$HOME/vimfiles,$VIM/vimfiles,$VIMRUNTIME,$HOME/vimfiles/after,$VIM/vimfiles/after" #define CLEAN_RUNTIMEPATH "$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after" #define CASE_INSENSITIVE_FILENAME // ignore case when comparing file names #define SPACE_IN_FILENAME #define BACKSLASH_IN_FILENAME #define USE_CRNL // lines end in CR-NL instead of NL #define HAVE_DUP // have dup() #define HAVE_ST_MODE // have stat.st_mode