neovim

commit 9c2fdfe6e7937e622a121dce42fde5aa602911a4
parent c0549b9c4763bddeebccca6361027f87fb78eb83
Author: bfredl <bjorn.linse@gmail.com>
Date:   Sat, 16 Mar 2024 09:32:52 +0100

Merge pull request #27877 from bfredl/pseudorandom

fix(intro): redrawing intro exposing pseudo-randomness
Diffstat:
M
src/nvim/version.c
 | 
15
---------------
M
test/functional/ui/messages_spec.lua
 | 
12
++++++++----

2 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/src/nvim/version.c b/src/nvim/version.c
@@ -2759,11 +2759,6 @@ void intro_message(bool colon)
     blanklines = 0;
   }
 
-  // Show the sponsor and register message one out of four times, the Uganda
-  // message two out of four times.
-  int sponsor = (int)time(NULL);
-  sponsor = ((sponsor & 2) == 0) - ((sponsor & 4) == 0);
-
   // start displaying the message lines after half of the blank lines
   int row = blanklines / 2;
 
@@ -2781,16 +2776,6 @@ void intro_message(bool colon)
         mesg = xmallocz((size_t)mesg_size);
         snprintf(mesg, (size_t)mesg_size + 1, p,
                  STR(NVIM_VERSION_MAJOR), STR(NVIM_VERSION_MINOR));
-      } else if (sponsor != 0) {
-        if (strstr(p, "children") != NULL) {
-          p = sponsor < 0
-              ? N_("Sponsor Vim development!")
-              : N_("Become a registered Vim user!");
-        } else if (strstr(p, "iccf") != NULL) {
-          p = sponsor < 0
-              ? N_("type  :help sponsor<Enter>    for information ")
-              : N_("type  :help register<Enter>   for information ");
-        }
       }
 
       if (mesg == NULL) {
diff --git a/test/functional/ui/messages_spec.lua b/test/functional/ui/messages_spec.lua
@@ -1623,7 +1623,8 @@ describe('ui/ext_messages', function()
       {1:~                                                                               }|
       {1:~{MATCH: +}}type  :help news{5:<Enter>} to see changes in v{MATCH:%d+%.%d+}{1:{MATCH: +}}|
       {1:~                                                                               }|
-      {MATCH:.*}|*2
+      {1:~                        }Help poor children in Uganda!{1:                          }|
+      {1:~                }type  :help iccf{5:<Enter>}       for information {1:                 }|
       {1:~                                                                               }|*5
     ]])
 
@@ -1645,7 +1646,8 @@ describe('ui/ext_messages', function()
       {1:~                                                                               }|
       {1:~{MATCH: +}}type  :help news{5:<Enter>} to see changes in v{MATCH:%d+%.%d+}{1:{MATCH: +}}|
       {1:~                                                                               }|
-      {MATCH:.*}|*2
+      {1:~                        }Help poor children in Uganda!{1:                          }|
+      {1:~                }type  :help iccf{5:<Enter>}       for information {1:                 }|
       {1:~                                                                               }|*5
     ]],
       showmode = { { '-- INSERT --', 3 } },
@@ -1678,7 +1680,8 @@ describe('ui/ext_messages', function()
                                                                                       |
       {MATCH: +}type  :help news{5:<Enter>} to see changes in v{MATCH:%d+%.%d+ +}|
                                                                                       |
-      {MATCH:.*}|*2
+                               Help poor children in Uganda!                          |
+                       type  :help iccf{5:<Enter>}       for information                  |
                                                                                       |*5
     ]],
       messages = {
@@ -1783,7 +1786,8 @@ it('ui/ext_multigrid supports intro screen', function()
       {1:~                                                                               }|
       {1:~{MATCH: +}}type  :help news{5:<Enter>} to see changes in v{MATCH:%d+%.%d+}{1:{MATCH: +}}|
       {1:~                                                                               }|
-      {MATCH:.*}|*2
+      {1:~                        }Help poor children in Uganda!{1:                          }|
+      {1:~                }type  :help iccf{5:<Enter>}       for information {1:                 }|
       {1:~                                                                               }|*4
     ## grid 3
                                                                                       |