Commit: patch 9.1.1372: style: braces issues in various files

1 view
Skip to first unread message

Christian Brabandt

unread,
May 8, 2025, 5:00:17 PM5/8/25
to vim...@googlegroups.com
patch 9.1.1372: style: braces issues in various files

Commit: https://github.com/vim/vim/commit/a4a00a7ad0cfa26685c057c11a09bec2c962346a
Author: Hirohito Higashi <h.eas...@gmail.com>
Date: Thu May 8 22:58:31 2025 +0200

patch 9.1.1372: style: braces issues in various files

Problem: style: braces issues in various files
Solution: fix style (Hirohito Higashi)

closes: #17277

Signed-off-by: Hirohito Higashi <h.eas...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/cindent.c b/src/cindent.c
index 217098016..e1f744676 100644
--- a/src/cindent.c
+++ b/src/cindent.c
@@ -2447,7 +2447,8 @@ get_c_indent(void)
char_u *line;

trypos = &our_paren_pos;
- do {
+ do
+ {
outermost = *trypos;
curwin->w_cursor.lnum = outermost.lnum;
curwin->w_cursor.col = outermost.col;
diff --git a/src/gui_haiku.cc b/src/gui_haiku.cc
index d08322654..748f97e54 100644
--- a/src/gui_haiku.cc
+++ b/src/gui_haiku.cc
@@ -2091,7 +2091,8 @@ VimDialog::VimDialog(int type, const char *title, const char *message,
float buttonsHeight = 0;
BString strButtons(buttons);
strButtons.RemoveAll("&");
- do {
+ do
+ {
int32 end = strButtons.FindFirst('
');
if (end != B_ERROR)
strButtons.SetByteAt(end, '
diff --git a/src/insexpand.c b/src/insexpand.c
index 91281bfc5..ade7bb772 100644
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -5246,7 +5246,8 @@ find_comp_when_fuzzy(void)
str = compl_match_array[target_idx].pum_text;

comp = compl_first_match;
- do {
+ do
+ {
if (comp->cp_score == score && (str == comp->cp_str.string || str == comp->cp_text[CPT_ABBR]))
return comp;
comp = comp->cp_next;
diff --git a/src/register.c b/src/register.c
index 9d2770669..72d313539 100644
--- a/src/register.c
+++ b/src/register.c
@@ -2068,7 +2068,8 @@ do_put(
else
{
totlen = count * yanklen;
- do {
+ do
+ {
oldp = ml_get(lnum);
oldlen = ml_get_len(lnum);
if (lnum > start_lnum)
diff --git a/src/search.c b/src/search.c
index 43491b668..5222a433d 100644
--- a/src/search.c
+++ b/src/search.c
@@ -5344,7 +5344,8 @@ search_for_fuzzy_match(
if (whole_line && start_pos->lnum != pos->lnum)
current_pos.lnum += dir;

- do {
+ do
+ {

// Check if looped around and back to start position
if (looped_around && EQUAL_POS(current_pos, circly_end))
diff --git a/src/termlib.c b/src/termlib.c
index ad5165a3c..42eccf5e9 100644
--- a/src/termlib.c
+++ b/src/termlib.c
@@ -279,7 +279,8 @@ tgetstr(char *id, char **buf)
char *hold;
int i;

- do {
+ do
+ {
tmp = _find(tmp, ":"); // For each field
while (*tmp == ':') // skip empty fields
tmp++;
diff --git a/src/usercmd.c b/src/usercmd.c
index fafa97d15..ded11e759 100644
--- a/src/usercmd.c
+++ b/src/usercmd.c
@@ -606,7 +606,8 @@ uc_list(char_u *name, size_t name_len)
msg_outtrans_attr(cmd->uc_name, HL_ATTR(HLF_D));
len = (int)cmd->uc_namelen + 4;

- do {
+ do
+ {
msg_putchar(' ');
++len;
} while (len < 22);
@@ -626,7 +627,8 @@ uc_list(char_u *name, size_t name_len)
case (EX_EXTRA|EX_NOSPC|EX_NEEDARG): IObuff[len++] = '1'; break;
}

- do {
+ do
+ {
IObuff[len++] = ' ';
} while (len < 5 - over);

@@ -649,7 +651,8 @@ uc_list(char_u *name, size_t name_len)
IObuff[len++] = '.';
}

- do {
+ do
+ {
IObuff[len++] = ' ';
} while (len < 8 - over);

@@ -663,7 +666,8 @@ uc_list(char_u *name, size_t name_len)
break;
}

- do {
+ do
+ {
IObuff[len++] = ' ';
} while (len < 13 - over);

@@ -688,7 +692,8 @@ uc_list(char_u *name, size_t name_len)
#endif
}

- do {
+ do
+ {
IObuff[len++] = ' ';
} while (len < 25 - over);

diff --git a/src/version.c b/src/version.c
index 472f9129f..fb1f45b53 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 */
+/**/
+ 1372,
/**/
1371,
/**/
diff --git a/src/viminfo.c b/src/viminfo.c
index 44d54879f..f1e1fc372 100644
--- a/src/viminfo.c
+++ b/src/viminfo.c
@@ -2899,7 +2899,8 @@ read_viminfo_up_to_marks(
if (virp->vir_version < VIMINFO_VERSION_WITH_REGISTERS)
eof = read_viminfo_register(virp, forceit);
else
- do {
+ do
+ {
eof = viminfo_readline(virp);
} while (!eof && (virp->vir_line[0] == TAB
|| virp->vir_line[0] == '<'));
Reply all
Reply to author
Forward
0 new messages