1
0
forked from aniani/vim

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 <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
h-east
2024-12-09 20:05:59 +01:00
committed by Christian Brabandt
parent ad4764f65b
commit 36f36715e6
2 changed files with 32 additions and 29 deletions

View File

@@ -1324,8 +1324,8 @@ wait_return(int redraw)
++allow_keys; ++allow_keys;
// Temporarily disable Recording. If Recording is active, the // Temporarily disable Recording. If Recording is active, the
// character will be recorded later, since it will be added to the // character will be recorded later, since it will be added to
// typebuf after the loop // the typebuf after the loop
save_reg_recording = reg_recording; save_reg_recording = reg_recording;
save_scriptout = scriptout; save_scriptout = scriptout;
reg_recording = 0; reg_recording = 0;
@@ -1339,9 +1339,10 @@ wait_return(int redraw)
scriptout = save_scriptout; scriptout = save_scriptout;
#ifdef FEAT_CLIPBOARD #ifdef FEAT_CLIPBOARD
// Strange way to allow copying (yanking) a modeless selection at // Strange way to allow copying (yanking) a modeless selection
// the hit-enter prompt. Use CTRL-Y, because the same is used in // at the hit-enter prompt. Use CTRL-Y, because the same is
// Cmdline-mode and it's harmless when there is no selection. // used in Cmdline-mode and it's harmless when there is no
// selection.
if (c == Ctrl_Y && clip_star.state == SELECT_DONE) if (c == Ctrl_Y && clip_star.state == SELECT_DONE)
{ {
clip_copy_modeless_selection(TRUE); clip_copy_modeless_selection(TRUE);
@@ -1351,14 +1352,14 @@ wait_return(int redraw)
/* /*
* Allow scrolling back in the messages. * Allow scrolling back in the messages.
* Also accept scroll-down commands when messages fill the screen, * Also accept scroll-down commands when messages fill the
* to avoid that typing one 'j' too many makes the messages * screen, to avoid that typing one 'j' too many makes the
* disappear. * messages disappear.
*/ */
if (p_more && !p_cp) if (p_more && !p_cp)
{ {
if (c == 'b' || c == 'k' || c == 'u' || c == 'g' 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) if (msg_scrolled > Rows)
// scroll back to show older messages // scroll back to show older messages
@@ -1391,36 +1392,36 @@ wait_return(int redraw)
c = K_IGNORE; c = K_IGNORE;
} }
} while ((had_got_int && c == Ctrl_C) } while ((had_got_int && c == Ctrl_C)
|| c == K_IGNORE || c == K_IGNORE
#ifdef FEAT_GUI #ifdef FEAT_GUI
|| c == K_VER_SCROLLBAR || c == K_HOR_SCROLLBAR || c == K_VER_SCROLLBAR || c == K_HOR_SCROLLBAR
#endif #endif
|| c == K_LEFTDRAG || c == K_LEFTRELEASE || c == K_LEFTDRAG || c == K_LEFTRELEASE
|| c == K_MIDDLEDRAG || c == K_MIDDLERELEASE || c == K_MIDDLEDRAG || c == K_MIDDLERELEASE
|| c == K_RIGHTDRAG || c == K_RIGHTRELEASE || c == K_RIGHTDRAG || c == K_RIGHTRELEASE
|| c == K_MOUSELEFT || c == K_MOUSERIGHT || c == K_MOUSELEFT || c == K_MOUSERIGHT
|| c == K_MOUSEDOWN || c == K_MOUSEUP || c == K_MOUSEDOWN || c == K_MOUSEUP
|| c == K_MOUSEMOVE || c == K_MOUSEMOVE
|| (!mouse_has(MOUSE_RETURN) || (!mouse_has(MOUSE_RETURN)
&& mouse_row < msg_row && mouse_row < msg_row
&& (c == K_LEFTMOUSE && (c == K_LEFTMOUSE
|| c == K_MIDDLEMOUSE || c == K_MIDDLEMOUSE
|| c == K_RIGHTMOUSE || c == K_RIGHTMOUSE
|| c == K_X1MOUSE || c == K_X1MOUSE
|| c == K_X2MOUSE)) || c == K_X2MOUSE))
); );
ui_breakcheck(); ui_breakcheck();
// Avoid that the mouse-up event causes Visual mode to start. // Avoid that the mouse-up event causes Visual mode to start.
if (c == K_LEFTMOUSE || c == K_MIDDLEMOUSE || c == K_RIGHTMOUSE 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); (void)jump_to_mouse(MOUSE_SETPOS, NULL, 0);
else if (vim_strchr((char_u *)"\r\n ", c) == NULL && c != Ctrl_C) else if (vim_strchr((char_u *)"\r\n ", c) == NULL && c != Ctrl_C)
{ {
// Put the character back in the typeahead buffer. Don't use the // Put the character back in the typeahead buffer. Don't use
// stuff buffer, because lmaps wouldn't work. // the stuff buffer, because lmaps wouldn't work.
ins_char_typebuf(vgetc_char, vgetc_mod_mask); 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 // typeahead
} }
} }

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 */
/**/
916,
/**/ /**/
915, 915,
/**/ /**/