Skip to content

Commit abd56da

Browse files
committed
patch 8.2.5154: still mentioning version8, some cosmetic issues
Problem: Still mentioning version8, some cosmetic issues. Solution: Prefer mentioning version9, cosmetic improvements.
1 parent 1b096b0 commit abd56da

7 files changed

Lines changed: 17 additions & 9 deletions

File tree

Filelist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,6 +1017,7 @@ LANG_GEN = \
10171017
runtime/spell/README.txt \
10181018
runtime/spell/??/*.diff \
10191019
runtime/spell/??/main.aap \
1020+
runtime/spell/sr/README_sr.txt \
10201021
runtime/spell/tet/*.diff \
10211022
runtime/spell/tet/main.aap \
10221023
runtime/spell/check/main.aap \

src/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@
205205
#Tandem/NSK (c) Matthew Woehlke
206206
#Unisys 6035 cc +X11 Motif 5.3 (8) Glauber Ribeiro
207207
#ESIX V4.2 cc +X11 6.0 (a) Reinhard Wobst
208-
#Mac OS X 10.[23] gcc Carbon 6.2 (x) Bram Moolenaar
209208
# }}}
210209

211210
# (*) Remarks: {{{

src/if_tcl.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,12 +221,13 @@ tcl_runtime_link_init(char *libname, int verbose)
221221
for (i = 0; tcl_funcname_table[i].ptr; ++i)
222222
{
223223
if (!(*tcl_funcname_table[i].ptr = symbol_from_dll(hTclLib,
224-
tcl_funcname_table[i].name)))
224+
tcl_funcname_table[i].name)))
225225
{
226226
close_dll(hTclLib);
227227
hTclLib = NULL;
228228
if (verbose)
229-
semsg(_(e_could_not_load_library_function_str), tcl_funcname_table[i].name);
229+
semsg(_(e_could_not_load_library_function_str),
230+
tcl_funcname_table[i].name);
230231
return FAIL;
231232
}
232233
}
@@ -263,11 +264,13 @@ tcl_enabled(int verbose)
263264
{
264265
Tcl_Interp *interp;
265266

267+
// Note: the library will allocate memory to store the executable name,
268+
// which will be reported as possibly leaked by valgrind.
266269
dll_Tcl_FindExecutable(find_executable_arg);
267270

268271
if ((interp = dll_Tcl_CreateInterp()) != NULL)
269272
{
270-
if (Tcl_InitStubs(interp, DYNAMIC_TCL_VER, 0))
273+
if (Tcl_InitStubs(interp, DYNAMIC_TCL_VER, 0) != NULL)
271274
{
272275
Tcl_DeleteInterp(interp);
273276
stubs_initialized = TRUE;
@@ -280,6 +283,9 @@ tcl_enabled(int verbose)
280283
#endif
281284

282285
#if defined(EXITFREE) || defined(PROTO)
286+
/*
287+
* Called once when exiting.
288+
*/
283289
void
284290
vim_tcl_finalize(void)
285291
{

src/os_unix.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ static void sig_winch SIGPROTOARG;
175175
#endif
176176
#if defined(SIGTSTP)
177177
static void sig_tstp SIGPROTOARG;
178-
// volatile because it is used in signal handler sig_tstp() and sigcont_handler().
178+
// volatile because it is used in signal handler sig_tstp() and
179+
// sigcont_handler().
179180
static volatile sig_atomic_t in_mch_suspend = FALSE;
180181
#endif
181182
#if defined(SIGINT)

src/regexp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2023,7 +2023,7 @@ vim_regsub_both(
20232023

20242024
// Although unlikely, it is possible that the expression invokes a
20252025
// substitute command (it might fail, but still). Therefore keep
2026-
// an array if eval results.
2026+
// an array of eval results.
20272027
++nesting;
20282028

20292029
if (expr != NULL)

src/testdir/test_gui.vim

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1343,8 +1343,6 @@ endfunc
13431343

13441344
" Test for dropping files into a window in GUI
13451345
func DropFilesInCmdLine()
1346-
CheckFeature drop_file
1347-
13481346
call feedkeys(":\"", 'L')
13491347
let d = #{files: ['a.c', 'b.c'], row: &lines, col: 1, modifiers: 0}
13501348
call test_gui_event('dropfiles', d)

src/version.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* Vim originated from Stevie version 3.6 (Fish disk 217) by GRWalter (Fred)
1414
* It has been changed beyond recognition since then.
1515
*
16+
* Differences between version 8.2 and 9.0 can be found with ":help version9".
1617
* Differences between version 7.4 and 8.x can be found with ":help version8".
1718
* Differences between version 6.4 and 7.x can be found with ":help version7".
1819
* Differences between version 5.8 and 6.x can be found with ":help version6".
@@ -734,6 +735,8 @@ static char *(features[]) =
734735

735736
static int included_patches[] =
736737
{ /* Add new patch number below this line */
738+
/**/
739+
5154,
737740
/**/
738741
5153,
739742
/**/
@@ -11533,7 +11536,7 @@ intro_message(
1153311536
"",
1153411537
N_("type :q<Enter> to exit "),
1153511538
N_("type :help<Enter> or <F1> for on-line help"),
11536-
N_("type :help version8<Enter> for version info"),
11539+
N_("type :help version9<Enter> for version info"),
1153711540
NULL,
1153811541
"",
1153911542
N_("Running in Vi compatible mode"),

0 commit comments

Comments
 (0)