thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

updated for version 7.0078

Browse Source
This commit is contained in:
Bram Moolenaar 2005-06-01 21:51:55 +00:00
parent 2c29beed4c
commit d6f676daaf
8 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fileio.c
View File

@ -6753,12 +6753,12 @@ typedef struct AutoPatCmd
struct AutoPatCmd *next; /* chain of active apc-s for auto-invalidation*/ struct AutoPatCmd *next; /* chain of active apc-s for auto-invalidation*/
} AutoPatCmd; } AutoPatCmd;
AutoPatCmd *active_apc_list = NULL; /* stack of active autocommands */ static AutoPatCmd *active_apc_list = NULL; /* stack of active autocommands */
/* /*
* augroups stores a list of autocmd group names. * augroups stores a list of autocmd group names.
*/ */
garray_T augroups = {0, 0, sizeof(char_u *), 10, NULL}; static garray_T augroups = {0, 0, sizeof(char_u *), 10, NULL};
#define AUGROUP_NAME(i) (((char_u **)augroups.ga_data)[i]) #define AUGROUP_NAME(i) (((char_u **)augroups.ga_data)[i])
/* /*

10
src/if_cscope.c
View File

@ -1726,6 +1726,7 @@ cs_file_results(f, nummatches_a)
* *
* get parsed cscope output and calls cs_make_vim_style_matches to convert * get parsed cscope output and calls cs_make_vim_style_matches to convert
* into ctags format * into ctags format
* When there are no matches sets "*matches_p" to NULL.
*/ */
static void static void
cs_fill_results(tagstr, totmatches, nummatches_a, matches_p, cntxts_p, matched) cs_fill_results(tagstr, totmatches, nummatches_a, matches_p, cntxts_p, matched)
@ -1790,9 +1791,18 @@ cs_fill_results(tagstr, totmatches, nummatches_a, matches_p, cntxts_p, matched)
} /* for all cscope connections */ } /* for all cscope connections */
parse_out: parse_out:
if (totsofar == 0)
{
/* No matches, free the arrays and return NULL in "*matches_p". */
vim_free(matches);
matches = NULL;
vim_free(cntxts);
cntxts = NULL;
}
*matched = totsofar; *matched = totsofar;
*matches_p = matches; *matches_p = matches;
*cntxts_p = cntxts; *cntxts_p = cntxts;
vim_free(buf); vim_free(buf);
} /* cs_fill_results */ } /* cs_fill_results */

10
src/mbyte.c
View File

