adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated for version 7.0060

Browse Source
This commit is contained in:
Bram Moolenaar
2005-03-15 22:50:43 +00:00
parent f36d3693dd
commit 5b743bfc4d
3 changed files with 18 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/eval.c
View File

@ -13024,8 +13024,13 @@ f_synIDattr(argvars, rettv)
p = highlight_has_attr(id, HL_STANDOUT, modec); p = highlight_has_attr(id, HL_STANDOUT, modec);
break; break;
case 'u': /* underline */ case 'u':
p = highlight_has_attr(id, HL_UNDERLINE, modec); if (STRLEN(what) <= 5 || TOLOWER_ASC(what[5]) != 'c')
/* underline */
p = highlight_has_attr(id, HL_UNDERLINE, modec);
else
/* undercurl */
p = highlight_has_attr(id, HL_UNDERCURL, modec);
break; break;
} }

2
src/ex_cmds.h
View File

@ -110,7 +110,7 @@ EX(CMD_anoremenu, "anoremenu", ex_menu,
EX(CMD_args, "args", ex_args, EX(CMD_args, "args", ex_args,
BANG|FILES|EDITCMD|ARGOPT|TRLBAR), BANG|FILES|EDITCMD|ARGOPT|TRLBAR),
EX(CMD_argadd, "argadd", ex_argadd, EX(CMD_argadd, "argadd", ex_argadd,
BANG|NEEDARG|RANGE|NOTADR|ZEROR|COUNT|FILES|TRLBAR), BANG|NEEDARG|RANGE|NOTADR|ZEROR|FILES|TRLBAR),
EX(CMD_argdelete, "argdelete", ex_argdelete, EX(CMD_argdelete, "argdelete", ex_argdelete,
BANG|RANGE|NOTADR|COUNT|FILES|TRLBAR), BANG|RANGE|NOTADR|COUNT|FILES|TRLBAR),
EX(CMD_argdo, "argdo", ex_listdo, EX(CMD_argdo, "argdo", ex_listdo,

41
src/os_amiga.c
View File

@ -119,9 +119,6 @@ mch_inchar(buf, maxlen, time, tb_change_cnt)
{ {
int len; int len;
long utime; long utime;
#ifdef FEAT_AUTOCMD
static int once_already = 0;
#endif
if (time >= 0) if (time >= 0)
{ {
@ -130,43 +127,28 @@ mch_inchar(buf, maxlen, time, tb_change_cnt)
else else
utime = time * 1000L; /* convert from milli to micro secs */ utime = time * 1000L; /* convert from milli to micro secs */
if (WaitForChar(raw_in, utime) == 0) /* no character available */ if (WaitForChar(raw_in, utime) == 0) /* no character available */
{
#ifdef FEAT_AUTOCMD
once_already = 0;
#endif
return 0; return 0;
}
} }
else /* time == -1 */ else /* time == -1 */
{ {
#ifdef FEAT_AUTOCMD
if (once_already == 2)
updatescript(0);
else if (once_already == 1)
{
setcursor();
once_already = 2;
return 0;
}
else
#endif
/* /*
* If there is no character available within 2 seconds (default) * If there is no character available within 2 seconds (default)
* write the autoscript file to disk * write the autoscript file to disk. Or cause the CursorHold event
* to be triggered.
*/ */
if (WaitForChar(raw_in, p_ut * 1000L) == 0) if (WaitForChar(raw_in, p_ut * 1000L) == 0)
{ {
#ifdef FEAT_AUTOCMD #ifdef FEAT_AUTOCMD
if (has_cursorhold() && get_real_state() == NORMAL_BUSY) if (!did_cursorhold && has_cursorhold()
&& get_real_state() == NORMAL_BUSY && maxlen >= 3)
{ {
apply_autocmds(EVENT_CURSORHOLD, NULL, NULL, FALSE, curbuf); buf[0] = K_SPECIAL;
update_screen(VALID); buf[1] = KS_EXTRA;
once_already = 1; buf[2] = (int)KE_CURSORHOLD;
return 0; return 3;
} }
else
#endif #endif
updatescript(0); updatescript(0);
} }
} }
@ -179,9 +161,6 @@ mch_inchar(buf, maxlen, time, tb_change_cnt)
# endif # endif
if (len > 0) if (len > 0)
{ {
#ifdef FEAT_AUTOCMD
once_already = 0;
#endif
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
/* Convert from 'termencoding' to 'encoding'. */ /* Convert from 'termencoding' to 'encoding'. */
if (input_conv.vc_type != CONV_NONE) if (input_conv.vc_type != CONV_NONE)