aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.0064

Browse Source
This commit is contained in:
Bram Moolenaar
2005-03-25 21:45:43 +00:00
parent 43b604cddc
commit a88d968da1
7 changed files with 66 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/lang/menu_ko_kr.euckr.vim
View File

@@ -48,7 +48,7 @@ menutrans &Paste<Tab>"+gP
menutrans Put\ &Before<Tab>[p <09>տ<EFBFBD>\ <20><><EFBFBD>̱<EFBFBD>(&B)<Tab>[p menutrans Put\ &Before<Tab>[p <09>տ<EFBFBD>\ <20><><EFBFBD>̱<EFBFBD>(&B)<Tab>[p
menutrans Put\ &After<Tab>]p <09>ڿ<EFBFBD>\ <20><><EFBFBD>̱<EFBFBD>(&A)<Tab>]p menutrans Put\ &After<Tab>]p <09>ڿ<EFBFBD>\ <20><><EFBFBD>̱<EFBFBD>(&A)<Tab>]p
menutrans &Delete<Tab>x <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&D)<Tab>x menutrans &Delete<Tab>x <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&D)<Tab>x
menutrans &Select\ all<Tab>ggVG <09><><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&S)<Tab>ggVG menutrans &Select\ All<Tab>ggVG <09><><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&S)<Tab>ggVG
menutrans &Find\.\.\. ã<EFBFBD><EFBFBD>(&F)\.\.\. menutrans &Find\.\.\. ã<EFBFBD><EFBFBD>(&F)\.\.\.
menutrans Find\ and\ Rep&lace\.\.\. ã<EFBFBD>Ƽ<EFBFBD>\ <20>ٲٱ<EFBFBD>(&l)\.\.\. menutrans Find\ and\ Rep&lace\.\.\. ã<EFBFBD>Ƽ<EFBFBD>\ <20>ٲٱ<EFBFBD>(&l)\.\.\.
menutrans Settings\ &Window <09><><EFBFBD><EFBFBD>\ â(&W) menutrans Settings\ &Window <09><><EFBFBD><EFBFBD>\ â(&W)
@@ -229,7 +229,7 @@ endif
" Syntax menu " Syntax menu
menutrans &Syntax <09><><EFBFBD><EFBFBD>(&S) menutrans &Syntax <09><><EFBFBD><EFBFBD>(&S)
menutrans &Show\ individual\ choices <EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>ð<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>׸<EFBFBD>\ <20><><EFBFBD><EFBFBD>(&S) menutrans &Show\ filetypes\ in\ menu <EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>ð<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>׸<EFBFBD>\ <20><><EFBFBD><EFBFBD>(&S)
menutrans Set\ '&syntax'\ only 'syntax'<EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>(&s) menutrans Set\ '&syntax'\ only 'syntax'<EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>(&s)
menutrans Set\ '&filetype'\ too 'filetype'<EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>(&f) menutrans Set\ '&filetype'\ too 'filetype'<EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>(&f)
menutrans &Off <09><><EFBFBD><EFBFBD>(&O) menutrans &Off <09><><EFBFBD><EFBFBD>(&O)

82
src/getchar.c
View File

