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

updated for version 7.0e05

Browse Source
This commit is contained in:
Bram Moolenaar
2006-04-21 22:12:41 +00:00
parent fc1421eb53
commit 57657d85c6
201 changed files with 3115 additions and 2797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/auto/configure vendored
View File

@@ -9197,7 +9197,7 @@ fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
else
cat >>confdefs.h <<\_ACEOF
#define XPMATTRIBUTES_TYPE XpmAttributes_21
#define XPMATTRIBUTES_TYPE XpmAttributes
_ACEOF
fi

2
src/configure.in
View File

@@ -1911,7 +1911,7 @@ if test -z "$SKIP_MOTIF"; then
AC_MSG_RESULT(no); AC_DEFINE(XPMATTRIBUTES_TYPE, XpmAttributes)
)
else
AC_DEFINE(XPMATTRIBUTES_TYPE, XpmAttributes_21)
AC_DEFINE(XPMATTRIBUTES_TYPE, XpmAttributes)
fi
CPPFLAGS=$cppflags_save
fi

5
src/digraph.c
View File

@@ -2439,8 +2439,11 @@ ex_loadkeymap(eap)
kp->to = vim_strnsave(p, (int)(s - p));
if (kp->from == NULL || kp->to == NULL
|| STRLEN(kp->from) + STRLEN(kp->to) >= KMAP_LLEN)
|| STRLEN(kp->from) + STRLEN(kp->to) >= KMAP_LLEN
|| *kp->from == NUL || *kp->to == NUL)
{
if (kp->to != NULL && *kp->to == NUL)
EMSG(_("E791: Empty keymap entry"));
vim_free(kp->from);
vim_free(kp->to);
}

34
src/ex_eval.c
View File

