patch 9.1.0916: messages.c is exceeding 80 columns
Commit:
https://github.com/vim/vim/commit/36f36715e6173c2dc61e5c9817a22fb97a6166b2
Author: h-east <[email protected]>
Date: Mon Dec 9 20:05:59 2024 +0100
patch 9.1.0916: messages.c is exceeding 80 columns
Problem: messages.c is exceeding 80 columns
Solution: slightly reformat messages.c (h-east)
closes: #16196
Signed-off-by: h-east <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/message.c b/src/message.c
index 0fb0013d5..24984123b 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1324,8 +1324,8 @@ wait_return(int redraw)
++allow_keys;
// Temporarily disable Recording. If Recording is active, the
- // character will be recorded later, since it will be added to
the
- // typebuf after the loop
+ // character will be recorded later, since it will be added to
+ // the typebuf after the loop
save_reg_recording = reg_recording;
save_scriptout = scriptout;
reg_recording = 0;
@@ -1339,9 +1339,10 @@ wait_return(int redraw)
scriptout = save_scriptout;
#ifdef FEAT_CLIPBOARD
- // Strange way to allow copying (yanking) a modeless selection
at
- // the hit-enter prompt. Use CTRL-Y, because the same is used
in
- // Cmdline-mode and it's harmless when there is no selection.
+ // Strange way to allow copying (yanking) a modeless selection
+ // at the hit-enter prompt. Use CTRL-Y, because the same is
+ // used in Cmdline-mode and it's harmless when there is no
+ // selection.
if (c == Ctrl_Y && clip_star.state == SELECT_DONE)
{
clip_copy_modeless_selection(TRUE);
@@ -1351,14 +1352,14 @@ wait_return(int redraw)
/*
* Allow scrolling back in the messages.
- * Also accept scroll-down commands when messages fill the
screen,
- * to avoid that typing one 'j' too many makes the messages
- * disappear.
+ * Also accept scroll-down commands when messages fill the
+ * screen, to avoid that typing one 'j' too many makes the
+ * messages disappear.
*/
if (p_more && !p_cp)
{
if (c == 'b' || c == 'k' || c == 'u' || c == 'g'
- || c == K_UP || c ==
K_PAGEUP)
+ || c == K_UP || c == K_PAGEUP)
{
if (msg_scrolled > Rows)
// scroll back to show older messages
@@ -1391,36 +1392,36 @@ wait_return(int redraw)
c = K_IGNORE;
}
} while ((had_got_int && c == Ctrl_C)
- || c == K_IGNORE
+ || c == K_IGNORE
#ifdef FEAT_GUI
- || c == K_VER_SCROLLBAR || c ==
K_HOR_SCROLLBAR
+ || c == K_VER_SCROLLBAR || c == K_HOR_SCROLLBAR
#endif
- || c == K_LEFTDRAG || c == K_LEFTRELEASE
- || c == K_MIDDLEDRAG || c == K_MIDDLERELEASE
- || c == K_RIGHTDRAG || c == K_RIGHTRELEASE
- || c == K_MOUSELEFT || c == K_MOUSERIGHT
- || c == K_MOUSEDOWN || c == K_MOUSEUP
- || c == K_MOUSEMOVE
- || (!mouse_has(MOUSE_RETURN)
- && mouse_row < msg_row
- && (c == K_LEFTMOUSE
- || c == K_MIDDLEMOUSE
- || c == K_RIGHTMOUSE
- || c == K_X1MOUSE
- || c == K_X2MOUSE))
- );
+ || c == K_LEFTDRAG || c == K_LEFTRELEASE
+ || c == K_MIDDLEDRAG || c == K_MIDDLERELEASE
+ || c == K_RIGHTDRAG || c == K_RIGHTRELEASE
+ || c == K_MOUSELEFT || c == K_MOUSERIGHT
+ || c == K_MOUSEDOWN || c == K_MOUSEUP
+ || c == K_MOUSEMOVE
+ || (!mouse_has(MOUSE_RETURN)
+ && mouse_row < msg_row
+ && (c == K_LEFTMOUSE
+ || c == K_MIDDLEMOUSE
+ || c == K_RIGHTMOUSE
+ || c == K_X1MOUSE
+ || c == K_X2MOUSE))
+ );
ui_breakcheck();
// Avoid that the mouse-up event causes Visual mode to start.
if (c == K_LEFTMOUSE || c == K_MIDDLEMOUSE || c == K_RIGHTMOUSE
- || c == K_X1MOUSE || c == K_X2MOUSE)
+ || c == K_X1MOUSE || c == K_X2MOUSE)
(void)jump_to_mouse(MOUSE_SETPOS, NULL, 0);
else if (vim_strchr((char_u *)"
", c) == NULL && c != Ctrl_C)
{
- // Put the character back in the typeahead buffer. Don't use
the
- // stuff buffer, because lmaps wouldn't work.
+ // Put the character back in the typeahead buffer. Don't use
+ // the stuff buffer, because lmaps wouldn't work.
ins_char_typebuf(vgetc_char, vgetc_mod_mask);
- do_redraw = TRUE; // need a redraw even though there
is
+ do_redraw = TRUE; // need a redraw even though there is
// typeahead
}
}
diff --git a/src/version.c b/src/version.c
index 07bb851f1..5933af3b8 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 */
+/**/
+ 916,
/**/
915,
/**/
--
--
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 [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1tKjDj-002cCz-9V%40256bit.org.
