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

updated for version 7.0060

Browse Source
This commit is contained in:
Bram Moolenaar
2005-03-16 09:52:38 +00:00
parent da5d740e92
commit 916b7afcbb
3 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui_mac.c
View File

@@ -4305,6 +4305,15 @@ gui_mch_set_bg_color(color)
RGBBackColor(&TheColor); RGBBackColor(&TheColor);
} }
/*
* Set the current text speail color. TODO
*/
void
gui_mch_set_sp_color(color)
guicolor_T color;
{
}
void void
gui_mch_draw_string(row, col, s, len, flags) gui_mch_draw_string(row, col, s, len, flags)
int row; int row;

36
src/os_msdos.c
View File

@@ -989,9 +989,6 @@ mch_inchar(
int c; int c;
int tmp_c; int tmp_c;
static int nextchar = 0; /* may keep character when maxlen == 1 */ static int nextchar = 0; /* may keep character when maxlen == 1 */
#ifdef FEAT_AUTOCMD
static int once_already = 0;
#endif
/* /*
* if we got a ctrl-C when we were busy, there will be a "^C" somewhere * if we got a ctrl-C when we were busy, there will be a "^C" somewhere
@@ -1026,39 +1023,27 @@ mch_inchar(
{ {
#ifdef FEAT_MOUSE #ifdef FEAT_MOUSE
show_mouse(FALSE); show_mouse(FALSE);
#endif
#ifdef FEAT_AUTOCMD
once_already = 0;
#endif #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(p_ut) == 0) if (WaitForChar(p_ut) == 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 else
#endif #endif
@@ -1194,9 +1179,6 @@ mch_inchar(
#endif #endif
beep_count = 0; /* may beep again now that we got some chars */ beep_count = 0; /* may beep again now that we got some chars */
#ifdef FEAT_AUTOCMD
once_already = 0;
#endif
return len; return len;
} }

6
src/regexp.c
View File

@@ -4522,7 +4522,7 @@ regmatch(scan)
/* It could match. Prepare for trying to match what /* It could match. Prepare for trying to match what
* follows. The code is below. Parameters are stored in * follows. The code is below. Parameters are stored in
* a regstar_T on the regstack. */ * a regstar_T on the regstack. */
if (((unsigned)regstack.ga_len >> 10) >= p_mmp) if ((long)((unsigned)regstack.ga_len >> 10) >= p_mmp)
{ {
EMSG(_(e_maxmempat)); EMSG(_(e_maxmempat));
status = RA_FAIL; status = RA_FAIL;
@@ -4567,7 +4567,7 @@ regmatch(scan)
case BEHIND: case BEHIND:
case NOBEHIND: case NOBEHIND:
/* Need a bit of room to store extra positions. */ /* Need a bit of room to store extra positions. */
if (((unsigned)regstack.ga_len >> 10) >= p_mmp) if ((long)((unsigned)regstack.ga_len >> 10) >= p_mmp)
{ {
EMSG(_(e_maxmempat)); EMSG(_(e_maxmempat));
status = RA_FAIL; status = RA_FAIL;
@@ -5004,7 +5004,7 @@ regstack_push(regstack, state, scan, startp)
{ {
regitem_T *rp; regitem_T *rp;
if (((unsigned)regstack->ga_len >> 10) >= p_mmp) if ((long)((unsigned)regstack->ga_len >> 10) >= p_mmp)
{ {
EMSG(_(e_maxmempat)); EMSG(_(e_maxmempat));
return NULL; return NULL;