Mercurial > vim
view src/os_unixx.h @ 35308:22c03485f222 v9.1.0456
patch 9.1.0456: Left shift is incorrect with vartabstop and shiftwidth=0
Commit: https://github.com/vim/vim/commit/88d4f255b7b7a19bb4f6489e0ad0956e47d51fed
Author: Gary Johnson <garyjohn@spocom.com>
Date: Sat Jun 1 20:51:33 2024 +0200
patch 9.1.0456: Left shift is incorrect with vartabstop and shiftwidth=0
Problem: Left shift is incorrect with vartabstop and shiftwidth=0
Solution: make tabstop_at() function aware of shift direction
(Gary Johnson)
The problem was that with 'vartabstop' set and 'shiftwidth' equal 0,
left shifts using << were shifting the line to the wrong column. The
tabstop to the right of the first character in the line was being used
as the shift amount instead of the tabstop to the left of that first
character.
The reason was that the tabstop_at() function always returned the value
of the tabstop to the right of the given column and was not accounting
for the direction of the shift.
The solution was to make tabstop_at() aware of the direction of the
shift and to choose the tabtop accordingly.
A test was added to check this behavior and make sure it doesn't
regress.
While at it, also fix a few indentation/alignment issues.
fixes: #14864
closes: #14887
Signed-off-by: Gary Johnson <garyjohn@spocom.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 01 Jun 2024 21:00:03 +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. */ /* * os_unixx.h -- include files that are only used in os_unix.c */ // Sun's sys/ioctl.h redefines symbols from termio world #if defined(HAVE_SYS_IOCTL_H) && !defined(SUN_SYSTEM) # include <sys/ioctl.h> #endif #ifndef USE_SYSTEM // use fork/exec to start the shell # if defined(HAVE_SYS_WAIT_H) || defined(HAVE_UNION_WAIT) # include <sys/wait.h> # endif # ifndef WEXITSTATUS # ifdef HAVE_UNION_WAIT # define WEXITSTATUS(stat_val) ((stat_val).w_T.w_Retcode) # else # define WEXITSTATUS(stat_val) (((stat_val) >> 8) & 0377) # endif # endif # ifndef WIFEXITED # ifdef HAVE_UNION_WAIT # define WIFEXITED(stat_val) ((stat_val).w_T.w_Termsig == 0) # else # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) # endif # endif #endif // !USE_SYSTEM #ifdef HAVE_STROPTS_H # ifdef sinix # define buf_T __system_buf_t__ # endif # include <stropts.h> # ifdef sinix # undef buf_T # endif #endif #ifdef HAVE_STRING_H # include <string.h> #endif #ifdef HAVE_SYS_STREAM_H # include <sys/stream.h> #endif #ifdef HAVE_SYS_UTSNAME_H # include <sys/utsname.h> #endif #ifdef HAVE_SYS_SYSTEMINFO_H // <sys/systeminfo.h> uses SYS_NMLN but it may not be defined (CrayT3E). # ifndef SYS_NMLN # define SYS_NMLN 32 # endif # include <sys/systeminfo.h> // for sysinfo #endif /* * We use termios.h if both termios.h and termio.h are available. * Termios is supposed to be a superset of termio.h. Don't include them both, * it may give problems on some systems (e.g. hpux). * I don't understand why we don't want termios.h for apollo. */ #if defined(HAVE_TERMIOS_H) && !defined(apollo) # include <termios.h> #else # ifdef HAVE_TERMIO_H # include <termio.h> # else # ifdef HAVE_SGTTY_H # include <sgtty.h> # endif # endif #endif #ifdef HAVE_SYS_PTEM_H # include <sys/ptem.h> // must be after termios.h for Sinix # ifndef _IO_PTEM_H // For UnixWare that should check for _IO_PT_PTEM_H # define _IO_PTEM_H # endif #endif // shared library access #if defined(HAVE_DLFCN_H) && defined(USE_DLOPEN) # if defined(__MVS__) && !defined (__SUSV3) // needed to define RTLD_LAZY (Anthony Giorgio) # define __SUSV3 # endif # include <dlfcn.h> #else # if defined(HAVE_DL_H) && defined(HAVE_SHL_LOAD) # include <dl.h> # endif #endif