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

updated for version 7.0226

Browse Source
This commit is contained in:
Bram Moolenaar
2006-03-16 21:35:52 +00:00
parent cf03447964
commit d3667a2e29
10 changed files with 58 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/buffer.c
View File

@@ -3017,15 +3017,23 @@ maketitle()
if (*p_titlestring != NUL)
{
#ifdef FEAT_STL_OPT
int use_sandbox = FALSE;
if (stl_syntax & STL_IN_TITLE)
{
int use_sandbox = FALSE;
int save_called_emsg = called_emsg;
# ifdef FEAT_EVAL
use_sandbox = was_set_insecurely((char_u *)"titlestring", 0);
use_sandbox = was_set_insecurely((char_u *)"titlestring", 0);
# endif
if (stl_syntax & STL_IN_TITLE)
called_emsg = FALSE;
build_stl_str_hl(curwin, t_str, sizeof(buf),
p_titlestring, use_sandbox,
0, maxlen, NULL, NULL);
if (called_emsg)
set_string_option_direct((char_u *)"titlestring", -1,
(char_u *)"", OPT_FREE, SID_ERROR);
called_emsg |= save_called_emsg;
}
else
#endif
t_str = p_titlestring;
@@ -3114,15 +3122,23 @@ maketitle()
if (*p_iconstring != NUL)
{
#ifdef FEAT_STL_OPT
int use_sandbox = FALSE;
if (stl_syntax & STL_IN_ICON)
{
int use_sandbox = FALSE;
int save_called_emsg = called_emsg;
# ifdef FEAT_EVAL
use_sandbox = was_set_insecurely((char_u *)"iconstring", 0);
use_sandbox = was_set_insecurely((char_u *)"iconstring", 0);
# endif
if (stl_syntax & STL_IN_ICON)
called_emsg = FALSE;
build_stl_str_hl(curwin, i_str, sizeof(buf),
p_iconstring, use_sandbox,
0, 0, NULL, NULL);
if (called_emsg)
set_string_option_direct((char_u *)"iconstring", -1,
(char_u *)"", OPT_FREE, SID_ERROR);
called_emsg |= save_called_emsg;
}
else
#endif
i_str = p_iconstring;

7
src/ex_docmd.c
View File

@@ -8196,7 +8196,10 @@ ex_bang(eap)
ex_undo(eap)
exarg_T *eap;
{
u_undo(1);
if (eap->addr_count == 1) /* :undo 123 */
undo_time(eap->line2, FALSE, TRUE);
else
u_undo(1);
}
/*
@@ -8238,7 +8241,7 @@ ex_later(eap)
if (*p != NUL)
EMSG2(_(e_invarg2), eap->arg);
else
undo_time(eap->cmdidx == CMD_earlier ? -count : count, sec);
undo_time(eap->cmdidx == CMD_earlier ? -count : count, sec, FALSE);
}
/*

4
src/gui.c
View File

@@ -4394,6 +4394,10 @@ gui_mouse_moved(x, y)
win_T *wp;
char_u st[6];
/* Ignore this while still starting up. */
if (!gui.in_use || gui.starting)
return;
#ifdef FEAT_MOUSESHAPE
/* Get window pointer, and update mouse shape as well. */
wp = xy2win(x, y);

3
src/normal.c
View File

@@ -8009,7 +8009,8 @@ nv_g_cmd(cap)
case '+':
case '-': /* "g+" and "g-": undo or redo along the timeline */
if (!checkclearopq(oap))
undo_time(cap->nchar == '-' ? -cap->count1 : cap->count1, FALSE);
undo_time(cap->nchar == '-' ? -cap->count1 : cap->count1,
FALSE, FALSE);
break;
default:

3
src/proto/undo.pro
View File

@@ -6,8 +6,9 @@ int u_inssub __ARGS((linenr_T lnum));
int u_savedel __ARGS((linenr_T lnum, long nlines));
void u_undo __ARGS((int count));
void u_redo __ARGS((int count));
void undo_time __ARGS((long step, int sec));
void undo_time __ARGS((long step, int sec, int absolute));
void u_sync __ARGS((void));
void ex_undolist __ARGS((exarg_T *eap));
void ex_undojoin __ARGS((exarg_T *eap));
void u_unchanged __ARGS((buf_T *buf));
void u_clearall __ARGS((buf_T *buf));