aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.1.1364: style: more indentation issues

Browse Source 
Problem:  style: more indentation issues
Solution: fix indentation style
          (Yegappan Lakshmanan)

closes: #17256

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Yegappan Lakshmanan 2025-05-04 21:05:51 +02:00 committed by Christian Brabandt
parent e957cba081
commit 562610cfa3
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
4 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/cindent.c
View File

@ -590,7 +590,7 @@ cin_isdefault(char_u *s)
/* /*
* Recognize a switch label: "case .*:" or "default:". * Recognize a switch label: "case .*:" or "default:".
*/ */
static int static int
cin_iscase( cin_iscase(
char_u *s, char_u *s,
int strict) // Allow relaxed check of case statement for JS int strict) // Allow relaxed check of case statement for JS
@ -1296,7 +1296,7 @@ done:
static int static int
cin_isif(char_u *p) cin_isif(char_u *p)
{ {
return (STRNCMP(p, "if", 2) == 0 && !vim_isIDc(p[2])); return (STRNCMP(p, "if", 2) == 0 && !vim_isIDc(p[2]));
} }
static int static int
@ -2415,15 +2415,15 @@ get_c_indent(void)
&& trypos->lnum == our_paren_pos.lnum && trypos->lnum == our_paren_pos.lnum
&& trypos->col == our_paren_pos.col) && trypos->col == our_paren_pos.col)
{ {
amount = get_indent_lnum(lnum); // XXX amount = get_indent_lnum(lnum); // XXX
if (theline[0] == ')') if (theline[0] == ')')
{ {
if (our_paren_pos.lnum != lnum if (our_paren_pos.lnum != lnum
&& cur_amount > amount) && cur_amount > amount)
cur_amount = amount; cur_amount = amount;
amount = -1; amount = -1;
} }
break; break;
} }
} }
@ -3961,7 +3961,7 @@ in_cinkeys(
{ {
case '*': try_match = (*look == '*'); break; case '*': try_match = (*look == '*'); break;
case '!': try_match = (*look == '!'); break; case '!': try_match = (*look == '!'); break;
default: try_match = (*look != '*'); break; default: try_match = (*look != '*'); break;
} }
if (*look == '*' || *look == '!') if (*look == '*' || *look == '!')
++look; ++look;

7
src/globals.h
View File

@ -1012,9 +1012,10 @@ EXTERN win_T *curwin; // currently active window
#define AUCMD_WIN_COUNT 5 #define AUCMD_WIN_COUNT 5
typedef struct { typedef struct {
win_T *auc_win; // Window used in aucmd_prepbuf(). When not NULL the // Window used in aucmd_prepbuf(). When not NULL the window has been
// window has been allocated. // allocated.
int auc_win_used; // This auc_win is being used. win_T *auc_win;
int auc_win_used; // This auc_win is being used.
} aucmdwin_T; } aucmdwin_T;
EXTERN aucmdwin_T aucmd_win[AUCMD_WIN_COUNT]; EXTERN aucmdwin_T aucmd_win[AUCMD_WIN_COUNT];

40
src/terminal.c
View File

@ -53,10 +53,10 @@
// This is VTermScreenCell without the characters, thus much smaller. // This is VTermScreenCell without the characters, thus much smaller.
typedef struct { typedef struct {
VTermScreenCellAttrs attrs; VTermScreenCellAttrs attrs;
char width; char width;
VTermColor fg; VTermColor fg;
VTermColor bg; VTermColor bg;
} cellattr_T; } cellattr_T;
typedef struct sb_line_S { typedef struct sb_line_S {
@ -3634,15 +3634,15 @@ handle_bell(void *user UNUSED)
} }
static VTermScreenCallbacks screen_callbacks = { static VTermScreenCallbacks screen_callbacks = {
handle_damage, // damage handle_damage, // damage
handle_moverect, // moverect handle_moverect, // moverect
handle_movecursor, // movecursor handle_movecursor, // movecursor
handle_settermprop, // settermprop handle_settermprop, // settermprop
handle_bell, // bell handle_bell, // bell
handle_resize, // resize handle_resize, // resize
handle_pushline, // sb_pushline handle_pushline, // sb_pushline
NULL, // sb_popline NULL, // sb_popline
NULL // sb_clear NULL // sb_clear
}; };
/* /*
@ -4858,13 +4858,13 @@ parse_csi(
} }
static VTermStateFallbacks state_fallbacks = { static VTermStateFallbacks state_fallbacks = {
NULL, // control NULL, // control
parse_csi, // csi parse_csi, // csi
parse_osc, // osc parse_osc, // osc
NULL, // dcs NULL, // dcs
NULL, // apc NULL, // apc
NULL, // pm NULL, // pm
NULL // sos NULL // sos
}; };
/* /*

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1364,
/**/ /**/
1363, 1363,
/**/ /**/