@@ -155,22 +155,22 @@ cause_errthrow(mesg, severe, ignore)
struct msglist **plist;
/*
* Do nothing when displaying the interrupt message or reporting an uncaught
* exception (which has already been discarded then) at the top level. Also
* when no exception can be thrown. The message will be displayed by
* emsg().
* Do nothing when displaying the interrupt message or reporting an
* uncaught exception (which has already been discarded then) at the top
* level. Also when no exception can be thrown. The message will be
* displayed by emsg().
*/
if (suppress_errthrow)
return FALSE;
/*
* If emsg() has not been called previously, temporarily reset "force_abort"
* until the throw point for error messages has been reached. This ensures
* that aborting() returns the same value for all errors that appear in the
* same command. This means particularly that for parsing errors during
* expression evaluation emsg() will be called multiply, even when the
* expression is evaluated from a finally clause that was activated due to
* an aborting error, interrupt, or exception.
* If emsg() has not been called previously, temporarily reset
* "force_abort" until the throw point for error messages has been
* reached. This ensures that aborting() returns the same value for all
* errors that appear in the same command. This means particularly that
* for parsing errors during expression evaluation emsg() will be called
* multiply, even when the expression is evaluated from a finally clause
* that was activated due to an aborting error, interrupt, or exception.
*/
if (!did_emsg)
{
@@ -181,18 +181,18 @@ cause_errthrow(mesg, severe, ignore)
/*
* If no try conditional is active and no exception is being thrown and
* there has not been an error in a try conditional or a throw so far, do
* nothing (for compatibility of non-EH scripts). The message will then be
* displayed by emsg(). When ":silent!" was used and we are not currently
* throwing an exception, do nothing. The message text will then be stored
* to v:errmsg by emsg() without displaying it.
* nothing (for compatibility of non-EH scripts). The message will then
* be displayed by emsg(). When ":silent!" was used and we are not
* currently throwing an exception, do nothing. The message text will
* then be stored to v:errmsg by emsg() without displaying it.
*/
if (((trylevel == 0 && !cause_abort) || emsg_silent) && !did_throw)
return FALSE;
/*
* Ignore an interrupt message when inside a try conditional or when an
* exception is being thrown or when an error in a try conditional or throw
* has been detected previously. This is important in order that an
* exception is being thrown or when an error in a try conditional or
* throw has been detected previously. This is important in order that an
* interrupt exception is catchable by the innermost try conditional and
* not replaced by an interrupt message error exception.
*/

22
src/gui.c
View File

@@ -3407,31 +3407,36 @@ gui_update_tabline()
}
/*
* Get the label for tab page "tp" into NameBuff[].
* Get the label or tooltip for tab page "tp" into NameBuff[].
*/
void
get_tabline_label(tp)
get_tabline_label(tp, tooltip)
tabpage_T *tp;
int tooltip; /* TRUE: get tooltip */
{
int modified = FALSE;
char_u buf[40];
int wincount;
win_T *wp;
char_u *opt;
/* Use 'guitablabel' if it's set. */
if (*p_gtl != NUL)
/* Use 'guitablabel' or 'guitabtooltip' if it's set. */
opt = (tooltip ? p_gtt : p_gtl);
if (*opt != NUL)
{
int use_sandbox = FALSE;
int save_called_emsg = called_emsg;
char_u res[MAXPATHL];
tabpage_T *save_curtab;
char_u *opt_name = (char_u *)(tooltip ? "guitabtooltip"
: "guitablabel");
called_emsg = FALSE;
printer_page_num = tabpage_index(tp);
# ifdef FEAT_EVAL
set_vim_var_nr(VV_LNUM, printer_page_num);
use_sandbox = was_set_insecurely((char_u *)"guitablabel", 0);
use_sandbox = was_set_insecurely(opt_name, 0);
# endif
/* It's almost as going to the tabpage, but without autocommands. */
curtab->tp_firstwin = firstwin;
@@ -3446,7 +3451,7 @@ get_tabline_label(tp)
curbuf = curwin->w_buffer;
/* Can't use NameBuff directly, build_stl_str_hl() uses it. */
build_stl_str_hl(curwin, res, MAXPATHL, p_gtl, use_sandbox,
build_stl_str_hl(curwin, res, MAXPATHL, opt, use_sandbox,
0, (int)Columns, NULL, NULL);
STRCPY(NameBuff, res);
@@ -3459,7 +3464,7 @@ get_tabline_label(tp)
curbuf = curwin->w_buffer;
if (called_emsg)
set_string_option_direct((char_u *)"guitablabel", -1,
set_string_option_direct(opt_name, -1,
(char_u *)"", OPT_FREE, SID_ERROR);
called_emsg |= save_called_emsg;
}
@@ -3467,7 +3472,8 @@ get_tabline_label(tp)
{
/* Get the buffer name into NameBuff[] and shorten it. */
get_trans_bufname(tp == curtab ? curbuf : tp->tp_curwin->w_buffer);
shorten_dir(NameBuff);
if (!tooltip)
shorten_dir(NameBuff);
wp = (tp == curtab) ? firstwin : tp->tp_firstwin;
for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount)

2
src/gui_gtk_x11.c
View File

@@ -3320,7 +3320,7 @@ gui_mch_update_tabline(void)
nr++);
}
get_tabline_label(tp);
get_tabline_label(tp, FALSE);
labeltext = CONVERT_TO_UTF8(NameBuff);
gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(gui.tabline), page,
(const gchar *)labeltext);

5
src/gui_motif.c
View File