@@ -1545,35 +1545,67 @@ vgetc()
(void)vgetorpeek(TRUE); (void)vgetorpeek(TRUE);
#endif #endif
if (c >= FIRST_KEYPAD && c <= LAST_KEYPAD) /* a keypad or special function key was not mapped, use it like
* its ASCII equivalent */
switch (c)
{ {
/* a keypad key was not mapped, use it like its ASCII equivalent */ case K_KPLUS: c = '+'; break;
switch (c) case K_KMINUS: c = '-'; break;
{ case K_KDIVIDE: c = '/'; break;
case K_KPLUS: c = '+'; break; case K_KMULTIPLY: c = '*'; break;
case K_KMINUS: c = '-'; break; case K_KENTER: c = CAR; break;
case K_KDIVIDE: c = '/'; break; case K_KPOINT:
case K_KMULTIPLY: c = '*'; break;
case K_KENTER: c = CAR; break;
case K_KPOINT:
#ifdef WIN32 #ifdef WIN32
/* Can be either '.' or a ',', * /* Can be either '.' or a ',', *
* depending on the type of keypad. */ * depending on the type of keypad. */
c = MapVirtualKey(VK_DECIMAL, 2); break; c = MapVirtualKey(VK_DECIMAL, 2); break;
#else #else
c = '.'; break; c = '.'; break;
#endif #endif
case K_K0: c = '0'; break; case K_K0: c = '0'; break;
case K_K1: c = '1'; break; case K_K1: c = '1'; break;
case K_K2: c = '2'; break; case K_K2: c = '2'; break;
case K_K3: c = '3'; break; case K_K3: c = '3'; break;
case K_K4: c = '4'; break; case K_K4: c = '4'; break;
case K_K5: c = '5'; break; case K_K5: c = '5'; break;
case K_K6: c = '6'; break; case K_K6: c = '6'; break;
case K_K7: c = '7'; break; case K_K7: c = '7'; break;
case K_K8: c = '8'; break; case K_K8: c = '8'; break;
case K_K9: c = '9'; break; case K_K9: c = '9'; break;
}
case K_XHOME:
case K_ZHOME: if (mod_mask == MOD_MASK_SHIFT)
{
c = K_S_HOME;
mod_mask = 0;
}
else if (mod_mask == MOD_MASK_CTRL)
{
c = K_C_HOME;
mod_mask = 0;
}
else
c = K_HOME;
break;
case K_XEND:
case K_ZEND: if (mod_mask == MOD_MASK_SHIFT)
{
c = K_S_END;
mod_mask = 0;
}
else if (mod_mask == MOD_MASK_CTRL)
{
c = K_C_END;
mod_mask = 0;
}
else
c = K_END;
break;
case K_XUP: c = K_UP; break;
case K_XDOWN: c = K_DOWN; break;
case K_XLEFT: c = K_LEFT; break;
case K_XRIGHT: c = K_RIGHT; break;
} }
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE

1
src/main.aap
View File

@@ -270,6 +270,7 @@ Source =
regexp.c regexp.c
screen.c screen.c
search.c search.c
spell.c
syntax.c syntax.c
tag.c tag.c
term.c term.c

2
src/message.c
View File

