forked from aniani/vim
updated for version 7.0057
This commit is contained in:
Bram Moolenaar
parent
d62bec86bf
commit
52b4b557a2
@ -1,7 +1,7 @@
|
||||
" These commands create the option window.
|
||||
"
|
||||
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
||||
" Last Change: 2004 Dec 24
|
||||
" Last Change: 2005 Mar 07
|
||||
|
||||
" If there already is an option window, jump to that one.
|
||||
if bufwinnr("option-window") > 0
|
||||
@ -273,6 +273,8 @@ call append("$", "smartcase\toverride 'ignorecase' when pattern has upper case c
|
||||
call <SID>BinOptionG("scs", &scs)
|
||||
call append("$", "casemap\tWhat method to use for changing case of letters")
|
||||
call <SID>OptionG("cmp", &cmp)
|
||||
call append("$", "maxmempattern\tmaximum amount of memory in Kbyte used for pattern matching")
|
||||
call append("$", " \tset mmp=" . &mmp)
|
||||
call append("$", "define\tpattern for a macro definition line")
|
||||
call append("$", "\t(global or local to buffer)")
|
||||
call <SID>OptionG("def", &def)
|
||||
@ -554,9 +556,11 @@ if has("gui")
|
||||
if has("balloon_eval")
|
||||
call append("$", "balloondelay\tdelay in milliseconds before a balloon may pop up")
|
||||
call append("$", " \tset bdlay=" . &bdlay)
|
||||
if has("sun_workshop")
|
||||
call append("$", "ballooneval\twhether the balloon evaluation is to be used")
|
||||
call <SID>BinOptionG("beval", &beval)
|
||||
if has("eval")
|
||||
call append("$", "balloonexpr\texpression to show in balloon eval")
|
||||
call append("$", " \tset bexpr=" . &bexpr)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -202,7 +202,7 @@ NETBEANS = $(GUI)
|
||||
!if "$(NETBEANS)" == "yes"
|
||||
# NETBEANS - Include support for Netbeans integration
|
||||
NETBEANS_PRO = proto/netbeans.pro
|
||||
NETBEANS_OBJ = $(OBJDIR)/netbeans.obj $(OBJDIR)/gui_beval.obj
|
||||
NETBEANS_OBJ = $(OBJDIR)/netbeans.obj
|
||||
NETBEANS_DEFS = -DFEAT_NETBEANS_INTG
|
||||
|
||||
!if "$(NBDEBUG)" == "yes"
|
||||
@ -422,6 +422,7 @@ GUI_INCL = \
|
||||
farsi.h \
|
||||
feature.h \
|
||||
globals.h \
|
||||
gui_beval.h \
|
||||
keymap.h \
|
||||
macros.h \
|
||||
option.h \
|
||||
@ -429,6 +430,7 @@ GUI_INCL = \
|
||||
os_win32.h
|
||||
GUI_OBJ = \
|
||||
$(OUTDIR)\gui.obj \
|
||||
$(OUTDIR)\gui_beval.obj \
|
||||
$(OUTDIR)\gui_w32.obj \
|
||||
$(OUTDIR)\os_w32exe.obj
|
||||
GUI_LIB = \
|
||||
@ -767,6 +769,8 @@ $(OUTDIR)/hashtable.obj: $(OUTDIR) hashtable.c $(INCL)
|
||||
|
||||
$(OUTDIR)/gui.obj: $(OUTDIR) gui.c $(INCL) $(GUI_INCL)
|
||||
|
||||
$(OUTDIR)/gui_beval.obj: $(OUTDIR) gui_beval.c $(INCL) $(GUI_INCL)
|
||||
|
||||
$(OUTDIR)/gui_w32.obj: $(OUTDIR) gui_w32.c gui_w48.c $(INCL) $(GUI_INCL)
|
||||
|
||||
$(OUTDIR)/if_cscope.obj: $(OUTDIR) if_cscope.c $(INCL)
|
||||
|
||||
240
src/ex_docmd.c
240
src/ex_docmd.c
@ -288,6 +288,7 @@ static void ex_mkrc __ARGS((exarg_T *eap));
|
||||
static void ex_mark __ARGS((exarg_T *eap));
|
||||
#ifdef FEAT_USR_CMDS
|
||||
static char_u *uc_fun_cmd __ARGS((void));
|
||||
static char_u *find_ucmd __ARGS((exarg_T *eap, char_u *p, int *full, expand_T *xp, int *compl));
|
||||
#endif
|
||||
#ifdef FEAT_EX_EXTRA
|
||||
static void ex_normal __ARGS((exarg_T *eap));
|
||||
@ -2716,8 +2717,9 @@ checkforcmd(pp, cmd, len)
|
||||
|
||||
/*
|
||||
* Find an Ex command by its name, either built-in or user.
|
||||
* Name can be found at eap->cmd.
|
||||
* Start of the name can be found at eap->cmd.
|
||||
* Returns pointer to char after the command name.
|
||||
* "full" is set to TRUE if the whole command name matched.
|
||||
* Returns NULL for an ambiguous user command.
|
||||
*/
|
||||
/*ARGSUSED*/
|
||||
@ -2746,7 +2748,8 @@ find_command(eap, full)
|
||||
++p;
|
||||
}
|
||||
else if (p[0] == 's'
|
||||
&& ((p[1] == 'c' && p[2] != 's' && p[2] != 'r' && p[3] != 'i' && p[4] != 'p')
|
||||
&& ((p[1] == 'c' && p[2] != 's' && p[2] != 'r'
|
||||
&& p[3] != 'i' && p[4] != 'p')
|
||||
|| p[1] == 'g'
|
||||
|| (p[1] == 'i' && p[2] != 'm' && p[2] != 'l' && p[2] != 'g')
|
||||
|| p[1] == 'I'
|
||||
@ -2802,19 +2805,43 @@ find_command(eap, full)
|
||||
/* Look for a user defined command as a last resort */
|
||||
if (eap->cmdidx == CMD_SIZE && *eap->cmd >= 'A' && *eap->cmd <= 'Z')
|
||||
{
|
||||
ucmd_T *cmd;
|
||||
int j, k, matchlen = 0;
|
||||
int found = FALSE, possible = FALSE;
|
||||
char_u *cp, *np; /* Point into typed cmd and test name */
|
||||
garray_T *gap;
|
||||
int amb_local = FALSE; /* Found ambiguous buffer-local
|
||||
command, only full match global
|
||||
is accepted. */
|
||||
|
||||
/* User defined commands may contain numbers */
|
||||
/* User defined commands may contain digits. */
|
||||
while (ASCII_ISALNUM(*p))
|
||||
++p;
|
||||
len = (int)(p - eap->cmd);
|
||||
p = find_ucmd(eap, p, full, NULL, NULL);
|
||||
}
|
||||
#endif
|
||||
if (p == eap->cmd)
|
||||
eap->cmdidx = CMD_SIZE;
|
||||
}
|
||||
|
||||
return p;
|
||||
}
|
||||
|
||||
#ifdef FEAT_USR_CMDS
|
||||
/*
|
||||
* Search for a user command that matches "eap->cmd".
|
||||
* Return cmdidx in "eap->cmdidx", flags in "eap->argt", idx in "eap->useridx".
|
||||
* Return a pointer to just after the command.
|
||||
* Return NULL if there is no matching command.
|
||||
*/
|
||||
static char_u *
|
||||
find_ucmd(eap, p, full, xp, compl)
|
||||
exarg_T *eap;
|
||||
char_u *p; /* end of the command (possibly including count) */
|
||||
int *full; /* set to TRUE for a full match */
|
||||
expand_T *xp; /* used for completion, NULL otherwise */
|
||||
int *compl; /* completion flags or NULL */
|
||||
{
|
||||
int len = (int)(p - eap->cmd);
|
||||
int j, k, matchlen = 0;
|
||||
ucmd_T *uc;
|
||||
int found = FALSE;
|
||||
int possible = FALSE;
|
||||
char_u *cp, *np; /* Point into typed cmd and test name */
|
||||
garray_T *gap;
|
||||
int amb_local = FALSE; /* Found ambiguous buffer-local command,
|
||||
only full match global is accepted. */
|
||||
|
||||
/*
|
||||
* Look for buffer-local user commands first, then global ones.
|
||||
@ -2824,22 +2851,25 @@ find_command(eap, full)
|
||||
{
|
||||
for (j = 0; j < gap->ga_len; ++j)
|
||||
{
|
||||
cmd = USER_CMD_GA(gap, j);
|
||||
uc = USER_CMD_GA(gap, j);
|
||||
cp = eap->cmd;
|
||||
np = cmd->uc_name;
|
||||
np = uc->uc_name;
|
||||
k = 0;
|
||||
while (k < len && *np != NUL && *cp++ == *np++)
|
||||
k++;
|
||||
if (k == len || (*np == NUL && vim_isdigit(eap->cmd[k])))
|
||||
{
|
||||
/* If finding a second match, the command is
|
||||
* ambiguous. But not if a buffer-local command
|
||||
* wasn't a full match and a global command is a full
|
||||
* match. */
|
||||
/* If finding a second match, the command is ambiguous. But
|
||||
* not if a buffer-local command wasn't a full match and a
|
||||
* global command is a full match. */
|
||||
if (k == len && found && *np != NUL)
|
||||
{
|
||||
if (gap == &ucmds)
|
||||
{
|
||||
if (xp != NULL)
|
||||
xp->xp_context = EXPAND_UNSUCCESSFUL;
|
||||
return NULL;
|
||||
}
|
||||
amb_local = TRUE;
|
||||
}
|
||||
|
||||
@ -2858,9 +2888,20 @@ find_command(eap, full)
|
||||
eap->cmdidx = CMD_USER;
|
||||
else
|
||||
eap->cmdidx = CMD_USER_BUF;
|
||||
eap->argt = cmd->uc_argt;
|
||||
eap->argt = uc->uc_argt;
|
||||
eap->useridx = j;
|
||||
|
||||
# ifdef FEAT_CMDL_COMPL
|
||||
if (compl != NULL)
|
||||
*compl = uc->uc_compl;
|
||||
# ifdef FEAT_EVAL
|
||||
if (xp != NULL)
|
||||
{
|
||||
xp->xp_arg = uc->uc_compl_arg;
|
||||
xp->xp_scriptID = uc->uc_scriptID;
|
||||
}
|
||||
# endif
|
||||
# endif
|
||||
/* Do not search for further abbreviations
|
||||
* if this is an exact match. */
|
||||
matchlen = k;
|
||||
@ -2883,22 +2924,19 @@ find_command(eap, full)
|
||||
|
||||
/* Only found ambiguous matches. */
|
||||
if (amb_local)
|
||||
{
|
||||
if (xp != NULL)
|
||||
xp->xp_context = EXPAND_UNSUCCESSFUL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* The match we found may be followed immediately by a
|
||||
* number. Move *p back to point to it.
|
||||
*/
|
||||
/* The match we found may be followed immediately by a number. Move "p"
|
||||
* back to point to it. */
|
||||
if (found || possible)
|
||||
p += matchlen - len;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (len == 0)
|
||||
eap->cmdidx = CMD_SIZE;
|
||||
}
|
||||
|
||||
return p + (matchlen - len);
|
||||
return p;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(FEAT_EVAL) || defined(PROTO)
|
||||
/*
|
||||
@ -2971,9 +3009,8 @@ set_one_cmd_context(xp, buff)
|
||||
{
|
||||
char_u *p;
|
||||
char_u *cmd, *arg;
|
||||
int i = 0;
|
||||
cmdidx_T cmdidx;
|
||||
long_u argt = 0;
|
||||
int len = 0;
|
||||
exarg_T ea;
|
||||
#if defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)
|
||||
int compl = EXPAND_NOTHING;
|
||||
#endif
|
||||
@ -2989,6 +3026,7 @@ set_one_cmd_context(xp, buff)
|
||||
#if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL) && defined(FEAT_CMDL_COMPL)
|
||||
xp->xp_arg = NULL;
|
||||
#endif
|
||||
ea.argt = 0;
|
||||
|
||||
/*
|
||||
* 2. skip comment lines and leading space, colons or bars
|
||||
@ -3034,7 +3072,7 @@ set_one_cmd_context(xp, buff)
|
||||
*/
|
||||
if (*cmd == 'k' && cmd[1] != 'e')
|
||||
{
|
||||
cmdidx = CMD_k;
|
||||
ea.cmdidx = CMD_k;
|
||||
p = cmd + 1;
|
||||
}
|
||||
else
|
||||
@ -3045,16 +3083,16 @@ set_one_cmd_context(xp, buff)
|
||||
/* check for non-alpha command */
|
||||
if (p == cmd && vim_strchr((char_u *)"@*!=><&~#", *p) != NULL)
|
||||
++p;
|
||||
i = (int)(p - cmd);
|
||||
len = (int)(p - cmd);
|
||||
|
||||
if (i == 0)
|
||||
if (len == 0)
|
||||
{
|
||||
xp->xp_context = EXPAND_UNSUCCESSFUL;
|
||||
return NULL;
|
||||
}
|
||||
for (cmdidx = (cmdidx_T)0; (int)cmdidx < (int)CMD_SIZE;
|
||||
cmdidx = (cmdidx_T)((int)cmdidx + 1))
|
||||
if (STRNCMP(cmdnames[(int)cmdidx].cmd_name, cmd, (size_t)i) == 0)
|
||||
for (ea.cmdidx = (cmdidx_T)0; (int)ea.cmdidx < (int)CMD_SIZE;
|
||||
ea.cmdidx = (cmdidx_T)((int)ea.cmdidx + 1))
|
||||
if (STRNCMP(cmdnames[(int)ea.cmdidx].cmd_name, cmd, (size_t)len) == 0)
|
||||
break;
|
||||
|
||||
#ifdef FEAT_USR_CMDS
|
||||
@ -3062,7 +3100,7 @@ set_one_cmd_context(xp, buff)
|
||||
{
|
||||
while (ASCII_ISALNUM(*p) || *p == '*') /* Allow * wild card */
|
||||
++p;
|
||||
i = (int)(p - cmd);
|
||||
len = (int)(p - cmd);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -3074,88 +3112,28 @@ set_one_cmd_context(xp, buff)
|
||||
if (*p == NUL && ASCII_ISALNUM(p[-1]))
|
||||
return NULL;
|
||||
|
||||
if (cmdidx == CMD_SIZE)
|
||||
if (ea.cmdidx == CMD_SIZE)
|
||||
{
|
||||
if (*cmd == 's' && vim_strchr((char_u *)"cgriI", cmd[1]) != NULL)
|
||||
{
|
||||
cmdidx = CMD_substitute;
|
||||
ea.cmdidx = CMD_substitute;
|
||||
p = cmd + 1;
|
||||
}
|
||||
#ifdef FEAT_USR_CMDS
|
||||
else if (cmd[0] >= 'A' && cmd[0] <= 'Z')
|
||||
{
|
||||
/* Look for a user defined command as a last resort */
|
||||
ucmd_T *uc;
|
||||
int j, k, matchlen = 0;
|
||||
int found = FALSE, possible = FALSE;
|
||||
char_u *cp, *np; /* Point into typed cmd and test name */
|
||||
garray_T *gap;
|
||||
|
||||
gap = &curbuf->b_ucmds;
|
||||
for (;;)
|
||||
{
|
||||
uc = USER_CMD_GA(gap, 0);
|
||||
for (j = 0; j < gap->ga_len; ++j, ++uc)
|
||||
{
|
||||
cp = cmd;
|
||||
np = uc->uc_name;
|
||||
k = 0;
|
||||
while (k < i && *np != NUL && *cp++ == *np++)
|
||||
k++;
|
||||
if (k == i || (*np == NUL && VIM_ISDIGIT(cmd[k])))
|
||||
{
|
||||
if (k == i && found)
|
||||
{
|
||||
/* Ambiguous abbreviation */
|
||||
xp->xp_context = EXPAND_UNSUCCESSFUL;
|
||||
return NULL;
|
||||
}
|
||||
if (!found)
|
||||
{
|
||||
/* If we matched up to a digit, then there could
|
||||
* be another command including the digit that we
|
||||
* should use instead.
|
||||
*/
|
||||
if (k == i)
|
||||
found = TRUE;
|
||||
else
|
||||
possible = TRUE;
|
||||
|
||||
if (gap == &ucmds)
|
||||
cmdidx = CMD_USER;
|
||||
else
|
||||
cmdidx = CMD_USER_BUF;
|
||||
argt = uc->uc_argt;
|
||||
#ifdef FEAT_CMDL_COMPL
|
||||
compl = uc->uc_compl;
|
||||
# ifdef FEAT_EVAL
|
||||
xp->xp_arg = uc->uc_compl_arg;
|
||||
xp->xp_scriptID = uc->uc_scriptID;
|
||||
ea.cmd = cmd;
|
||||
p = find_ucmd(&ea, p, NULL, xp,
|
||||
# if defined(FEAT_CMDL_COMPL)
|
||||
&compl
|
||||
# else
|
||||
NULL
|
||||
# endif
|
||||
#endif
|
||||
/* Do not search for further abbreviations
|
||||
* if this is an exact match
|
||||
*/
|
||||
matchlen = k;
|
||||
if (k == i && *np == NUL)
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (gap == &ucmds || j < gap->ga_len)
|
||||
break;
|
||||
gap = &ucmds;
|
||||
}
|
||||
|
||||
/* The match we found may be followed immediately by a
|
||||
* number. Move *p back to point to it.
|
||||
*/
|
||||
if (found || possible)
|
||||
p += matchlen - i;
|
||||
);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
if (cmdidx == CMD_SIZE)
|
||||
if (ea.cmdidx == CMD_SIZE)
|
||||
{
|
||||
/* Not still touching the command and it was an illegal one */
|
||||
xp->xp_context = EXPAND_UNSUCCESSFUL;
|
||||
@ -3174,13 +3152,13 @@ set_one_cmd_context(xp, buff)
|
||||
* 5. parse arguments
|
||||
*/
|
||||
#ifdef FEAT_USR_CMDS
|
||||
if (!USER_CMDIDX(cmdidx))
|
||||
if (!USER_CMDIDX(ea.cmdidx))
|
||||
#endif
|
||||
argt = cmdnames[(int)cmdidx].cmd_argt;
|
||||
ea.argt = cmdnames[(int)ea.cmdidx].cmd_argt;
|
||||
|
||||
arg = skipwhite(p);
|
||||
|
||||
if (cmdidx == CMD_write || cmdidx == CMD_update)
|
||||
if (ea.cmdidx == CMD_write || ea.cmdidx == CMD_update)
|
||||
{
|
||||
if (*arg == '>') /* append */
|
||||
{
|
||||
@ -3188,14 +3166,14 @@ set_one_cmd_context(xp, buff)
|
||||
++arg;
|
||||
arg = skipwhite(arg);
|
||||
}
|
||||
else if (*arg == '!' && cmdidx == CMD_write) /* :w !filter */
|
||||
else if (*arg == '!' && ea.cmdidx == CMD_write) /* :w !filter */
|
||||
{
|
||||
++arg;
|
||||
usefilter = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
if (cmdidx == CMD_read)
|
||||
if (ea.cmdidx == CMD_read)
|
||||
{
|
||||
usefilter = forceit; /* :r! filter if forced */
|
||||
if (*arg == '!') /* :r !filter */
|
||||
@ -3205,7 +3183,7 @@ set_one_cmd_context(xp, buff)
|
||||
}
|
||||
}
|
||||
|
||||
if (cmdidx == CMD_lshift || cmdidx == CMD_rshift)
|
||||
if (ea.cmdidx == CMD_lshift || ea.cmdidx == CMD_rshift)
|
||||
{
|
||||
while (*arg == *cmd) /* allow any number of '>' or '<' */
|
||||
++arg;
|
||||
@ -3213,7 +3191,7 @@ set_one_cmd_context(xp, buff)
|
||||
}
|
||||
|
||||
/* Does command allow "+command"? */
|
||||
if ((argt & EDITCMD) && !usefilter && *arg == '+')
|
||||
if ((ea.argt & EDITCMD) && !usefilter && *arg == '+')
|
||||
{
|
||||
/* Check if we're in the +command */
|
||||
p = arg + 1;
|
||||
@ -3231,11 +3209,11 @@ set_one_cmd_context(xp, buff)
|
||||
* Check for '|' to separate commands and '"' to start comments.
|
||||
* Don't do this for ":read !cmd" and ":write !cmd".
|
||||
*/
|
||||
if ((argt & TRLBAR) && !usefilter)
|
||||
if ((ea.argt & TRLBAR) && !usefilter)
|
||||
{
|
||||
p = arg;
|
||||
/* ":redir @" is not the start of a comment */
|
||||
if (cmdidx == CMD_redir && p[0] == '@' && p[1] == '"')
|
||||
if (ea.cmdidx == CMD_redir && p[0] == '@' && p[1] == '"')
|
||||
p += 2;
|
||||
while (*p)
|
||||
{
|
||||
@ -3244,7 +3222,7 @@ set_one_cmd_context(xp, buff)
|
||||
if (p[1] != NUL)
|
||||
++p;
|
||||
}
|
||||
else if ( (*p == '"' && !(argt & NOTRLCOM))
|
||||
else if ( (*p == '"' && !(ea.argt & NOTRLCOM))
|
||||
|| *p == '|' || *p == '\n')
|
||||
{
|
||||
if (*(p - 1) != '\\')
|
||||
@ -3259,7 +3237,7 @@ set_one_cmd_context(xp, buff)
|
||||
}
|
||||
|
||||
/* no arguments allowed */
|
||||
if (!(argt & EXTRA) && *arg != NUL &&
|
||||
if (!(ea.argt & EXTRA) && *arg != NUL &&
|
||||
vim_strchr((char_u *)"|\"", *arg) == NULL)
|
||||
return NULL;
|
||||
|
||||
@ -3271,7 +3249,7 @@ set_one_cmd_context(xp, buff)
|
||||
p++;
|
||||
xp->xp_pattern = p;
|
||||
|
||||
if (argt & XFILE)
|
||||
if (ea.argt & XFILE)
|
||||
{
|
||||
int in_quote = FALSE;
|
||||
char_u *bow = NULL; /* Beginning of word */
|
||||
@ -3286,7 +3264,7 @@ set_one_cmd_context(xp, buff)
|
||||
if (*p == '\\' && p[1] != NUL)
|
||||
++p;
|
||||
#ifdef SPACE_IN_FILENAME
|
||||
else if (vim_iswhite(*p) && (!(argt & NOSPC) || usefilter))
|
||||
else if (vim_iswhite(*p) && (!(ea.argt & NOSPC) || usefilter))
|
||||
#else
|
||||
else if (vim_iswhite(*p))
|
||||
#endif
|
||||
@ -3344,7 +3322,7 @@ set_one_cmd_context(xp, buff)
|
||||
/*
|
||||
* 6. switch on command name
|
||||
*/
|
||||
switch (cmdidx)
|
||||
switch (ea.cmdidx)
|
||||
{
|
||||
case CMD_cd:
|
||||
case CMD_chdir:
|
||||
@ -3578,7 +3556,7 @@ set_one_cmd_context(xp, buff)
|
||||
case CMD_echoerr:
|
||||
case CMD_call:
|
||||
case CMD_return:
|
||||
set_context_for_expression(xp, arg, cmdidx);
|
||||
set_context_for_expression(xp, arg, ea.cmdidx);
|
||||
break;
|
||||
|
||||
case CMD_unlet:
|
||||
@ -3622,7 +3600,7 @@ set_one_cmd_context(xp, buff)
|
||||
if (compl != EXPAND_NOTHING)
|
||||
{
|
||||
/* XFILE: file names are handled above */
|
||||
if (!(argt & XFILE))
|
||||
if (!(ea.argt & XFILE))
|
||||
{
|
||||
# ifdef FEAT_MENU
|
||||
if (compl == EXPAND_MENUS)
|
||||
@ -3648,7 +3626,7 @@ set_one_cmd_context(xp, buff)
|
||||
case CMD_imap: case CMD_inoremap:
|
||||
case CMD_cmap: case CMD_cnoremap:
|
||||
return set_context_in_map_cmd(xp, cmd, arg, forceit,
|
||||
FALSE, FALSE, cmdidx);
|
||||
FALSE, FALSE, ea.cmdidx);
|
||||
case CMD_unmap:
|
||||
case CMD_nunmap:
|
||||
case CMD_vunmap:
|
||||
@ -3656,17 +3634,17 @@ set_one_cmd_context(xp, buff)
|
||||
case CMD_iunmap:
|
||||
case CMD_cunmap:
|
||||
return set_context_in_map_cmd(xp, cmd, arg, forceit,
|
||||
FALSE, TRUE, cmdidx);
|
||||
FALSE, TRUE, ea.cmdidx);
|
||||
case CMD_abbreviate: case CMD_noreabbrev:
|
||||
case CMD_cabbrev: case CMD_cnoreabbrev:
|
||||
case CMD_iabbrev: case CMD_inoreabbrev:
|
||||
return set_context_in_map_cmd(xp, cmd, arg, forceit,
|
||||
TRUE, FALSE, cmdidx);
|
||||
TRUE, FALSE, ea.cmdidx);
|
||||
case CMD_unabbreviate:
|
||||
case CMD_cunabbrev:
|
||||
case CMD_iunabbrev:
|
||||
return set_context_in_map_cmd(xp, cmd, arg, forceit,
|
||||
TRUE, TRUE, cmdidx);
|
||||
TRUE, TRUE, ea.cmdidx);
|
||||
#ifdef FEAT_MENU
|
||||
case CMD_menu: case CMD_noremenu: case CMD_unmenu:
|
||||
case CMD_amenu: case CMD_anoremenu: case CMD_aunmenu:
|
||||
|
||||
@ -4609,30 +4609,6 @@ static struct initmap
|
||||
{(char_u *)"<D-x> \"*d", VISUAL},
|
||||
{(char_u *)"<Backspace> \"-d", VISUAL},
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
/* Map extra keys to their normal equivalents. */
|
||||
{(char_u *)"<xF1> <F1>", NORMAL+VISUAL+OP_PENDING},
|
||||
{(char_u *)"<xF1> <F1>", INSERT+CMDLINE},
|
||||
{(char_u *)"<xF2> <F2>", NORMAL+VISUAL+OP_PENDING},
|
||||
{(char_u *)"<xF2> <F2>", INSERT+CMDLINE},
|
||||
{(char_u *)"<xF3> <F3>", NORMAL+VISUAL+OP_PENDING},
|
||||
{(char_u *)"<xF3> <F3>", INSERT+CMDLINE},
|
||||
{(char_u *)"<xF4> <F4>", NORMAL+VISUAL+OP_PENDING},
|
||||
{(char_u *)"<xF4> <F4>", INSERT+CMDLINE},
|
||||
{(char_u *)"<S-xF1> <S-F1>", NORMAL+VISUAL+OP_PENDING},
|
||||
{(char_u *)"<S-xF1> <S-F1>", INSERT+CMDLINE},
|
||||
{(char_u *)"<S-xF2> <S-F2>", NORMAL+VISUAL+OP_PENDING},
|
||||
{(char_u *)"<S-xF2> <S-F2>", INSERT+CMDLINE},
|
||||
{(char_u *)"<S-xF3> <S-F3>", NORMAL+VISUAL+OP_PENDING},
|
||||
{(char_u *)"<S-xF3> <S-F3>", INSERT+CMDLINE},
|
||||
{(char_u *)"<S-xF4> <S-F4>", NORMAL+VISUAL+OP_PENDING},
|
||||
{(char_u *)"<S-xF4> <S-F4>", INSERT+CMDLINE},
|
||||
{(char_u *)"<xEND> <END>", NORMAL+VISUAL+OP_PENDING},
|
||||
{(char_u *)"<xEND> <END>", INSERT+CMDLINE},
|
||||
{(char_u *)"<xHOME> <HOME>", NORMAL+VISUAL+OP_PENDING},
|
||||
{(char_u *)"<xHOME> <HOME>", INSERT+CMDLINE},
|
||||
#endif
|
||||
};
|
||||
#endif
|
||||
|
||||
@ -4650,6 +4626,8 @@ init_mappings()
|
||||
#endif
|
||||
}
|
||||
|
||||
#if defined(MSDOS) || defined(MSWIN) || defined(OS2) \
|
||||
|| defined(FEAT_CMDWIN) || defined(MACOS) || defined(PROTO)
|
||||
/*
|
||||
* Add a mapping "map" for mode "mode".
|
||||
* Need to put string in allocated memory, because do_map() will modify it.
|
||||
@ -4671,3 +4649,4 @@ add_map(map, mode)
|
||||
}
|
||||
p_cpo = cpo_save;
|
||||
}
|
||||
#endif
|
||||
|
||||
23
src/normal.c
23
src/normal.c
@ -3085,7 +3085,7 @@ reset_VIsual()
|
||||
}
|
||||
#endif /* FEAT_VISUAL */
|
||||
|
||||
#if defined(FEAT_NETBEANS_INTG) && defined(FEAT_BEVAL)
|
||||
#if defined(FEAT_BEVAL)
|
||||
static int find_is_eval_item __ARGS((char_u *ptr, int *colp, int *nbp, int dir));
|
||||
|
||||
/*
|
||||
@ -3134,6 +3134,7 @@ find_is_eval_item(ptr, colp, bnp, dir)
|
||||
* FIND_IDENT: find an identifier (keyword)
|
||||
* FIND_STRING: find any non-white string
|
||||
* FIND_IDENT + FIND_STRING: find any non-white string, identifier preferred.
|
||||
* FIND_EVAL: find text useful for C program debugging
|
||||
*
|
||||
* There are three steps:
|
||||
* 1. Search forward for the start of an identifier/string. Doesn't move if
|
||||
@ -3177,7 +3178,7 @@ find_ident_at_pos(wp, lnum, startcol, string, find_type)
|
||||
int prev_class;
|
||||
int prevcol;
|
||||
#endif
|
||||
#if defined(FEAT_NETBEANS_INTG) && defined(FEAT_BEVAL)
|
||||
#if defined(FEAT_BEVAL)
|
||||
int bn = 0; /* bracket nesting */
|
||||
#endif
|
||||
|
||||
@ -3197,7 +3198,7 @@ find_ident_at_pos(wp, lnum, startcol, string, find_type)
|
||||
{
|
||||
while (ptr[col] != NUL)
|
||||
{
|
||||
# if defined(FEAT_NETBEANS_INTG) && defined(FEAT_BEVAL)
|
||||
# if defined(FEAT_BEVAL)
|
||||
/* Stop at a ']' to evaluate "a[x]". */
|
||||
if ((find_type & FIND_EVAL) && ptr[col] == ']')
|
||||
break;
|
||||
@ -3212,13 +3213,13 @@ find_ident_at_pos(wp, lnum, startcol, string, find_type)
|
||||
#endif
|
||||
while (ptr[col] != NUL
|
||||
&& (i == 0 ? !vim_iswordc(ptr[col]) : vim_iswhite(ptr[col]))
|
||||
# if defined(FEAT_NETBEANS_INTG) && defined(FEAT_BEVAL)
|
||||
# if defined(FEAT_BEVAL)
|
||||
&& (!(find_type & FIND_EVAL) || ptr[col] != ']')
|
||||
# endif
|
||||
)
|
||||
++col;
|
||||
|
||||
#if defined(FEAT_NETBEANS_INTG) && defined(FEAT_BEVAL)
|
||||
#if defined(FEAT_BEVAL)
|
||||
/* When starting on a ']' count it, so that we include the '['. */
|
||||
bn = ptr[col] == ']';
|
||||
#endif
|
||||
@ -3230,7 +3231,7 @@ find_ident_at_pos(wp, lnum, startcol, string, find_type)
|
||||
if (has_mbyte)
|
||||
{
|
||||
/* Remember class of character under cursor. */
|
||||
# if defined(FEAT_NETBEANS_INTG) && defined(FEAT_BEVAL)
|
||||
# if defined(FEAT_BEVAL)
|
||||
if ((find_type & FIND_EVAL) && ptr[col] == ']')
|
||||
this_class = mb_get_class((char_u *)"a");
|
||||
else
|
||||
@ -3244,7 +3245,7 @@ find_ident_at_pos(wp, lnum, startcol, string, find_type)
|
||||
&& (i == 0
|
||||
|| prev_class == 0
|
||||
|| (find_type & FIND_IDENT))
|
||||
# if defined(FEAT_NETBEANS_INTG) && defined(FEAT_BEVAL)
|
||||
# if defined(FEAT_BEVAL)
|
||||
&& (!(find_type & FIND_EVAL)
|
||||
|| prevcol == 0
|
||||
|| !find_is_eval_item(ptr + prevcol, &prevcol,
|
||||
@ -3271,7 +3272,7 @@ find_ident_at_pos(wp, lnum, startcol, string, find_type)
|
||||
: (!vim_iswhite(ptr[col - 1])
|
||||
&& (!(find_type & FIND_IDENT)
|
||||
|| !vim_iswordc(ptr[col - 1]))))
|
||||
#if defined(FEAT_NETBEANS_INTG) && defined(FEAT_BEVAL)
|
||||
#if defined(FEAT_BEVAL)
|
||||
|| ((find_type & FIND_EVAL)
|
||||
&& col > 1
|
||||
&& find_is_eval_item(ptr + col - 1, &col,
|
||||
@ -3308,7 +3309,7 @@ find_ident_at_pos(wp, lnum, startcol, string, find_type)
|
||||
/*
|
||||
* 3. Find the end if the identifier/string.
|
||||
*/
|
||||
#if defined(FEAT_NETBEANS_INTG) && defined(FEAT_BEVAL)
|
||||
#if defined(FEAT_BEVAL)
|
||||
bn = 0;
|
||||
startcol -= col;
|
||||
#endif
|
||||
@ -3321,7 +3322,7 @@ find_ident_at_pos(wp, lnum, startcol, string, find_type)
|
||||
while (ptr[col] != NUL
|
||||
&& ((i == 0 ? mb_get_class(ptr + col) == this_class
|
||||
: mb_get_class(ptr + col) != 0)
|
||||
# if defined(FEAT_NETBEANS_INTG) && defined(FEAT_BEVAL)
|
||||
# if defined(FEAT_BEVAL)
|
||||
|| ((find_type & FIND_EVAL)
|
||||
&& col <= (int)startcol
|
||||
&& find_is_eval_item(ptr + col, &col, &bn, FORWARD))
|
||||
@ -3333,7 +3334,7 @@ find_ident_at_pos(wp, lnum, startcol, string, find_type)
|
||||
#endif
|
||||
while ((i == 0 ? vim_iswordc(ptr[col])
|
||||
: (ptr[col] != NUL && !vim_iswhite(ptr[col])))
|
||||
# if defined(FEAT_NETBEANS_INTG) && defined(FEAT_BEVAL)
|
||||
# if defined(FEAT_BEVAL)
|
||||
|| ((find_type & FIND_EVAL)
|
||||
&& col <= (int)startcol
|
||||
&& find_is_eval_item(ptr + col, &col, &bn, FORWARD))
|
||||
|
||||
@ -1536,7 +1536,12 @@ int vim_memcmp __ARGS((void *, void *, size_t));
|
||||
#define VV_PROFILING 36
|
||||
#define VV_FCS_REASON 37
|
||||
#define VV_FCS_CHOICE 38
|
||||
#define VV_LEN 39 /* number of v: vars */
|
||||
#define VV_BEVAL_BUFNR 39
|
||||
#define VV_BEVAL_WINNR 40
|
||||
#define VV_BEVAL_LNUM 41
|
||||
#define VV_BEVAL_COL 42
|
||||
#define VV_BEVAL_TEXT 43
|
||||
#define VV_LEN 44 /* number of v: vars */
|
||||
|
||||
#ifdef FEAT_CLIPBOARD
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user