patch 8.2.5154: still mentioning version8, some cosmetic issues

Problem:    Still mentioning version8, some cosmetic issues.
Solution:   Prefer mentioning version9, cosmetic improvements.

diff --git a/Filelist b/Filelist
index ec8ae5bbaaf43bcfff3ff854e77f49ad00f83588..4a2bb151be424d9ed7d4b76c3e3252fa8e44c1c9 100644 (file)
--- a/Filelist
+++ b/Filelist
@@ -1017,6 +1017,7 @@ LANG_GEN = \
                runtime/spell/README.txt \
                runtime/spell/??/*.diff \
                runtime/spell/??/main.aap \
+               runtime/spell/sr/README_sr.txt \
                runtime/spell/tet/*.diff \
                runtime/spell/tet/main.aap \
                runtime/spell/check/main.aap \

diff --git a/src/Makefile b/src/Makefile
index a63b9ce2ee5fc5888f1dd8c56027e0ddd21da4e4..3cd1ae707bbd90c5a2d7b30af3cc71235c55fbce 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -205,7 +205,6 @@
 #Tandem/NSK                                                 (c) Matthew Woehlke
 #Unisys 6035         cc             +X11 Motif         5.3  (8) Glauber Ribeiro
 #ESIX V4.2           cc             +X11               6.0  (a) Reinhard Wobst
-#Mac OS X 10.[23]     gcc           Carbon             6.2  (x) Bram Moolenaar
 # }}}
 
 # (*)  Remarks: {{{

diff --git a/src/if_tcl.c b/src/if_tcl.c
index 8a6af8db6b721a472a30789dce8403950659ce88..9e018a2e27769bfa5bb6b83b0d1c5cfe9f546930 100644 (file)
--- a/src/if_tcl.c
+++ b/src/if_tcl.c
@@ -221,12 +221,13 @@ tcl_runtime_link_init(char *libname, int verbose)
     for (i = 0; tcl_funcname_table[i].ptr; ++i)
     {
        if (!(*tcl_funcname_table[i].ptr = symbol_from_dll(hTclLib,
-                       tcl_funcname_table[i].name)))
+                                                 tcl_funcname_table[i].name)))
        {
            close_dll(hTclLib);
            hTclLib = NULL;
            if (verbose)
-               semsg(_(e_could_not_load_library_function_str), tcl_funcname_table[i].name);
+               semsg(_(e_could_not_load_library_function_str),
+                                                  tcl_funcname_table[i].name);
            return FAIL;
        }
     }
@@ -263,11 +264,13 @@ tcl_enabled(int verbose)
     {
        Tcl_Interp *interp;
 
+       // Note: the library will allocate memory to store the executable name,
+       // which will be reported as possibly leaked by valgrind.
        dll_Tcl_FindExecutable(find_executable_arg);
 
        if ((interp = dll_Tcl_CreateInterp()) != NULL)
        {
-           if (Tcl_InitStubs(interp, DYNAMIC_TCL_VER, 0))
+           if (Tcl_InitStubs(interp, DYNAMIC_TCL_VER, 0) != NULL)
            {
                Tcl_DeleteInterp(interp);
                stubs_initialized = TRUE;
@@ -280,6 +283,9 @@ tcl_enabled(int verbose)
 #endif
 
 #if defined(EXITFREE) || defined(PROTO)
+/*
+ * Called once when exiting.
+ */
     void
 vim_tcl_finalize(void)
 {

diff --git a/src/os_unix.c b/src/os_unix.c
index 260a84724276eada9344483d340ef8bf4b7be398..18c766d246b3066512a9d8eca75ce20d7909fe90 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -175,7 +175,8 @@ static void sig_winch SIGPROTOARG;
 #endif
 #if defined(SIGTSTP)
 static void sig_tstp SIGPROTOARG;
-// volatile because it is used in signal handler sig_tstp() and sigcont_handler().
+// volatile because it is used in signal handler sig_tstp() and
+// sigcont_handler().
 static volatile sig_atomic_t in_mch_suspend = FALSE;
 #endif
 #if defined(SIGINT)

diff --git a/src/regexp.c b/src/regexp.c
index e6b75ea59ea51c249a7636809f4d3bf1fea91d2b..2cbe64eb89caea62d5b6d745cdf57d42c742dd9d 100644 (file)
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -2023,7 +2023,7 @@ vim_regsub_both(
 
            // Although unlikely, it is possible that the expression invokes a
            // substitute command (it might fail, but still).  Therefore keep
-           // an array if eval results.
+           // an array of eval results.
            ++nesting;
 
            if (expr != NULL)

diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index 373a0a25ce8a1df6c7f759f48e9ea35ecd50646d..2612812b62f6157f246ab971fbf1498d1482daea 100644 (file)
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -1343,8 +1343,6 @@ endfunc
 
 " Test for dropping files into a window in GUI
 func DropFilesInCmdLine()
-  CheckFeature drop_file
-
   call feedkeys(":\"", 'L')
   let d = #{files: ['a.c', 'b.c'], row: &lines, col: 1, modifiers: 0}
   call test_gui_event('dropfiles', d)

diff --git a/src/version.c b/src/version.c
index 27da2ee49d437790f483800b7e046a947a72871e..a915c5c2f0c20af5a43ce0e9dbf270531a0b3c13 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -13,6 +13,7 @@
  * Vim originated from Stevie version 3.6 (Fish disk 217) by GRWalter (Fred)
  * It has been changed beyond recognition since then.
  *
+ * Differences between version 8.2 and 9.0 can be found with ":help version9".
  * Differences between version 7.4 and 8.x can be found with ":help version8".
  * Differences between version 6.4 and 7.x can be found with ":help version7".
  * Differences between version 5.8 and 6.x can be found with ":help version6".
@@ -734,6 +735,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5154,
 /**/
     5153,
 /**/
@@ -11533,7 +11536,7 @@ intro_message(
        "",
        N_("type  :q<Enter>               to exit         "),
        N_("type  :help<Enter>  or  <F1>  for on-line help"),
-       N_("type  :help version8<Enter>   for version info"),
+       N_("type  :help version9<Enter>   for version info"),
        NULL,
        "",
        N_("Running in Vi compatible mode"),