@@ -1953,7 +1953,6 @@ msg_puts_attr_len(str, maxlen, attr)
case BS: case BS:
case 'k': case 'k':
case K_UP: case K_UP:
case K_XUP:
if (!more_back_used) if (!more_back_used)
{ {
msg_moremsg(TRUE); msg_moremsg(TRUE);
@@ -1966,7 +1965,6 @@ msg_puts_attr_len(str, maxlen, attr)
case NL: case NL:
case 'j': case 'j':
case K_DOWN: case K_DOWN:
case K_XDOWN:
lines_left = 1; lines_left = 1;
break; break;
case ':': /* start new command line */ case ':': /* start new command line */

24
src/normal.c
View File

@@ -384,17 +384,13 @@ static const struct nv_cmd
{K_KINS, nv_edit, 0, 0}, {K_KINS, nv_edit, 0, 0},
{K_BS, nv_ctrlh, 0, 0}, {K_BS, nv_ctrlh, 0, 0},
{K_UP, nv_up, NV_SSS|NV_STS, FALSE}, {K_UP, nv_up, NV_SSS|NV_STS, FALSE},
{K_XUP, nv_up, NV_SSS|NV_STS, FALSE},
{K_S_UP, nv_page, NV_SS, BACKWARD}, {K_S_UP, nv_page, NV_SS, BACKWARD},
{K_DOWN, nv_down, NV_SSS|NV_STS, FALSE}, {K_DOWN, nv_down, NV_SSS|NV_STS, FALSE},
{K_XDOWN, nv_down, NV_SSS|NV_STS, FALSE},
{K_S_DOWN, nv_page, NV_SS, FORWARD}, {K_S_DOWN, nv_page, NV_SS, FORWARD},
{K_LEFT, nv_left, NV_SSS|NV_STS|NV_RL, 0}, {K_LEFT, nv_left, NV_SSS|NV_STS|NV_RL, 0},
{K_XLEFT, nv_left, NV_SSS|NV_STS|NV_RL, 0},
{K_S_LEFT, nv_bck_word, NV_SS|NV_RL, 0}, {K_S_LEFT, nv_bck_word, NV_SS|NV_RL, 0},
{K_C_LEFT, nv_bck_word, NV_SSS|NV_RL|NV_STS, 1}, {K_C_LEFT, nv_bck_word, NV_SSS|NV_RL|NV_STS, 1},
{K_RIGHT, nv_right, NV_SSS|NV_STS|NV_RL, 0}, {K_RIGHT, nv_right, NV_SSS|NV_STS|NV_RL, 0},
{K_XRIGHT, nv_right, NV_SSS|NV_STS|NV_RL, 0},
{K_S_RIGHT, nv_wordcmd, NV_SS|NV_RL, FALSE}, {K_S_RIGHT, nv_wordcmd, NV_SS|NV_RL, FALSE},
{K_C_RIGHT, nv_wordcmd, NV_SSS|NV_RL|NV_STS, TRUE}, {K_C_RIGHT, nv_wordcmd, NV_SSS|NV_RL|NV_STS, TRUE},
{K_PAGEUP, nv_page, NV_SSS|NV_STS, BACKWARD}, {K_PAGEUP, nv_page, NV_SSS|NV_STS, BACKWARD},
@@ -403,12 +399,10 @@ static const struct nv_cmd
{K_KPAGEDOWN, nv_page, NV_SSS|NV_STS, FORWARD}, {K_KPAGEDOWN, nv_page, NV_SSS|NV_STS, FORWARD},
{K_END, nv_end, NV_SSS|NV_STS, FALSE}, {K_END, nv_end, NV_SSS|NV_STS, FALSE},
{K_KEND, nv_end, NV_SSS|NV_STS, FALSE}, {K_KEND, nv_end, NV_SSS|NV_STS, FALSE},
{K_XEND, nv_end, NV_SSS|NV_STS, FALSE},
{K_S_END, nv_end, NV_SS, FALSE}, {K_S_END, nv_end, NV_SS, FALSE},
{K_C_END, nv_end, NV_SSS|NV_STS, TRUE}, {K_C_END, nv_end, NV_SSS|NV_STS, TRUE},
{K_HOME, nv_home, NV_SSS|NV_STS, 0}, {K_HOME, nv_home, NV_SSS|NV_STS, 0},
{K_KHOME, nv_home, NV_SSS|NV_STS, 0}, {K_KHOME, nv_home, NV_SSS|NV_STS, 0},
{K_XHOME, nv_home, NV_SSS|NV_STS, 0},
{K_S_HOME, nv_home, NV_SS, 0}, {K_S_HOME, nv_home, NV_SS, 0},
{K_C_HOME, nv_goto, NV_SSS|NV_STS, FALSE}, {K_C_HOME, nv_goto, NV_SSS|NV_STS, FALSE},
{K_DEL, nv_abbrev, 0, 0}, {K_DEL, nv_abbrev, 0, 0},
@@ -842,12 +836,10 @@ getcount:
{ {
case 'l': ca.cmdchar = 'h'; break; case 'l': ca.cmdchar = 'h'; break;
case K_RIGHT: ca.cmdchar = K_LEFT; break; case K_RIGHT: ca.cmdchar = K_LEFT; break;
case K_XRIGHT: ca.cmdchar = K_XLEFT; break;
case K_S_RIGHT: ca.cmdchar = K_S_LEFT; break; case K_S_RIGHT: ca.cmdchar = K_S_LEFT; break;
case K_C_RIGHT: ca.cmdchar = K_C_LEFT; break; case K_C_RIGHT: ca.cmdchar = K_C_LEFT; break;
case 'h': ca.cmdchar = 'l'; break; case 'h': ca.cmdchar = 'l'; break;
case K_LEFT: ca.cmdchar = K_RIGHT; break; case K_LEFT: ca.cmdchar = K_RIGHT; break;
case K_XLEFT: ca.cmdchar = K_XRIGHT; break;
case K_S_LEFT: ca.cmdchar = K_S_RIGHT; break; case K_S_LEFT: ca.cmdchar = K_S_RIGHT; break;
case K_C_LEFT: ca.cmdchar = K_C_RIGHT; break; case K_C_LEFT: ca.cmdchar = K_C_RIGHT; break;
case '>': ca.cmdchar = '<'; break; case '>': ca.cmdchar = '<'; break;
@@ -4333,9 +4325,7 @@ nv_zet(cap)
else if (nchar == 'l' else if (nchar == 'l'
|| nchar == 'h' || nchar == 'h'
|| nchar == K_LEFT || nchar == K_LEFT
|| nchar == K_XLEFT || nchar == K_RIGHT)
|| nchar == K_RIGHT
|| nchar == K_XRIGHT)
{ {
cap->count1 = n ? n * cap->count1 : cap->count1; cap->count1 = n ? n * cap->count1 : cap->count1;
goto dozet; goto dozet;
@@ -4442,7 +4432,6 @@ dozet:
/* "zh" - scroll screen to the right */ /* "zh" - scroll screen to the right */
case 'h': case 'h':
case K_LEFT: case K_LEFT:
case K_XLEFT:
if (!curwin->w_p_wrap) if (!curwin->w_p_wrap)
{ {
if ((colnr_T)cap->count1 > curwin->w_leftcol) if ((colnr_T)cap->count1 > curwin->w_leftcol)
@@ -4460,7 +4449,6 @@ dozet:
/* "zl" - scroll screen to the left */ /* "zl" - scroll screen to the left */
case 'l': case 'l':
case K_RIGHT: case K_RIGHT:
case K_XRIGHT:
if (!curwin->w_p_wrap) if (!curwin->w_p_wrap)
{ {
/* scroll the window left */ /* scroll the window left */
@@ -5353,7 +5341,7 @@ nv_right(cap)
&& vim_strchr(p_ww, 's') != NULL) && vim_strchr(p_ww, 's') != NULL)
|| (cap->cmdchar == 'l' || (cap->cmdchar == 'l'
&& vim_strchr(p_ww, 'l') != NULL) && vim_strchr(p_ww, 'l') != NULL)
|| ((cap->cmdchar == K_RIGHT || cap->cmdchar == K_XRIGHT) || (cap->cmdchar == K_RIGHT
&& vim_strchr(p_ww, '>') != NULL)) && vim_strchr(p_ww, '>') != NULL))
&& curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count)
{ {
@@ -5453,7 +5441,7 @@ nv_left(cap)
&& vim_strchr(p_ww, 'b') != NULL) && vim_strchr(p_ww, 'b') != NULL)
|| (cap->cmdchar == 'h' || (cap->cmdchar == 'h'
&& vim_strchr(p_ww, 'h') != NULL) && vim_strchr(p_ww, 'h') != NULL)
|| ((cap->cmdchar == K_LEFT || cap->cmdchar == K_XLEFT) || (cap->cmdchar == K_LEFT
&& vim_strchr(p_ww, '<') != NULL)) && vim_strchr(p_ww, '<') != NULL))
&& curwin->w_cursor.lnum > 1) && curwin->w_cursor.lnum > 1)
{ {
@@ -7261,7 +7249,6 @@ nv_g_cmd(cap)
*/ */
case 'j': case 'j':
case K_DOWN: case K_DOWN:
case K_XDOWN:
/* with 'nowrap' it works just like the normal "j" command; also when /* with 'nowrap' it works just like the normal "j" command; also when
* in a closed fold */ * in a closed fold */
if (!curwin->w_p_wrap if (!curwin->w_p_wrap
@@ -7281,7 +7268,6 @@ nv_g_cmd(cap)
case 'k': case 'k':
case K_UP: case K_UP:
case K_XUP:
/* with 'nowrap' it works just like the normal "k" command; also when /* with 'nowrap' it works just like the normal "k" command; also when
* in a closed fold */ * in a closed fold */
if (!curwin->w_p_wrap if (!curwin->w_p_wrap
@@ -7318,7 +7304,6 @@ nv_g_cmd(cap)
case 'm': case 'm':
case K_HOME: case K_HOME:
case K_KHOME: case K_KHOME:
case K_XHOME:
oap->motion_type = MCHAR; oap->motion_type = MCHAR;
oap->inclusive = FALSE; oap->inclusive = FALSE;
if (curwin->w_p_wrap if (curwin->w_p_wrap
@@ -7381,7 +7366,6 @@ nv_g_cmd(cap)
case '$': case '$':
case K_END: case K_END:
case K_KEND: case K_KEND:
case K_XEND:
{ {
int col_off = curwin_col_off(); int col_off = curwin_col_off();
@@ -7827,6 +7811,8 @@ nv_home(cap)
cap->count0 = 1; cap->count0 = 1;
nv_pipe(cap); nv_pipe(cap);
} }
ins_at_eol = FALSE; /* Don't move cursor past eol (only necessary in a
one-character line). */
} }
/* /*

2
src/spell.c
View File

@@ -526,7 +526,7 @@ spell_load_file(fname)
{ {
int fd; int fd;
size_t len; size_t len;
size_t l; int l;
char_u *p = NULL, *np; char_u *p = NULL, *np;
sblock_T *bl = NULL; sblock_T *bl = NULL;
int bl_used = 0; int bl_used = 0;

4
src/window.c
View File

@@ -263,7 +263,6 @@ do_window(nchar, Prenum, xchar)
/* cursor to window below */ /* cursor to window below */
case 'j': case 'j':
case K_DOWN: case K_DOWN:
case K_XDOWN:
case Ctrl_J: case Ctrl_J:
CHECK_CMDWIN CHECK_CMDWIN
#ifdef FEAT_VERTSPLIT #ifdef FEAT_VERTSPLIT
@@ -279,7 +278,6 @@ do_window(nchar, Prenum, xchar)
/* cursor to window above */ /* cursor to window above */
case 'k': case 'k':
case K_UP: case K_UP:
case K_XUP:
case Ctrl_K: case Ctrl_K:
CHECK_CMDWIN CHECK_CMDWIN
#ifdef FEAT_VERTSPLIT #ifdef FEAT_VERTSPLIT
@@ -296,7 +294,6 @@ do_window(nchar, Prenum, xchar)
/* cursor to left window */ /* cursor to left window */
case 'h': case 'h':
case K_LEFT: case K_LEFT:
case K_XLEFT:
case Ctrl_H: case Ctrl_H:
case K_BS: case K_BS:
CHECK_CMDWIN CHECK_CMDWIN
@@ -306,7 +303,6 @@ do_window(nchar, Prenum, xchar)
/* cursor to right window */ /* cursor to right window */
case 'l': case 'l':
case K_RIGHT: case K_RIGHT:
case K_XRIGHT:
case Ctrl_L: case Ctrl_L:
CHECK_CMDWIN CHECK_CMDWIN
win_goto_hor(FALSE, Prenum1); win_goto_hor(FALSE, Prenum1);