mirror of
https://github.com/vim/vim.git
synced 2025-07-25 10:54:51 -04:00
patch 8.2.5154: still mentioning version8, some cosmetic issues
Problem: Still mentioning version8, some cosmetic issues. Solution: Prefer mentioning version9, cosmetic improvements.
This commit is contained in:
parent
1b096b0d4a
commit
abd56da30b
1
Filelist
1
Filelist
@ -1017,6 +1017,7 @@ LANG_GEN = \
|
|||||||
runtime/spell/README.txt \
|
runtime/spell/README.txt \
|
||||||
runtime/spell/??/*.diff \
|
runtime/spell/??/*.diff \
|
||||||
runtime/spell/??/main.aap \
|
runtime/spell/??/main.aap \
|
||||||
|
runtime/spell/sr/README_sr.txt \
|
||||||
runtime/spell/tet/*.diff \
|
runtime/spell/tet/*.diff \
|
||||||
runtime/spell/tet/main.aap \
|
runtime/spell/tet/main.aap \
|
||||||
runtime/spell/check/main.aap \
|
runtime/spell/check/main.aap \
|
||||||
|
@ -205,7 +205,6 @@
|
|||||||
#Tandem/NSK (c) Matthew Woehlke
|
#Tandem/NSK (c) Matthew Woehlke
|
||||||
#Unisys 6035 cc +X11 Motif 5.3 (8) Glauber Ribeiro
|
#Unisys 6035 cc +X11 Motif 5.3 (8) Glauber Ribeiro
|
||||||
#ESIX V4.2 cc +X11 6.0 (a) Reinhard Wobst
|
#ESIX V4.2 cc +X11 6.0 (a) Reinhard Wobst
|
||||||
#Mac OS X 10.[23] gcc Carbon 6.2 (x) Bram Moolenaar
|
|
||||||
# }}}
|
# }}}
|
||||||
|
|
||||||
# (*) Remarks: {{{
|
# (*) Remarks: {{{
|
||||||
|
12
src/if_tcl.c
12
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)
|
for (i = 0; tcl_funcname_table[i].ptr; ++i)
|
||||||
{
|
{
|
||||||
if (!(*tcl_funcname_table[i].ptr = symbol_from_dll(hTclLib,
|
if (!(*tcl_funcname_table[i].ptr = symbol_from_dll(hTclLib,
|
||||||
tcl_funcname_table[i].name)))
|
tcl_funcname_table[i].name)))
|
||||||
{
|
{
|
||||||
close_dll(hTclLib);
|
close_dll(hTclLib);
|
||||||
hTclLib = NULL;
|
hTclLib = NULL;
|
||||||
if (verbose)
|
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;
|
return FAIL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -263,11 +264,13 @@ tcl_enabled(int verbose)
|
|||||||
{
|
{
|
||||||
Tcl_Interp *interp;
|
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);
|
dll_Tcl_FindExecutable(find_executable_arg);
|
||||||
|
|
||||||
if ((interp = dll_Tcl_CreateInterp()) != NULL)
|
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);
|
Tcl_DeleteInterp(interp);
|
||||||
stubs_initialized = TRUE;
|
stubs_initialized = TRUE;
|
||||||
@ -280,6 +283,9 @@ tcl_enabled(int verbose)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(EXITFREE) || defined(PROTO)
|
#if defined(EXITFREE) || defined(PROTO)
|
||||||
|
/*
|
||||||
|
* Called once when exiting.
|
||||||
|
*/
|
||||||
void
|
void
|
||||||
vim_tcl_finalize(void)
|
vim_tcl_finalize(void)
|
||||||
{
|
{
|
||||||
|
@ -175,7 +175,8 @@ static void sig_winch SIGPROTOARG;
|
|||||||
#endif
|
#endif
|
||||||
#if defined(SIGTSTP)
|
#if defined(SIGTSTP)
|
||||||
static void sig_tstp SIGPROTOARG;
|
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;
|
static volatile sig_atomic_t in_mch_suspend = FALSE;
|
||||||
#endif
|
#endif
|
||||||
#if defined(SIGINT)
|
#if defined(SIGINT)
|
||||||
|
@ -2023,7 +2023,7 @@ vim_regsub_both(
|
|||||||
|
|
||||||
// Although unlikely, it is possible that the expression invokes a
|
// Although unlikely, it is possible that the expression invokes a
|
||||||
// substitute command (it might fail, but still). Therefore keep
|
// substitute command (it might fail, but still). Therefore keep
|
||||||
// an array if eval results.
|
// an array of eval results.
|
||||||
++nesting;
|
++nesting;
|
||||||
|
|
||||||
if (expr != NULL)
|
if (expr != NULL)
|
||||||
|
@ -1343,8 +1343,6 @@ endfunc
|
|||||||
|
|
||||||
" Test for dropping files into a window in GUI
|
" Test for dropping files into a window in GUI
|
||||||
func DropFilesInCmdLine()
|
func DropFilesInCmdLine()
|
||||||
CheckFeature drop_file
|
|
||||||
|
|
||||||
call feedkeys(":\"", 'L')
|
call feedkeys(":\"", 'L')
|
||||||
let d = #{files: ['a.c', 'b.c'], row: &lines, col: 1, modifiers: 0}
|
let d = #{files: ['a.c', 'b.c'], row: &lines, col: 1, modifiers: 0}
|
||||||
call test_gui_event('dropfiles', d)
|
call test_gui_event('dropfiles', d)
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
* Vim originated from Stevie version 3.6 (Fish disk 217) by GRWalter (Fred)
|
* Vim originated from Stevie version 3.6 (Fish disk 217) by GRWalter (Fred)
|
||||||
* It has been changed beyond recognition since then.
|
* 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 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 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".
|
* 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[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
5154,
|
||||||
/**/
|
/**/
|
||||||
5153,
|
5153,
|
||||||
/**/
|
/**/
|
||||||
@ -11533,7 +11536,7 @@ intro_message(
|
|||||||
"",
|
"",
|
||||||
N_("type :q<Enter> to exit "),
|
N_("type :q<Enter> to exit "),
|
||||||
N_("type :help<Enter> or <F1> for on-line help"),
|
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,
|
NULL,
|
||||||
"",
|
"",
|
||||||
N_("Running in Vi compatible mode"),
|
N_("Running in Vi compatible mode"),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user