forked from aniani/vim
updated for version 7.0219
This commit is contained in:
@@ -2465,7 +2465,7 @@ draw_cmdline(start, len)
|
||||
int j;
|
||||
int newlen = 0;
|
||||
int mb_l;
|
||||
int pc, pc1;
|
||||
int pc, pc1 = 0;
|
||||
int prev_c = 0;
|
||||
int prev_c1 = 0;
|
||||
int u8c;
|
||||
@@ -3480,7 +3480,7 @@ ExpandEscape(xp, str, numfiles, files, options)
|
||||
{
|
||||
vim_free(files[i]);
|
||||
files[i] = p;
|
||||
#if defined(BACKSLASH_IN_FILENAME) || defined(COLON_AS_PATHSEP)
|
||||
#if defined(BACKSLASH_IN_FILENAME)
|
||||
p = vim_strsave_escaped(files[i], (char_u *)" ");
|
||||
if (p != NULL)
|
||||
{
|
||||
|
||||
@@ -3698,11 +3698,7 @@ gui_mch_get_color(char_u *name)
|
||||
char line[LINE_LEN];
|
||||
char_u *fname;
|
||||
|
||||
#ifdef COLON_AS_PATHSEP
|
||||
fname = expand_env_save((char_u *)"$VIMRUNTIME:rgb.txt");
|
||||
#else
|
||||
fname = expand_env_save((char_u *)"$VIMRUNTIME/rgb.txt");
|
||||
#endif
|
||||
if (fname == NULL)
|
||||
return INVALCOLOR;
|
||||
|
||||
|
||||
14
src/option.c
14
src/option.c
@@ -416,6 +416,14 @@ struct vimoption
|
||||
|
||||
#define ISK_LATIN1 (char_u *)"@,48-57,_,192-255"
|
||||
|
||||
/* 'isprint' for latin1 is also used for MS-Windows, where 0x80 is used for
|
||||
* the currency sign. Thus this isn't really latin1... */
|
||||
#if defined(MSDOS) || defined(MSWIN) || defined(OS2)
|
||||
# define ISP_LATIN1 (char_u *)"@,128,161-255"
|
||||
#else
|
||||
# define ISP_LATIN1 (char_u *)"@,161-255"
|
||||
#endif
|
||||
|
||||
/*
|
||||
* options[] is initialized here.
|
||||
* The order of the options MUST be alphabetic for ":set all" and findoption().
|
||||
@@ -1440,7 +1448,7 @@ static struct vimoption
|
||||
/* all chars above 63 are printable */
|
||||
(char_u *)"63-255",
|
||||
# else
|
||||
(char_u *)"@,161-255",
|
||||
ISP_LATIN1,
|
||||
# endif
|
||||
#endif
|
||||
(char_u *)0L}},
|
||||
@@ -3210,11 +3218,11 @@ set_init_1()
|
||||
* latin1. Also set the defaults for when 'nocompatible' is
|
||||
* set. */
|
||||
set_string_option_direct((char_u *)"isp", -1,
|
||||
(char_u *)"@,161-255", OPT_FREE, SID_NONE);
|
||||
ISP_LATIN1, OPT_FREE, SID_NONE);
|
||||
set_string_option_direct((char_u *)"isk", -1,
|
||||
ISK_LATIN1, OPT_FREE, SID_NONE);
|
||||
opt_idx = findoption((char_u *)"isp");
|
||||
options[opt_idx].def_val[VIM_DEFAULT] = (char_u *)"@,161-255";
|
||||
options[opt_idx].def_val[VIM_DEFAULT] = ISP_LATIN1;
|
||||
opt_idx = findoption((char_u *)"isk");
|
||||
options[opt_idx].def_val[VIM_DEFAULT] = ISK_LATIN1;
|
||||
(void)init_chartab();
|
||||
|
||||
@@ -36,5 +36,5 @@
|
||||
#define VIM_VERSION_NODOT "vim70aa"
|
||||
#define VIM_VERSION_SHORT "7.0aa"
|
||||
#define VIM_VERSION_MEDIUM "7.0aa ALPHA"
|
||||
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2006 Mar 8)"
|
||||
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2006 Mar 8, compiled "
|
||||
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2006 Mar 9)"
|
||||
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2006 Mar 9, compiled "
|
||||
|
||||
Reference in New Issue
Block a user