Mercurial > vim
view src/gui_xmebwp.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 | 6e3dc2d630c2 |
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. * See README.txt for an overview of the Vim source code. */ /* * * (C) 2002,2005 by Marcin Dalecki <martin@dalecki.de> * * MARCIN DALECKI ASSUMES NO RESPONSIBILITY FOR THE USE OR INABILITY TO USE ANY * OF THIS SOFTWARE . THIS SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY * KIND, AND MARCIN DALECKI EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES, * INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE. */ #ifndef EnhancedBP_H #define EnhancedBP_H #include <Xm/PushBP.h> #include "gui_xmebw.h" /* * EnhancedButton class structure. */ typedef struct _XmEnhancedButtonClassPart { Pixmap stipple_bitmap; } XmEnhancedButtonClassPart; /* * Full class record declaration for EnhancedButton class. */ typedef struct { CoreClassPart core_class; XmPrimitiveClassPart primitive_class; XmLabelClassPart label_class; XmPushButtonClassPart pushbutton_class; XmEnhancedButtonClassPart enhancedbutton_class; } XmEnhancedButtonClassRec; extern XmEnhancedButtonClassRec xmEnhancedButtonClassRec; /* * EnhancedButton instance record. */ typedef struct _XmEnhancedButtonPart { // public resources String pixmap_data; String pixmap_file; Dimension spacing; int label_location; // private resources int pixmap_depth; Dimension pixmap_width; Dimension pixmap_height; Pixmap normal_pixmap; Pixmap armed_pixmap; Pixmap insensitive_pixmap; Pixmap highlight_pixmap; int doing_setvalues; int doing_destroy; } XmEnhancedButtonPart; /* * Full instance record declaration. */ typedef struct _XmEnhancedButtonRec { CorePart core; XmPrimitivePart primitive; XmLabelPart label; XmPushButtonPart pushbutton; XmEnhancedButtonPart enhancedbutton; } XmEnhancedButtonRec; #endif