]> git.ipfire.org Git - thirdparty/vim.git/commitdiff
patch 9.1.0916: messages.c is exceeding 80 columns v9.1.0916
authorh-east <h.east.727@gmail.com>
Mon, 9 Dec 2024 19:05:59 +0000 (20:05 +0100)
committerChristian Brabandt <cb@256bit.org>
Mon, 9 Dec 2024 19:05:59 +0000 (20:05 +0100)
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>
src/message.c
src/version.c

index 0fb0013d5ac1075c6d032c75d4634647cbd2668b..24984123b4398e4f4f122b53da128a50312ad41f 100644 (file)
@@ -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 *)"\r\n ", 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
            }
        }
index 07bb851f1b873af3ebd9ffaa09e8fd721b3520d2..5933af3b897d48a2c75ebd6c1a8674f97b963eea 100644 (file)
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    916,
 /**/
     915,
 /**/