patch 9.1.1364: style: more indentation issues
Commit:
https://github.com/vim/vim/commit/562610cfa327c8ebff12a1700525e17a070d5e2c
Author: Yegappan Lakshmanan <yegap...@yahoo.com>
Date: Sun May 4 21:05:51 2025 +0200
patch 9.1.1364: style: more indentation issues
Problem: style: more indentation issues
Solution: fix indentation style
(Yegappan Lakshmanan)
closes: #17256
Signed-off-by: Yegappan Lakshmanan <yegap...@yahoo.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/cindent.c b/src/cindent.c
index eb7102e8b..217098016 100644
--- a/src/cindent.c
+++ b/src/cindent.c
@@ -590,7 +590,7 @@ cin_isdefault(char_u *s)
/*
* Recognize a switch label: "case .*:" or "default:".
*/
- static int
+ static int
cin_iscase(
char_u *s,
int strict) // Allow relaxed check of case statement for JS
@@ -1296,7 +1296,7 @@ done:
static int
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
@@ -2415,15 +2415,15 @@ get_c_indent(void)
&& trypos->lnum == our_paren_pos.lnum
&& trypos->col == our_paren_pos.col)
{
- amount = get_indent_lnum(lnum); // XXX
+ amount = get_indent_lnum(lnum); // XXX
- if (theline[0] == ')')
- {
- if (our_paren_pos.lnum != lnum
- && cur_amount > amount)
- cur_amount = amount;
- amount = -1;
- }
+ if (theline[0] == ')')
+ {
+ if (our_paren_pos.lnum != lnum
+ && cur_amount > amount)
+ cur_amount = amount;
+ amount = -1;
+ }
break;
}
}
@@ -3961,7 +3961,7 @@ in_cinkeys(
{
case '*': try_match = (*look == '*'); break;
case '!': try_match = (*look == '!'); break;
- default: try_match = (*look != '*'); break;
+ default: try_match = (*look != '*'); break;
}
if (*look == '*' || *look == '!')
++look;
diff --git a/src/globals.h b/src/globals.h
index b902e0318..7006364bd 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1012,9 +1012,10 @@ EXTERN win_T *curwin; // currently active
window
#define AUCMD_WIN_COUNT 5
typedef struct {
- win_T *auc_win; // Window used in aucmd_prepbuf(). When not
NULL the
- // window has been allocated.
- int auc_win_used; // This auc_win is being used.
+ // Window used in aucmd_prepbuf(). When not NULL the window has been
+ // allocated.
+ win_T *auc_win;
+ int auc_win_used; // This auc_win is being used.
} aucmdwin_T;
EXTERN aucmdwin_T aucmd_win[AUCMD_WIN_COUNT];
diff --git a/src/terminal.c b/src/terminal.c
index 471ab3af4..9f9482570 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -53,10 +53,10 @@
// This is VTermScreenCell without the characters, thus much smaller.
typedef struct {
- VTermScreenCellAttrs attrs;
- char width;
- VTermColor fg;
- VTermColor bg;
+ VTermScreenCellAttrs attrs;
+ char width;
+ VTermColor fg;
+ VTermColor bg;
} cellattr_T;
typedef struct sb_line_S {
@@ -3634,15 +3634,15 @@ handle_bell(void *user UNUSED)
}
static VTermScreenCallbacks screen_callbacks = {
- handle_damage, // damage
- handle_moverect, // moverect
- handle_movecursor, // movecursor
- handle_settermprop, // settermprop
- handle_bell, // bell
- handle_resize, // resize
- handle_pushline, // sb_pushline
- NULL, // sb_popline
- NULL // sb_clear
+ handle_damage, // damage
+ handle_moverect, // moverect
+ handle_movecursor, // movecursor
+ handle_settermprop, // settermprop
+ handle_bell, // bell
+ handle_resize, // resize
+ handle_pushline, // sb_pushline
+ NULL, // sb_popline
+ NULL // sb_clear
};
/*
@@ -4858,13 +4858,13 @@ parse_csi(
}
static VTermStateFallbacks state_fallbacks = {
- NULL, // control
- parse_csi, // csi
- parse_osc, // osc
- NULL, // dcs
- NULL, // apc
- NULL, // pm
- NULL // sos
+ NULL, // control
+ parse_csi, // csi
+ parse_osc, // osc
+ NULL, // dcs
+ NULL, // apc
+ NULL, // pm
+ NULL // sos
};
/*
diff --git a/src/version.c b/src/version.c
index 7a67afde2..64308dc43 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1364,
/**/
1363,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1uBeoY-007xxD-H1%40256bit.org.
