0
0
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00

updated for version 7.0078

This commit is contained in:
Bram Moolenaar
2005-06-01 21:56:33 +00:00
parent d6f676daaf
commit 6c0b44b5bf
6 changed files with 44 additions and 30 deletions

View File

@@ -38,11 +38,11 @@ static garray_T user_digraphs = {0, 0, sizeof(digr_T), 10, NULL};
* Note: Characters marked with XX are not included literally, because some
* compilers cannot handle them (Amiga SAS/C is the most picky one).
*/
static digr_T digraphdefault[] =
#if defined(MSDOS) || defined(OS2)
/*
* MSDOS digraphs.
*/
digr_T digraphdefault[] =
{{'C', ',', 128}, /* ~@ XX */
{'u', '"', 129}, /* <20> */
{'e', '\'', 130}, /* <20> */
@@ -111,7 +111,6 @@ digr_T digraphdefault[] =
/*
* ATARI digraphs
*/
digr_T digraphdefault[] =
{{'C', ',', 128}, /* ~@ XX */
{'u', '"', 129}, /* <20> */
{'e', '\'', 130}, /* <20> */
@@ -178,7 +177,6 @@ digr_T digraphdefault[] =
/*
* different HPUX digraphs
*/
digr_T digraphdefault[] =
{{'A', '`', 161}, /* <20> */
{'A', '^', 162}, /* <20> */
{'E', '`', 163}, /* <20> */
@@ -285,7 +283,6 @@ digr_T digraphdefault[] =
* EBCDIC - ISO digraphs
* TODO: EBCDIC Table is Code-Page 1047
*/
digr_T digraphdefault[] =
{{'a', '^', 66}, /* <20> */
{'a', '"', 67}, /* <20> */
{'a', '`', 68}, /* <20> */
@@ -395,7 +392,6 @@ digr_T digraphdefault[] =
/*
* Macintosh digraphs
*/
digr_T digraphdefault[] =
{{'a', 't', 64}, /* @ */
{'A', '"', 128}, /* ~@ XX */
{'A', 'o', 129}, /* <20> */
@@ -526,7 +522,6 @@ digr_T digraphdefault[] =
/*
* digraphs compatible with Vim 5.x
*/
digr_T digraphdefault[] =
{{'~', '!', 161}, /* <20> */
{'c', '|', 162}, /* <20> */
{'$', '$', 163}, /* <20> */
@@ -635,7 +630,6 @@ digr_T digraphdefault[] =
* digraphs for Unicode from RFC1345
* (also work for ISO-8859-1 aka latin1)
*/
digr_T digraphdefault[] =
{
{'N', 'U', 0x0a}, /* LF for NUL */
{'S', 'H', 0x01},

View File

@@ -198,10 +198,10 @@ static int can_cindent; /* may do cindenting on this line */
static int old_indent = 0; /* for ^^D command in insert mode */
#ifdef FEAT_RIGHTLEFT
int revins_on; /* reverse insert mode on */
int revins_chars; /* how much to skip after edit */
int revins_legal; /* was the last char 'legal'? */
int revins_scol; /* start column of revins session */
static int revins_on; /* reverse insert mode on */
static int revins_chars; /* how much to skip after edit */
static int revins_legal; /* was the last char 'legal'? */
static int revins_scol; /* start column of revins session */
#endif
#if defined(FEAT_MBYTE) && defined(MACOS_CLASSIC)
@@ -5432,9 +5432,9 @@ echeck_abbr(c)
* characters will be left on the stack above the newly inserted character.
*/
char_u *replace_stack = NULL;
long replace_stack_nr = 0; /* next entry in replace stack */
long replace_stack_len = 0; /* max. number of entries */
static char_u *replace_stack = NULL;
static long replace_stack_nr = 0; /* next entry in replace stack */
static long replace_stack_len = 0; /* max. number of entries */
void
replace_push(c)

View File

@@ -7432,16 +7432,16 @@ hl_do_font(idx, arg, do_normal, do_menu, do_tooltip)
* Note that this table is used by ALL buffers. This is required because the
* GUI can redraw at any time for any buffer.
*/
garray_T term_attr_table = {0, 0, 0, 0, NULL};
static garray_T term_attr_table = {0, 0, 0, 0, NULL};
#define TERM_ATTR_ENTRY(idx) ((attrentry_T *)term_attr_table.ga_data)[idx]
garray_T cterm_attr_table = {0, 0, 0, 0, NULL};
static garray_T cterm_attr_table = {0, 0, 0, 0, NULL};
#define CTERM_ATTR_ENTRY(idx) ((attrentry_T *)cterm_attr_table.ga_data)[idx]
#ifdef FEAT_GUI
garray_T gui_attr_table = {0, 0, 0, 0, NULL};
static garray_T gui_attr_table = {0, 0, 0, 0, NULL};
#define GUI_ATTR_ENTRY(idx) ((attrentry_T *)gui_attr_table.ga_data)[idx]
#endif

View File

@@ -144,7 +144,7 @@ static char_u *vim_tgetstr __ARGS((char *s, char_u **pp));
static int detected_8bit = FALSE; /* detected 8-bit terminal */
struct builtin_term builtin_termcaps[] =
static struct builtin_term builtin_termcaps[] =
{
#if defined(FEAT_GUI)
@@ -2418,9 +2418,9 @@ tltoa(i)
* minimal tgoto() implementation.
* no padding and we only parse for %i %d and %+char
*/
char *tgoto __ARGS((char *, int, int));
static char *tgoto __ARGS((char *, int, int));
char *
static char *
tgoto(cm, x, y)
char *cm;
int x, y;
@@ -3491,7 +3491,7 @@ scroll_region_reset()
* List of terminal codes that are currently recognized.
*/
struct termcode
static struct termcode
{
char_u name[2]; /* termcap name of entry */
char_u *code; /* terminal code (in allocated memory) */