@ -1949,7 +1949,7 @@ typedef struct
int offset; int offset;
} convertStruct; } convertStruct;
convertStruct foldCase[] = static convertStruct foldCase[] =
{ {
{0x41,0x5a,1,32}, {0xc0,0xd6,1,32}, {0xd8,0xde,1,32}, {0x41,0x5a,1,32}, {0xc0,0xd6,1,32}, {0xd8,0xde,1,32},
{0x100,0x12e,2,1}, {0x130,0x130,-1,-199}, {0x132,0x136,2,1}, {0x100,0x12e,2,1}, {0x130,0x130,-1,-199}, {0x132,0x136,2,1},
@ -2040,7 +2040,7 @@ utf_fold(a)
* from 0x41 to 0x5a inclusive, stepping by 1, are switched to lower (for * from 0x41 to 0x5a inclusive, stepping by 1, are switched to lower (for
* example) by adding 32. * example) by adding 32.
*/ */
convertStruct toLower[] = static convertStruct toLower[] =
{ {
{0x41,0x5a,1,32}, {0xc0,0xd6,1,32}, {0xd8,0xde,1,32}, {0x41,0x5a,1,32}, {0xc0,0xd6,1,32}, {0xd8,0xde,1,32},
{0x100,0x12e,2,1}, {0x130,0x130,-1,-199}, {0x132,0x136,2,1}, {0x100,0x12e,2,1}, {0x130,0x130,-1,-199}, {0x132,0x136,2,1},
@ -2075,7 +2075,7 @@ convertStruct toLower[] =
{0x212b,0x212b,-1,-8262}, {0xff21,0xff3a,1,32}, {0x10400,0x10427,1,40} {0x212b,0x212b,-1,-8262}, {0xff21,0xff3a,1,32}, {0x10400,0x10427,1,40}
}; };
convertStruct toUpper[] = static convertStruct toUpper[] =
{ {
{0x61,0x7a,1,-32}, {0xb5,0xb5,-1,743}, {0xe0,0xf6,1,-32}, {0x61,0x7a,1,-32}, {0xb5,0xb5,-1,743}, {0xe0,0xf6,1,-32},
{0xf8,0xfe,1,-32}, {0xff,0xff,-1,121}, {0x101,0x12f,2,-1}, {0xf8,0xfe,1,-32}, {0xff,0xff,-1,121}, {0x101,0x12f,2,-1},
@ -3134,8 +3134,8 @@ iconv_string(vcp, str, slen, unconvlenp)
#ifndef DYNAMIC_ICONV /* just generating prototypes */ #ifndef DYNAMIC_ICONV /* just generating prototypes */
# define HINSTANCE int # define HINSTANCE int
#endif #endif
HINSTANCE hIconvDLL = 0; static HINSTANCE hIconvDLL = 0;
HINSTANCE hMsvcrtDLL = 0; static HINSTANCE hMsvcrtDLL = 0;
# ifndef DYNAMIC_ICONV_DLL # ifndef DYNAMIC_ICONV_DLL
# define DYNAMIC_ICONV_DLL "iconv.dll" # define DYNAMIC_ICONV_DLL "iconv.dll"

2
src/misc2.c
View File

@ -3204,7 +3204,7 @@ typedef unsigned long ulg; /* unsigned 32-bit value */
static void make_crc_tab __ARGS((void)); static void make_crc_tab __ARGS((void));
ulg crc_32_tab[256]; static ulg crc_32_tab[256];
/* /*
* Fill the CRC table. * Fill the CRC table.

4
src/os_win32.c
View File

@ -149,7 +149,7 @@ typedef BOOL (__stdcall *PFNGCKLN)(LPSTR);
#else #else
typedef WINBASEAPI BOOL (WINAPI *PFNGCKLN)(LPSTR); typedef WINBASEAPI BOOL (WINAPI *PFNGCKLN)(LPSTR);
#endif #endif
PFNGCKLN s_pfnGetConsoleKeyboardLayoutName = NULL; static PFNGCKLN s_pfnGetConsoleKeyboardLayoutName = NULL;
#endif #endif
#if defined(__BORLANDC__) #if defined(__BORLANDC__)
@ -470,7 +470,7 @@ win32ssynch_cb(HWND hwnd, LPARAM lparam)
* combinations of function/arrow/etc keys. * combinations of function/arrow/etc keys.
*/ */
const static struct static const struct
{ {
WORD wVirtKey; WORD wVirtKey;
BOOL fAnsiKey; BOOL fAnsiKey;

2
src/quickfix.c
View File

@ -49,7 +49,7 @@ struct qfline_S
*/ */
#define LISTCOUNT 10 #define LISTCOUNT 10
struct qf_list static struct qf_list
{ {
qfline_T *qf_start; /* pointer to the first error */ qfline_T *qf_start; /* pointer to the first error */
qfline_T *qf_ptr; /* pointer to the current error */ qfline_T *qf_ptr; /* pointer to the current error */

2
src/regexp.c
View File

@ -6110,7 +6110,7 @@ typedef struct
/* 0xfb20 - 0xfb4f */ /* 0xfb20 - 0xfb4f */
decomp_T decomp_table[0xfb4f-0xfb20+1] = static decomp_T decomp_table[0xfb4f-0xfb20+1] =
{ {
{0x5e2,0,0}, /* 0xfb20 alt ayin */ {0x5e2,0,0}, /* 0xfb20 alt ayin */
{0x5d0,0,0}, /* 0xfb21 alt alef */ {0x5d0,0,0}, /* 0xfb21 alt alef */

4
src/version.h
View File

@ -36,5 +36,5 @@
#define VIM_VERSION_NODOT "vim70aa" #define VIM_VERSION_NODOT "vim70aa"
#define VIM_VERSION_SHORT "7.0aa" #define VIM_VERSION_SHORT "7.0aa"
#define VIM_VERSION_MEDIUM "7.0aa ALPHA" #define VIM_VERSION_MEDIUM "7.0aa ALPHA"
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 May 31)" #define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 1)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 May 31, compiled " #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 1, compiled "