@@ -3359,8 +3359,9 @@ gui_mch_update_tabline(void)
XtVaGetValues(tab, XmNlabelString, &label_str, NULL);
if (XmStringGetLtoR(label_str, XmSTRING_DEFAULT_CHARSET, &label_cstr))
{
get_tabline_label(tp);
if (STRCMP(label_cstr, NameBuff) != 0) {
get_tabline_label(tp, FALSE);
if (STRCMP(label_cstr, NameBuff) != 0)
{
XtVaSetValues(tab, XtVaTypedArg, XmNlabelString, XmRString,
NameBuff, STRLEN(NameBuff) + 1, NULL);
/*

2
src/gui_w48.c
View File

@@ -2334,7 +2334,7 @@ gui_mch_update_tabline(void)
TabCtrl_InsertItem(s_tabhwnd, nr, &tie);
}
get_tabline_label(tp);
get_tabline_label(tp, FALSE);
tie.pszText = NameBuff;
#ifdef FEAT_MBYTE
wstr = NULL;

7
src/message.c
View File

@@ -561,17 +561,18 @@ emsg(s)
/*
* If "emsg_off" is set: no error messages at the moment.
* If 'debug' is set: do error message anyway, but without side effects.
* If "msg" is in 'debug': do error message but without side effects.
* If "emsg_skip" is set: never do error messages.
*/
if ((emsg_off > 0 && vim_strchr(p_debug, 'm') == NULL)
if ((emsg_off > 0 && vim_strchr(p_debug, 'm') == NULL
&& vim_strchr(p_debug, 't') == NULL)
#ifdef FEAT_EVAL
|| emsg_skip > 0
#endif
)
return TRUE;
if (!emsg_off)
if (!emsg_off || vim_strchr(p_debug, 't') != NULL)
{
#ifdef FEAT_EVAL
/*

6
src/misc2.c
View File

@@ -5816,7 +5816,8 @@ filewritable(fname)
emsg3(s, a1, a2)
char_u *s, *a1, *a2;
{
if ((emsg_off > 0 && vim_strchr(p_debug, 'm') == NULL)
if ((emsg_off > 0 && vim_strchr(p_debug, 'm') == NULL
&& vim_strchr(p_debug, 't') == NULL)
#ifdef FEAT_EVAL
|| emsg_skip > 0
#endif
@@ -5835,7 +5836,8 @@ emsgn(s, n)
char_u *s;
long n;
{
if ((emsg_off > 0 && vim_strchr(p_debug, 'm') == NULL)
if ((emsg_off > 0 && vim_strchr(p_debug, 'm') == NULL
&& vim_strchr(p_debug, 't') == NULL)
#ifdef FEAT_EVAL
|| emsg_skip > 0
#endif

13
src/option.c
View File

@@ -1265,6 +1265,15 @@ static struct vimoption
#else
(char_u *)NULL, PV_NONE,
{(char_u *)NULL, (char_u *)0L}
#endif
},
{"guitabtooltip", "gtl", P_STRING|P_VI_DEF|P_RWIN,
#if defined(FEAT_GUI_TABLINE)
(char_u *)&p_gtt, PV_NONE,
{(char_u *)"", (char_u *)0L}
#else
(char_u *)NULL, PV_NONE,
{(char_u *)NULL, (char_u *)0L}
#endif
},
{"hardtabs", "ht", P_NUM|P_VI_DEF,
@@ -2812,7 +2821,7 @@ static char *(p_bsdir_values[]) = {"current", "last", "buffer", NULL};
static char *(p_scbopt_values[]) = {"ver", "hor", "jump", NULL};
#endif
static char *(p_swb_values[]) = {"useopen", "usetab", "split", NULL};
static char *(p_debug_values[]) = {"msg", "beep", NULL};
static char *(p_debug_values[]) = {"msg", "throw", "beep", NULL};
#ifdef FEAT_VERTSPLIT
static char *(p_ead_values[]) = {"both", "ver", "hor", NULL};
#endif
@@ -6188,7 +6197,7 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
/* 'debug' */
else if (varp == &p_debug)
{
if (check_opt_strings(p_debug, p_debug_values, FALSE) != OK)
if (check_opt_strings(p_debug, p_debug_values, TRUE) != OK)
errmsg = e_invarg;
}

1
src/option.h
View File

@@ -508,6 +508,7 @@ EXTERN char_u *p_go; /* 'guioptions' */
#endif
#if defined(FEAT_GUI_TABLINE)
EXTERN char_u *p_gtl; /* 'guitablabel' */
EXTERN char_u *p_gtt; /* 'guitabtooltip' */
#endif
EXTERN char_u *p_hf; /* 'helpfile' */
#ifdef FEAT_WINDOWS

68
src/po/it.po
View File

@@ -12,8 +12,8 @@
msgid ""
msgstr ""
"Project-Id-Version: vim 7.0\n"
"POT-Creation-Date: 2006-04-08 09:01+0200\n"
"PO-Revision-Date: 2006-04-08 09:01+0200\n"
"POT-Creation-Date: 2006-04-21 09:26+0200\n"
"PO-Revision-Date: 2006-04-21 09:26+0200\n"
"Last-Translator: Vlad Sandrini <vlad.gently@gmail.com>\n"
"Language-Team: Italian"
" Antonio Colombo <azc100@gmail.com>"
@@ -494,6 +494,22 @@ msgstr "E723: Manca '}' a fine Dizionario: %s"
msgid "E724: variable nested too deep for displaying"
msgstr "E724: variabile troppo nidificata per la visualizzazione"
#, c-format
msgid "E117: Unknown function: %s"
msgstr "E117: Funzione sconosciuta: %s"
#, c-format
msgid "E119: Not enough arguments for function: %s"
msgstr "E119: La funzione: %s richiede più argomenti"
#, c-format
msgid "E120: Using <SID> not in a script context: %s"
msgstr "E120: Uso di <SID> fuori dal contesto di uno script: %s"
#, c-format
msgid "E725: Calling dict function without Dictionary: %s"
msgstr "E725: Chiamata di funzione dict in assenza di Dizionario: %s"
msgid "E699: Too many arguments"
msgstr "E699: Troppi argomenti"
@@ -2517,12 +2533,33 @@ msgstr "<finestra %d>"
msgid "no such window"
msgstr "finestra inesistente"
msgid "E265: $_ must be an instance of String"
msgstr "E265: $_ deve essere un'istanza di String"
msgid ""
"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
msgstr ""
"E266: Spiacente, comando non disponibile, non riesco a caricare libreria "
"programmi Ruby."
msgid "E267: unexpected return"
msgstr "E267: return imprevisto"
msgid "E268: unexpected next"
msgstr "E268: next imprevisto"
msgid "E269: unexpected break"
msgstr "E269: break imprevisto"
msgid "E270: unexpected redo"
msgstr "E270: redo imprevisto"
msgid "E271: retry outside of rescue clause"
msgstr "E271: retry fuori da clausola rescue"
msgid "E272: unhandled exception"
msgstr "E272: eccezione non gestita"
#, c-format
msgid "E273: unknown longjmp status %d"
msgstr "E273: tipo sconosciuto di salto nel programma %d"
@@ -4232,9 +4269,6 @@ msgstr "ANCHOR_BUF_SIZE troppo piccolo."
msgid "I/O ERROR"
msgstr "ERRORE I/O"
msgid "...(truncated)"
msgstr "...(troncato)"
msgid "Message"
msgstr "Messaggio"
@@ -4660,6 +4694,16 @@ msgstr "E388: Non sono riuscito a trovare la definizione"
msgid "E389: Couldn't find pattern"
msgstr "E389: Non sono riuscito a trovare il modello"
#, c-format
msgid ""
"\n"
"# Last %sSearch Pattern:\n"
"~"
msgstr ""
"\n"
"# Ult. %sEspressione di Ricerca:\n"
"~"
msgid "E759: Format error in spell file"
msgstr "E759: Errore di formato nel file ortografico"
@@ -4739,7 +4783,7 @@ msgid ""
"Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
"%d"
msgstr ""
"Definire COMPOUNDFORBIDFLAG dop l'elemento PFX potrebbe dare risultati "
"Definire COMPOUNDFORBIDFLAG dopo l'elemento PFX potrebbe dare risultati "
"errati in %s linea %d"
#, c-format
@@ -4747,7 +4791,7 @@ msgid ""
"Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
"%d"
msgstr ""
"Definire COMPOUNDPERMITFLAG dop l'elemento PFX potrebbe dare risultati "
"Definire COMPOUNDPERMITFLAG dopo l'elemento PFX potrebbe dare risultati "
"errati in %s linea %d"
#, c-format
@@ -5380,6 +5424,10 @@ msgstr "Nessuna modifica, Undo impossibile"
msgid "number changes time"
msgstr "numero modif. ora"
#, c-format
msgid "%ld seconds ago"
msgstr "%ld secondi fa"
msgid "E439: undo list corrupt"
msgstr "E439: lista 'undo' non valida"
@@ -5686,6 +5734,9 @@ msgstr "ATTENZIONE: Trovato Windows 95/98/ME"
msgid "type :help windows95<Enter> for info on this"
msgstr "batti :help windows95<Enter> per info al riguardo"
msgid "Already only one window"
msgstr "C'è già una finestra sola"
msgid "E441: There is no preview window"
msgstr "E441: Non c'è una finestra di pre-visualizzazione"
@@ -5698,9 +5749,6 @@ msgstr "E443: Non posso ruotare quando un'altra finestra
msgid "E444: Cannot close last window"
msgstr "E444: Non riesco a chiudere l'ultima finestra"
msgid "Already only one window"
msgstr "C'è già una finestra sola"
msgid "E445: Other window contains changes"
msgstr "E445: Altre finestre contengono modifiche"

1344
src/po/zh_CN.UTF-8.po
View File

File diff suppressed because it is too large Load Diff

1344
src/po/zh_CN.cp936.po
View File

File diff suppressed because it is too large Load Diff

1344
src/po/zh_CN.po
View File

File diff suppressed because it is too large Load Diff

126
src/proto/gui.pro
View File

@@ -1,65 +1,65 @@
/* gui.c */
extern void gui_start __ARGS((void));
extern void gui_prepare __ARGS((int *argc, char **argv));
extern int gui_init_check __ARGS((void));
extern void gui_init __ARGS((void));
extern void gui_exit __ARGS((int rc));
extern void gui_shell_closed __ARGS((void));
extern int gui_init_font __ARGS((char_u *font_list, int fontset));
extern int gui_get_wide_font __ARGS((void));
extern void gui_set_cursor __ARGS((int row, int col));
extern void gui_update_cursor __ARGS((int force, int clear_selection));
extern void gui_position_menu __ARGS((void));
extern int gui_get_base_width __ARGS((void));
extern int gui_get_base_height __ARGS((void));
extern void gui_resize_shell __ARGS((int pixel_width, int pixel_height));
extern void gui_may_resize_shell __ARGS((void));
extern int gui_get_shellsize __ARGS((void));
extern void gui_set_shellsize __ARGS((int mustset, int fit_to_display, int direction));
extern void gui_new_shellsize __ARGS((void));
extern void gui_reset_scroll_region __ARGS((void));
extern void gui_start_highlight __ARGS((int mask));
extern void gui_stop_highlight __ARGS((int mask));
extern void gui_clear_block __ARGS((int row1, int col1, int row2, int col2));
extern void gui_update_cursor_later __ARGS((void));
extern void gui_write __ARGS((char_u *s, int len));
extern void gui_dont_update_cursor __ARGS((void));
extern void gui_can_update_cursor __ARGS((void));
extern int gui_outstr_nowrap __ARGS((char_u *s, int len, int flags, guicolor_T fg, guicolor_T bg, int back));
extern void gui_undraw_cursor __ARGS((void));
extern void gui_redraw __ARGS((int x, int y, int w, int h));
extern int gui_redraw_block __ARGS((int row1, int col1, int row2, int col2, int flags));
extern int gui_wait_for_chars __ARGS((long wtime));
extern void gui_send_mouse_event __ARGS((int button, int x, int y, int repeated_click, int_u modifiers));
extern int gui_xy2colrow __ARGS((int x, int y, int *colp));
extern void gui_menu_cb __ARGS((vimmenu_T *menu));
extern void gui_init_which_components __ARGS((char_u *oldval));
extern int gui_use_tabline __ARGS((void));
extern void gui_update_tabline __ARGS((void));
extern void get_tabline_label __ARGS((tabpage_T *tp));
extern int send_tabline_event __ARGS((int nr));
extern void send_tabline_menu_event __ARGS((int tabidx, int event));
extern void gui_remove_scrollbars __ARGS((void));
extern void gui_create_scrollbar __ARGS((scrollbar_T *sb, int type, win_T *wp));
extern scrollbar_T *gui_find_scrollbar __ARGS((long ident));
extern void gui_drag_scrollbar __ARGS((scrollbar_T *sb, long value, int still_dragging));
extern void gui_update_scrollbars __ARGS((int force));
extern int gui_do_scroll __ARGS((void));
extern int gui_do_horiz_scroll __ARGS((void));
extern void gui_check_colors __ARGS((void));
extern guicolor_T gui_get_color __ARGS((char_u *name));
extern int gui_get_lightness __ARGS((guicolor_T pixel));
extern void gui_new_scrollbar_colors __ARGS((void));
extern void gui_focus_change __ARGS((int in_focus));
extern void gui_mouse_moved __ARGS((int x, int y));
extern void gui_mouse_correct __ARGS((void));
extern void ex_gui __ARGS((exarg_T *eap));
extern int gui_find_bitmap __ARGS((char_u *name, char_u *buffer, char *ext));
extern void gui_find_iconfile __ARGS((char_u *name, char_u *buffer, char *ext));
extern void display_errors __ARGS((void));
extern int no_console_input __ARGS((void));
extern void gui_update_screen __ARGS((void));
extern char_u *get_find_dialog_text __ARGS((char_u *arg, int *wwordp, int *mcasep));
extern int gui_do_findrepl __ARGS((int flags, char_u *find_text, char_u *repl_text, int down));
extern void gui_handle_drop __ARGS((int x, int y, int_u modifiers, char_u **fnames, int count));
void gui_start __ARGS((void));
void gui_prepare __ARGS((int *argc, char **argv));
int gui_init_check __ARGS((void));
void gui_init __ARGS((void));
void gui_exit __ARGS((int rc));
void gui_shell_closed __ARGS((void));
int gui_init_font __ARGS((char_u *font_list, int fontset));
int gui_get_wide_font __ARGS((void));
void gui_set_cursor __ARGS((int row, int col));
void gui_update_cursor __ARGS((int force, int clear_selection));
void gui_position_menu __ARGS((void));
int gui_get_base_width __ARGS((void));
int gui_get_base_height __ARGS((void));
void gui_resize_shell __ARGS((int pixel_width, int pixel_height));
void gui_may_resize_shell __ARGS((void));
int gui_get_shellsize __ARGS((void));
void gui_set_shellsize __ARGS((int mustset, int fit_to_display, int direction));
void gui_new_shellsize __ARGS((void));
void gui_reset_scroll_region __ARGS((void));
void gui_start_highlight __ARGS((int mask));
void gui_stop_highlight __ARGS((int mask));
void gui_clear_block __ARGS((int row1, int col1, int row2, int col2));
void gui_update_cursor_later __ARGS((void));
void gui_write __ARGS((char_u *s, int len));
void gui_dont_update_cursor __ARGS((void));
void gui_can_update_cursor __ARGS((void));
int gui_outstr_nowrap __ARGS((char_u *s, int len, int flags, guicolor_T fg, guicolor_T bg, int back));
void gui_undraw_cursor __ARGS((void));
void gui_redraw __ARGS((int x, int y, int w, int h));
int gui_redraw_block __ARGS((int row1, int col1, int row2, int col2, int flags));
int gui_wait_for_chars __ARGS((long wtime));
void gui_send_mouse_event __ARGS((int button, int x, int y, int repeated_click, int_u modifiers));
int gui_xy2colrow __ARGS((int x, int y, int *colp));
void gui_menu_cb __ARGS((vimmenu_T *menu));
void gui_init_which_components __ARGS((char_u *oldval));
int gui_use_tabline __ARGS((void));
void gui_update_tabline __ARGS((void));
void get_tabline_label __ARGS((tabpage_T *tp, int tooltip));
int send_tabline_event __ARGS((int nr));
void send_tabline_menu_event __ARGS((int tabidx, int event));
void gui_remove_scrollbars __ARGS((void));
void gui_create_scrollbar __ARGS((scrollbar_T *sb, int type, win_T *wp));
scrollbar_T *gui_find_scrollbar __ARGS((long ident));
void gui_drag_scrollbar __ARGS((scrollbar_T *sb, long value, int still_dragging));
void gui_update_scrollbars __ARGS((int force));
int gui_do_scroll __ARGS((void));
int gui_do_horiz_scroll __ARGS((void));
void gui_check_colors __ARGS((void));
guicolor_T gui_get_color __ARGS((char_u *name));
int gui_get_lightness __ARGS((guicolor_T pixel));
void gui_new_scrollbar_colors __ARGS((void));
void gui_focus_change __ARGS((int in_focus));
void gui_mouse_moved __ARGS((int x, int y));
void gui_mouse_correct __ARGS((void));
void ex_gui __ARGS((exarg_T *eap));
int gui_find_bitmap __ARGS((char_u *name, char_u *buffer, char *ext));
void gui_find_iconfile __ARGS((char_u *name, char_u *buffer, char *ext));
void display_errors __ARGS((void));
int no_console_input __ARGS((void));
void gui_update_screen __ARGS((void));
char_u *get_find_dialog_text __ARGS((char_u *arg, int *wwordp, int *mcasep));
int gui_do_findrepl __ARGS((int flags, char_u *find_text, char_u *repl_text, int down));
void gui_handle_drop __ARGS((int x, int y, int_u modifiers, char_u **fnames, int count));
/* vim: set ft=c : */

9
src/undo.c
View File

@@ -1405,10 +1405,15 @@ u_add_time(buf, buflen, tt)
ex_undojoin(eap)
exarg_T *eap;
{
if (!curbuf->b_u_synced)
return; /* already unsynced */
if (curbuf->b_u_newhead == NULL)
return; /* nothing changed before */
if (curbuf->b_u_curhead != NULL)
{
EMSG(_("E790: undojoin is not allowed after undo"));
return;
}
if (!curbuf->b_u_synced)
return; /* already unsynced */
if (p_ul < 0)
return; /* no entries, nothing to do */
else

6
src/version.h
View File

@@ -35,6 +35,6 @@
*/
#define VIM_VERSION_NODOT "vim70e"
#define VIM_VERSION_SHORT "7.0e"
#define VIM_VERSION_MEDIUM "7.0e04 BETA"
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0e04 BETA (2006 Apr 20)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0e04 BETA (2006 Apr 20, compiled "
#define VIM_VERSION_MEDIUM "7.0e05 BETA"
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0e05 BETA (2006 Apr 21)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0e05 BETA (2006 Apr 21, compiled "

2
src/window.c
View File

@@ -621,7 +621,9 @@ wingotofile:
#ifdef FEAT_SEARCHPATH
case 'f': /* CTRL-W gf: "gf" in a new tab page */
case 'F': /* CTRL-W gF: "gF" in a new tab page */
cmdmod.tab = TRUE;
nchar = xchar;
goto wingotofile;
#endif
default: