diff options
author | Bram Moolenaar <Bram@vim.org> | 2006-04-12 21:52:12 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2006-04-12 21:52:12 +0000 |
commit | 18144c84231aee36ae1d11b74941c9b318f1706a (patch) | |
tree | 6b9cf7e0337cd5966089e795c9278a1a86f9d5c1 /src | |
parent | 4c3f536f472c7443ed4f672ae6d35a28805d7641 (diff) |
updated for version 7.0d02v7.0d02
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile | 12 | ||||
-rw-r--r-- | src/ex_docmd.c | 214 | ||||
-rw-r--r-- | src/gui.c | 13 | ||||
-rw-r--r-- | src/gui_gtk_x11.c | 8 | ||||
-rw-r--r-- | src/gui_motif.c | 16 | ||||
-rw-r--r-- | src/main.aap | 13 | ||||
-rw-r--r-- | src/misc1.c | 84 | ||||
-rw-r--r-- | src/option.c | 6 | ||||
-rw-r--r-- | src/option.h | 3 | ||||
-rw-r--r-- | src/po/it.po | 36 | ||||
-rw-r--r-- | src/po/pl.UTF-8.po | 152 | ||||
-rw-r--r-- | src/po/pl.cp1250.po | 152 | ||||
-rw-r--r-- | src/po/pl.po | 152 | ||||
-rw-r--r-- | src/spell.c | 3 | ||||
-rw-r--r-- | src/testdir/test3.in | 19 | ||||
-rw-r--r-- | src/testdir/test3.ok | 19 | ||||
-rw-r--r-- | src/version.h | 6 |
17 files changed, 629 insertions, 279 deletions
diff --git a/src/Makefile b/src/Makefile index 625271fec9..0a8bbbe091 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1765,8 +1765,8 @@ installruntime: installrtbase installmacros installtutor installspell # install the help files; first adjust the contents for the final location installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(DEST_RT) \ $(DEST_HELP) $(DEST_PRINT) $(DEST_COL) $(DEST_SYN) $(DEST_IND) \ - $(DEST_FTP) $(DEST_AUTO) $(DEST_PLUG) $(DEST_TUTOR) \ - $(DEST_SPELL) $(DEST_COMP) + $(DEST_FTP) $(DEST_AUTO) $(DEST_AUTO)/xml $(DEST_PLUG) \ + $(DEST_TUTOR) $(DEST_SPELL) $(DEST_COMP) -$(SHELL) ./installman.sh install $(DEST_MAN) "" $(INSTALLMANARGS) @echo generating help tags # Generate the help tags with ":helptags" to handle all languages. @@ -1831,6 +1831,8 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(DEST_RT) \ # install the standard autoload files cd $(AUTOSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_AUTO) cd $(DEST_AUTO); chmod $(HELPMOD) *.vim README.txt + cd $(AUTOSOURCE)/xml; $(INSTALL_DATA) *.vim $(DEST_AUTO)/xml + cd $(DEST_AUTO)/xml; chmod $(HELPMOD) *.vim # install the standard plugin files cd $(PLUGSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_PLUG) cd $(DEST_PLUG); chmod $(HELPMOD) *.vim README.txt @@ -1989,7 +1991,7 @@ $(DESTDIR)$(exec_prefix) $(DEST_BIN) \ $(DEST_PRINT) $(DEST_COL) $(DEST_SYN) $(DEST_IND) $(DEST_FTP) \ $(DEST_LANG) $(DEST_KMAP) $(DEST_COMP) \ $(DEST_MACRO) $(DEST_TOOLS) $(DEST_TUTOR) $(DEST_SPELL) \ - $(DEST_AUTO) $(DEST_PLUG): + $(DEST_AUTO) $(DEST_AUTO)/xml $(DEST_PLUG): -$(SHELL) ./mkinstalldirs $@ -chmod $(DIRMOD) $@ @@ -2137,9 +2139,9 @@ uninstall_runtime: -rm -f $(DEST_PRINT)/*.ps -rmdir $(DEST_HELP) $(DEST_PRINT) $(DEST_COL) $(DEST_SYN) $(DEST_IND) -rm -rf $(DEST_FTP)/*.vim $(DEST_FTP)/README.txt - -rm -f $(DEST_AUTO)/*.vim $(DEST_AUTO)/README.txt + -rm -f $(DEST_AUTO)/*.vim $(DEST_AUTO)/README.txt $(DEST_AUTO)/xml/*.vim -rm -f $(DEST_PLUG)/*.vim $(DEST_PLUG)/README.txt - -rmdir $(DEST_FTP) $(DEST_AUTO) $(DEST_PLUG) $(DEST_RT) + -rmdir $(DEST_FTP) $(DEST_AUTO)/xml $(DEST_AUTO) $(DEST_PLUG) $(DEST_RT) # This will fail when other Vim versions are installed, no worries. -rmdir $(DEST_VIM) diff --git a/src/ex_docmd.c b/src/ex_docmd.c index a88e798cdc..8323ca83ee 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -9643,6 +9643,8 @@ makeopens(fd, dirnow) win_T *wp; char_u *sname; win_T *edited_win = NULL; + tabpage_T *old_curtab = curtab; + int tabnr; if (ssop_flags & SSOP_BUFFERS) only_save_windows = FALSE; /* Save ALL buffers */ @@ -9748,114 +9750,144 @@ makeopens(fd, dirnow) #endif /* - * Before creating the window layout, try loading one file. If this is - * aborted we don't end up with a number of useless windows. - * This may have side effects! (e.g., compressed or network file). + * May repeat putting Windows for each tab, when "tabpages" is in + * 'sessionoptions'. */ - for (wp = firstwin; wp != NULL; wp = wp->w_next) + for (tabnr = 1; ; ++tabnr) { - if (ses_do_win(wp) - && wp->w_buffer->b_ffname != NULL - && !wp->w_buffer->b_help -#ifdef FEAT_QUICKFIX - && !bt_nofile(wp->w_buffer) -#endif - ) + if ((ssop_flags & SSOP_TABPAGES)) { - if (fputs("edit ", fd) < 0 - || ses_fname(fd, wp->w_buffer, &ssop_flags) == FAIL) + goto_tabpage(tabnr); + if (tabnr > 1 && put_line(fd, "tabnew") == FAIL) return FAIL; - if (!wp->w_arg_idx_invalid) - edited_win = wp; - break; } - } - /* - * Save current window layout. - */ - if (put_line(fd, "set splitbelow splitright") == FAIL) - return FAIL; - if (ses_win_rec(fd, topframe) == FAIL) - return FAIL; - if (!p_sb && put_line(fd, "set nosplitbelow") == FAIL) - return FAIL; - if (!p_spr && put_line(fd, "set nosplitright") == FAIL) - return FAIL; + /* + * Before creating the window layout, try loading one file. If this + * is aborted we don't end up with a number of useless windows. + * This may have side effects! (e.g., compressed or network file). + */ + for (wp = firstwin; wp != NULL; wp = wp->w_next) + { + if (ses_do_win(wp) + && wp->w_buffer->b_ffname != NULL + && !wp->w_buffer->b_help +#ifdef FEAT_QUICKFIX + && !bt_nofile(wp->w_buffer) +#endif + ) + { + if (fputs("edit ", fd) < 0 + || ses_fname(fd, wp->w_buffer, &ssop_flags) == FAIL) + return FAIL; + if (!wp->w_arg_idx_invalid) + edited_win = wp; + break; + } + } - /* - * Check if window sizes can be restored (no windows omitted). - * Remember the window number of the current window after restoring. - */ - nr = 0; - for (wp = firstwin; wp != NULL; wp = W_NEXT(wp)) - { - if (ses_do_win(wp)) - ++nr; - else - restore_size = FALSE; - if (curwin == wp) - cnr = nr; - } + /* + * Save current window layout. + */ + if (put_line(fd, "set splitbelow splitright") == FAIL) + return FAIL; + if (ses_win_rec(fd, topframe) == FAIL) + return FAIL; + if (!p_sb && put_line(fd, "set nosplitbelow") == FAIL) + return FAIL; + if (!p_spr && put_line(fd, "set nosplitright") == FAIL) + return FAIL; - /* Go to the first window. */ - if (put_line(fd, "wincmd t") == FAIL) - return FAIL; + /* + * Check if window sizes can be restored (no windows omitted). + * Remember the window number of the current window after restoring. + */ + nr = 0; + for (wp = firstwin; wp != NULL; wp = W_NEXT(wp)) + { + if (ses_do_win(wp)) + ++nr; + else + restore_size = FALSE; + if (curwin == wp) + cnr = nr; + } - /* - * If more than one window, see if sizes can be restored. - * First set 'winheight' and 'winwidth' to 1 to avoid the windows being - * resized when moving between windows. - * Do this before restoring the view, so that the topline and the cursor - * can be set. This is done again below. - */ - if (put_line(fd, "set winheight=1 winwidth=1") == FAIL) - return FAIL; - if (nr > 1 && ses_winsizes(fd, restore_size) == FAIL) - return FAIL; + /* Go to the first window. */ + if (put_line(fd, "wincmd t") == FAIL) + return FAIL; - /* - * Restore the view of the window (options, file, cursor, etc.). - */ - for (wp = firstwin; wp != NULL; wp = wp->w_next) - { - if (!ses_do_win(wp)) - continue; - if (put_view(fd, wp, wp != edited_win, &ssop_flags) == FAIL) + /* + * If more than one window, see if sizes can be restored. + * First set 'winheight' and 'winwidth' to 1 to avoid the windows being + * resized when moving between windows. + * Do this before restoring the view, so that the topline and the + * cursor can be set. This is done again below. + */ + if (put_line(fd, "set winheight=1 winwidth=1") == FAIL) return FAIL; - if (nr > 1 && put_line(fd, "wincmd w") == FAIL) + if (nr > 1 && ses_winsizes(fd, restore_size) == FAIL) return FAIL; - } - /* - * Restore cursor to the current window if it's not the first one. - */ - if (cnr > 1 && (fprintf(fd, "%dwincmd w", cnr) < 0 || put_eol(fd) == FAIL)) - return FAIL; + /* + * Restore the view of the window (options, file, cursor, etc.). + */ + for (wp = firstwin; wp != NULL; wp = wp->w_next) + { + if (!ses_do_win(wp)) + continue; + if (put_view(fd, wp, wp != edited_win, &ssop_flags) == FAIL) + return FAIL; + if (nr > 1 && put_line(fd, "wincmd w") == FAIL) + return FAIL; + } - /* - * Wipe out an empty unnamed buffer we started in. - */ - if (put_line(fd, "if exists('s:wipebuf')") == FAIL) - return FAIL; - if (put_line(fd, " exe 'bwipe ' . s:wipebuf") == FAIL) - return FAIL; - if (put_line(fd, "endif") == FAIL) - return FAIL; - if (put_line(fd, "unlet! s:wipebuf") == FAIL) - return FAIL; + /* + * Restore cursor to the current window if it's not the first one. + */ + if (cnr > 1 && (fprintf(fd, "%dwincmd w", cnr) < 0 + || put_eol(fd) == FAIL)) + return FAIL; - /* - * Restore window sizes again after jumping around in windows, because the - * current window has a minimum size while others may not. - */ - if (nr > 1 && ses_winsizes(fd, restore_size) == FAIL) - return FAIL; + /* + * Wipe out an empty unnamed buffer we started in. + */ + if (put_line(fd, "if exists('s:wipebuf')") == FAIL) + return FAIL; + if (put_line(fd, " exe 'bwipe ' . s:wipebuf") == FAIL) + return FAIL; + if (put_line(fd, "endif") == FAIL) + return FAIL; + if (put_line(fd, "unlet! s:wipebuf") == FAIL) + return FAIL; - /* Re-apply 'winheight', 'winwidth' and 'shortmess'. */ - if (fprintf(fd, "set winheight=%ld winwidth=%ld shortmess=%s", + /* + * Restore window sizes again after jumping around in windows, because + * the current window has a minimum size while others may not. + */ + if (nr > 1 && ses_winsizes(fd, restore_size) == FAIL) + return FAIL; + + /* Re-apply 'winheight', 'winwidth' and 'shortmess'. */ + if (fprintf(fd, "set winheight=%ld winwidth=%ld shortmess=%s", p_wh, p_wiw, p_shm) < 0 || put_eol(fd) == FAIL) - return FAIL; + return FAIL; + + /* Don't continue in another tab page when doing only the current one + * or when at the last tab page. */ + if (!(ssop_flags & SSOP_TABPAGES) || curtab->tp_next == NULL) + break; + } + + if (ssop_flags & SSOP_TABPAGES) + { + if (valid_tabpage(old_curtab)) + goto_tabpage_tp(old_curtab); + if (fprintf(fd, "tabnext %d", tabpage_index(curtab)) < 0 + || put_eol(fd) == FAIL) + return FAIL; + } + /* * Lastly, execute the x.vim file if it exists. @@ -548,6 +548,19 @@ gui_init() #if defined(FEAT_GUI_GTK) /* Give GTK+ a chance to put all widget's into place. */ gui_mch_update(); + +# ifdef FEAT_MENU + /* If there is no 'm' in 'guioptions' we need to remove the menu now. + * It was still there to make F10 work. */ + if (vim_strchr(p_go, GO_MENUS) == NULL) + { + --gui.starting; + gui_mch_enable_menu(FALSE); + ++gui.starting; + gui_mch_update(); + } +# endif + /* Now make sure the shell fits on the screen. */ gui_set_shellsize(FALSE, TRUE, RESIZE_BOTH); #endif diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index adb603a6c9..b44100e5bb 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -3562,8 +3562,9 @@ gui_mch_init(void) else # endif /* FEAT_GUI_GNOME */ { - if (vim_strchr(p_go, GO_MENUS) != NULL) - gtk_widget_show(gui.menubar); + /* Always show the menubar, otherwise <F10> doesn't work. It may be + * disabled in gui_init() later. */ + gtk_widget_show(gui.menubar); gtk_box_pack_start(GTK_BOX(vbox), gui.menubar, FALSE, FALSE, 0); } #endif /* FEAT_MENU */ @@ -4366,7 +4367,8 @@ gui_mch_enable_menu(int showit) # endif widget = gui.menubar; - if (!showit != !GTK_WIDGET_VISIBLE(widget)) + /* Do not disable the menu while starting up, otherwise F10 doesn't work. */ + if (!showit != !GTK_WIDGET_VISIBLE(widget) && !gui.starting) { if (showit) gtk_widget_show(widget); diff --git a/src/gui_motif.c b/src/gui_motif.c index 4caecc308d..7eb57589c4 100644 --- a/src/gui_motif.c +++ b/src/gui_motif.c @@ -370,7 +370,7 @@ label_expose(_w, _event, _region) gui_x11_create_widgets() { #ifdef FEAT_GUI_TABLINE - Widget button; + Widget button, scroller; Arg args[10]; int n; XmString xms; @@ -491,6 +491,20 @@ gui_x11_create_widgets() XtAddEventHandler(tabLine, ButtonPressMask, False, (XtEventHandler)tabline_menu_cb, NULL); + /* + * Set the size of the minor next/prev scrollers to zero, so + * that they are not displayed. Due to a bug in OpenMotif 2.3, + * even if these children widget are unmanaged, they are again + * managed by the Notebook widget and the notebook widget geometry + * is adjusted to account for the minor scroller widgets. + */ + scroller = XtNameToWidget(tabLine, "MinorTabScrollerNext"); + XtVaSetValues(scroller, XmNwidth, 0, XmNresizable, False, + XmNtraversalOn, False, NULL); + scroller = XtNameToWidget(tabLine, "MinorTabScrollerPrevious"); + XtVaSetValues(scroller, XmNwidth, 0, XmNresizable, False, + XmNtraversalOn, False, NULL); + /* Create the tabline popup menu */ tabLine_menu = XmCreatePopupMenu(tabLine, "tabline popup", NULL, 0); diff --git a/src/main.aap b/src/main.aap index 3ce0890e11..3700edd98d 100644 --- a/src/main.aap +++ b/src/main.aap @@ -665,7 +665,8 @@ DEST_MAN_RU_U = $(DEST_MAN_TOP)/ru.UTF-8$(MAN1DIR) # These are directories, create them when needed. :attr {directory = $DIRMOD} $DEST_BIN $DEST_VIM $DEST_RT $DEST_HELP $DEST_COL - $DEST_SYN $DEST_IND $DEST_AUTO $DEST_PLUG $DEST_FTP $DEST_LANG + $DEST_SYN $DEST_IND $DEST_AUTO $DEST_AUTO/xml $DEST_PLUG + $DEST_FTP $DEST_LANG $DEST_COMP $DEST_KMAP $DEST_MACRO $DEST_TOOLS $DEST_TUTOR $DEST_SCRIPT $DEST_PRINT $DEST_MAN $DEST_SPELL $DEST_MAN_FR $DEST_MAN_FR_I $DEST_MAN_FR_U $DEST_MAN_IT @@ -722,8 +723,8 @@ installruntime {virtual}: installrtbase installmacros installtutor installspell # install the help files; first adjust the contents for the location installrtbase {virtual}{force}: $HELPSOURCE/vim.1 $DEST_VIM $DEST_RT $DEST_HELP $DEST_COL $DEST_SYN $DEST_IND - $DEST_FTP $DEST_AUTO $DEST_PLUG $DEST_TUTOR $DEST_COMP - $DEST_SPELL $DEST_PRINT + $DEST_FTP $DEST_AUTO $DEST_AUTO/xml $DEST_PLUG $DEST_TUTOR + $DEST_COMP $DEST_SPELL $DEST_PRINT :chmod 755 installman.sh :sys ./installman.sh install $(DEST_MAN) "" $(INSTALLMANARGS) @@ -791,6 +792,8 @@ installrtbase {virtual}{force}: $HELPSOURCE/vim.1 $DEST_VIM # install the standard autoload files :copy $AUTOSOURCE/*.vim $AUTOSOURCE/README.txt $DEST_AUTO :chmod $HELPMOD $DEST_AUTO/*.vim $DEST_AUTO/README.txt + :copy $AUTOSOURCE/xml/*.vim $DEST_AUTO/xml + :chmod $HELPMOD $DEST_AUTO/xml/*.vim # install the standard plugin files :copy $PLUGSOURCE/*.vim $PLUGSOURCE/README.txt $DEST_PLUG :chmod $HELPMOD $DEST_PLUG/*.vim $DEST_PLUG/README.txt @@ -1122,9 +1125,9 @@ uninstall_runtime {virtual}{force}: :del {force}{recursive} $DEST_COMP :deldir {force} $DEST_HELP $DEST_COL $DEST_SYN $DEST_IND :del {force}{recursive} $DEST_FTP/*.vim $DEST_FTP/README.txt - :del {force} $DEST_AUTO/*.vim $DEST_AUTO/README.txt + :del {force} $DEST_AUTO/*.vim $DEST_AUTO/README.txt $DEST_AUTO/xml/*.vim :del {force} $DEST_PLUG/*.vim $DEST_PLUG/README.txt - :deldir {force} $DEST_FTP $DEST_AUTO $DEST_PLUG $DEST_PRINT $DEST_RT + :deldir {force} $DEST_FTP $DEST_AUTO/xml $DEST_AUTO $DEST_PLUG $DEST_PRINT $DEST_RT # This will fail when other Vim versions are installed, no worries. @try: :deldir $DEST_VIM diff --git a/src/misc1.c b/src/misc1.c index 22dbfc872f..c8d0000ab9 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -5456,6 +5456,8 @@ cin_isbreak(p) * anotherBaseClass <-- here (should probably lineup ??) * MyClass::MyClass(...) : * baseClass(...) <-- here (constructor-initialization) + * + * This is a lot of guessing. Watch out for "cond ? func() : foo". */ static int cin_is_cpp_baseclass(line, col) @@ -5523,6 +5525,11 @@ cin_is_cpp_baseclass(line, col) class_or_struct = FALSE; lookfor_ctor_init = TRUE; } + else if (s[0] == '?') + { + /* Avoid seeing '() :' after '?' as constructor init. */ + return FALSE; + } else if (!vim_isIDc(s[0])) { /* if it is not an identifier, we are wrong */ @@ -5543,6 +5550,32 @@ cin_is_cpp_baseclass(line, col) } } + if (cpp_base_class && curwin->w_cursor.lnum > 1) + { + /* Check that there is no '?' in the previous line to catch: + * a = cond ? + * func() : + * asdf; + */ + s = ml_get(curwin->w_cursor.lnum - 1); + if (!cin_ispreproc(s)) + while (*s != NUL) + { + s = cin_skipcomment(s); + if (*s == '?') + /* Disable when finding a '?'... */ + cpp_base_class = FALSE; + else if (*s == ';' && cin_nocode(s + 1)) + { + /* ...but re-enable when the line ends in ';'. */ + cpp_base_class = TRUE; + break; + } + if (*s != NUL) + ++s; + } + } + return cpp_base_class; } @@ -6714,7 +6747,7 @@ get_c_indent() /* * If this is a switch() label, may line up relative to that. - * if this is a C++ scope declaration, do the same. + * If this is a C++ scope declaration, do the same. */ iscase = cin_iscase(l); if (iscase || cin_isscopedecl(l)) @@ -6854,8 +6887,13 @@ get_c_indent() * Are we at the start of a cpp base class declaration or * constructor initialization? */ /* XXX */ - if (lookfor != LOOKFOR_TERM && ind_cpp_baseclass - && cin_is_cpp_baseclass(l, &col)) + n = FALSE; + if (lookfor != LOOKFOR_TERM && ind_cpp_baseclass > 0) + { + n = cin_is_cpp_baseclass(l, &col); + l = ml_get_curline(); + } + if (n) { if (lookfor == LOOKFOR_UNTERM) { @@ -6885,7 +6923,8 @@ get_c_indent() else if (lookfor == LOOKFOR_CPP_BASECLASS) { /* only look, whether there is a cpp base class - * declaration or initialization before the opening brace. */ + * declaration or initialization before the opening brace. + */ if (cin_isterminated(l, TRUE, FALSE)) break; else @@ -7326,11 +7365,33 @@ term_again: if (theline[0] == '{') amount += ind_open_extra; /* See remark above: "Only add ind_open_extra.." */ - if (*skipwhite(l) == '{') + l = skipwhite(l); + if (*l == '{') amount -= ind_open_extra; lookfor = iscase ? LOOKFOR_ANY : LOOKFOR_TERM; /* + * When a terminated line starts with "else" skip to + * the matching "if": + * else 3; + * indent this; + * Need to use the scope of this "else". XXX + * If whilelevel != 0 continue looking for a "do {". + */ + if (lookfor == LOOKFOR_TERM + && *l != '}' + && cin_iselse(l) + && whilelevel == 0) + { + if ((trypos = find_start_brace(ind_maxcomment)) + == NULL + || find_match(LOOKFOR_IF, trypos->lnum, + ind_maxparen, ind_maxcomment) == FAIL) + break; + continue; + } + + /* * If we're at the end of a block, skip to the start of * that block. */ @@ -7418,11 +7479,16 @@ term_again: } /* - * Are we at the start of a cpp base class declaration or constructor - * initialization? + * Are we at the start of a cpp base class declaration or + * constructor initialization? */ /* XXX */ - if (ind_cpp_baseclass != 0 && theline[0] != '{' - && cin_is_cpp_baseclass(l, &col)) + n = FALSE; + if (ind_cpp_baseclass != 0 && theline[0] != '{') + { + n = cin_is_cpp_baseclass(l, &col); + l = ml_get_curline(); + } + if (n) { if (col == 0) { diff --git a/src/option.c b/src/option.c index d24b2cd9ac..36cfe035e7 100644 --- a/src/option.c +++ b/src/option.c @@ -1258,7 +1258,7 @@ static struct vimoption (char_u *)NULL, PV_NONE, #endif {(char_u *)TRUE, (char_u *)0L}}, - {"guitablabel", "gtl", P_STRING|P_VI_DEF, + {"guitablabel", "gtl", P_STRING|P_VI_DEF|P_RWIN, #if defined(FEAT_GUI_TABLINE) (char_u *)&p_gtl, PV_NONE, {(char_u *)"", (char_u *)0L} @@ -2066,7 +2066,7 @@ static struct vimoption {"sessionoptions", "ssop", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_SESSION (char_u *)&p_ssop, PV_NONE, - {(char_u *)"blank,buffers,curdir,folds,help,options,winsize", + {(char_u *)"blank,buffers,curdir,folds,help,options,tabpage,winsize", (char_u *)0L} #else (char_u *)NULL, PV_NONE, @@ -6069,7 +6069,7 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf, #if defined(FEAT_GUI_TABLINE) /* 'guitablabel' */ else if (varp == &p_gtl) - gui_init_which_components(NULL); + redraw_tabline = TRUE; #endif #if defined(FEAT_MOUSE_TTY) && (defined(UNIX) || defined(VMS)) diff --git a/src/option.h b/src/option.h index afa1894838..39c03e181f 100644 --- a/src/option.h +++ b/src/option.h @@ -663,7 +663,7 @@ EXTERN unsigned ssop_flags; /* Also used for 'viewoptions'! */ static char *(p_ssop_values[]) = {"buffers", "winpos", "resize", "winsize", "localoptions", "options", "help", "blank", "globals", "slash", "unix", - "sesdir", "curdir", "folds", "cursor", NULL}; + "sesdir", "curdir", "folds", "cursor", "tabpages", NULL}; # endif # define SSOP_BUFFERS 0x001 # define SSOP_WINPOS 0x002 @@ -680,6 +680,7 @@ static char *(p_ssop_values[]) = {"buffers", "winpos", "resize", "winsize", # define SSOP_CURDIR 0x1000 # define SSOP_FOLDS 0x2000 # define SSOP_CURSOR 0x4000 +# define SSOP_TABPAGES 0x8000 #endif EXTERN char_u *p_sh; /* 'shell' */ EXTERN char_u *p_shcf; /* 'shellcmdflag' */ diff --git a/src/po/it.po b/src/po/it.po index 2299c3a200..7e970d4985 100644 --- a/src/po/it.po +++ b/src/po/it.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: vim 7.0\n" -"POT-Creation-Date: 2006-03-31 07:25+0200\n" -"PO-Revision-Date: 2006-04-03 10:05+0200\n" +"POT-Creation-Date: 2006-04-08 09:01+0200\n" +"PO-Revision-Date: 2006-04-08 09:01+0200\n" "Last-Translator: Vlad Sandrini <vlad.gently@gmail.com>\n" "Language-Team: Italian" " Antonio Colombo <azc100@gmail.com>" @@ -210,6 +210,9 @@ msgstr "E102: Non riesco a trovare il buffer: \"%s\"" msgid "E103: Buffer \"%s\" is not in diff mode" msgstr "E103: Il buffer \"%s\" non è in modalità 'diff'" +msgid "E787: Buffer changed unexpectedly" +msgstr "E787: Il buffer è variato inaspettatamente" + msgid "E104: Escape not allowed in digraph" msgstr "E104: Escape not ammesso nei digrammi" @@ -527,8 +530,8 @@ msgstr "" msgid "called inputrestore() more often than inputsave()" msgstr "inputrestore() chiamata più volte di inputsave()" -msgid "E745: Range not allowed" -msgstr "E745: Intervallo non consentito" +msgid "E786: Range not allowed" +msgstr "E786: Intervallo non consentito" msgid "E701: Invalid type for len()" msgstr "E701: Tipo non valido per len()" @@ -1395,6 +1398,9 @@ msgstr "E602: :endtry senza :try" msgid "E193: :endfunction not inside a function" msgstr "E193: :endfunction non contenuto in una funzione" +msgid "E788: Not allowed to edit another buffer now" +msgstr "E788: Non si può aprire ora un altro buffer" + msgid "tagname" msgstr "nome_tag" @@ -4729,6 +4735,22 @@ msgid "FLAG after using flags in %s line %d: %s" msgstr "FLAG dopo l'uso di flags in %s linea %d: %s" #, c-format +msgid "" +"Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line " +"%d" +msgstr "" +"Definire COMPOUNDFORBIDFLAG dop l'elemento PFX potrebbe dare risultati " +"errati in %s linea %d" + +#, c-format +msgid "" +"Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line " +"%d" +msgstr "" +"Definire COMPOUNDPERMITFLAG dop l'elemento PFX potrebbe dare risultati " +"errati in %s linea %d" + +#, c-format msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s" msgstr "Valore errato per COMPOUNDWORDMAX in %s linea %d: %s" @@ -4770,10 +4792,6 @@ msgid "Broken condition in %s line %d: %s" msgstr "Condizione non rispettata in %s linea %d: %s" #, c-format -msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s" -msgstr "Flags di affissi ignorati con PFXPOSTPONE in %s linea %d: %s" - -#, c-format msgid "Expected REP(SAL) count in %s line %d" msgstr "Contatore REP(SAL) necessario in %s linea %d" @@ -5714,7 +5732,7 @@ msgstr "Apri i(l) file scelto(i) con Vim" msgid "Error creating process: Check if gvim is in your path!" msgstr "" "Errore creando il processo: Controllate che gvim sia incluso nel vostro " -"cammino (PATH)" +"percorso (PATH)" msgid "gvimext.dll error" msgstr "errore gvimext.dll" diff --git a/src/po/pl.UTF-8.po b/src/po/pl.UTF-8.po index 6b881e495d..64b32036f0 100644 --- a/src/po/pl.UTF-8.po +++ b/src/po/pl.UTF-8.po @@ -1,7 +1,7 @@ # translation of pl.po to Polish # Polish Translation for Vim # -# updated 2005 for vim-7.0 +# updated 2006 for vim-7.0 # # FIRST AUTHOR Marcin Dalecki <martin@dalecki.de>, 2000. # Mikolaj Machowski <mikmach@wp.pl>, 2004, 2005, 2006. @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-01 18:24+0200\n" -"PO-Revision-Date: 2006-04-01 18:39+0200\n" +"POT-Creation-Date: 2006-04-12 20:24+0200\n" +"PO-Revision-Date: 2006-04-12 20:28+0200\n" "Last-Translator: Mikolaj Machowski <mikmach@wp.pl>\n" "Language-Team: Polish <mikmach@wp.pl>\n" "MIME-Version: 1.0\n" @@ -198,7 +198,8 @@ msgid "E100: No other buffer in diff mode" msgstr "E100: Brak innego bufora w trybie różnic" msgid "E101: More than two buffers in diff mode, don't know which one to use" -msgstr "E101: WiÄ™cej niż jeden bufor w trybie różnicowania, nie wiem którego użyć" +msgstr "" +"E101: WiÄ™cej niż jeden bufor w trybie różnicowania, nie wiem którego użyć" #, c-format msgid "E102: Can't find buffer \"%s\"" @@ -208,6 +209,9 @@ msgstr "E102: Nie mogÄ™ znaleźć bufora \"%s\"" msgid "E103: Buffer \"%s\" is not in diff mode" msgstr "E103: Bufor \"%s\" nie jest w trybie różnicowania" +msgid "E787: Buffer changed unexpectedly" +msgstr "E787: Nieoczekiwana zmiana bufora" + msgid "E104: Escape not allowed in digraph" msgstr "E104: Escape jest niedozwolone w dwugrafie" @@ -221,8 +225,8 @@ msgid " Keyword completion (^N^P)" msgstr " DopeÅ‚nianie słów kluczowych (^N^P)" #. ctrl_x_mode == 0, ^P/^N compl. -msgid " ^X mode (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)" -msgstr " ^X tryb (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)" +msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)" +msgstr " ^X tryb (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)" msgid " Whole line completion (^L^N^P)" msgstr " DopeÅ‚nianie peÅ‚nych wierszy (^L^N^P)" @@ -254,8 +258,8 @@ msgstr "DopeÅ‚nianie zdefiniowane przez użytkownika (^U^N^P)" msgid " Omni completion (^O^N^P)" msgstr " Omni uzupeÅ‚nianie (^O^N^P)" -msgid " Spelling suggestion (^S^N^P)" -msgstr "Propozycja ortografii (^L^N^P)" +msgid " Spelling suggestion (s^N^P)" +msgstr "Propozycja pisowni (^L^N^P)" msgid " Keyword Local completion (^N^P)" msgstr " Lokalne dopeÅ‚nianie słów kluczowych (^N^P)" @@ -526,8 +530,8 @@ msgstr "" msgid "called inputrestore() more often than inputsave()" msgstr "wywoÅ‚ano inputrestore() wiÄ™cej razy niż inputsave()" -msgid "E745: Range not allowed" -msgstr "E745: Zakres niedozwolony" +msgid "E786: Range not allowed" +msgstr "E786: Zakres niedozwolony" msgid "E701: Invalid type for len()" msgstr "E701: NieprawidÅ‚owy typ dla len()" @@ -1084,7 +1088,8 @@ msgid "End of function" msgstr "Koniec funkcji" msgid "E464: Ambiguous use of user-defined command" -msgstr "E464: Niejednoznaczne zastosowanie komendy zdefiniowanej przez użytkownika" +msgstr "" +"E464: Niejednoznaczne zastosowanie komendy zdefiniowanej przez użytkownika" msgid "E492: Not an editor command" msgstr "E492: Nie jest komendÄ… edytora" @@ -1167,7 +1172,8 @@ msgid "E180: Invalid complete value: %s" msgstr "E180: NiewÅ‚aÅ›ciwa wartość dopeÅ‚niania: %s" msgid "E468: Completion argument only allowed for custom completion" -msgstr "E468: Argument depeÅ‚niania dozwolony wyÅ‚Ä…cznie dla dopeÅ‚niania użytkownika" +msgstr "" +"E468: Argument depeÅ‚niania dozwolony wyÅ‚Ä…cznie dla dopeÅ‚niania użytkownika" msgid "E467: Custom completion requires a function argument" msgstr "E467: DopeÅ‚nianie użytkownika wymaga funkcji jako argumentu" @@ -1217,7 +1223,8 @@ msgid "Window position: X %d, Y %d" msgstr "Pozycja okna: X %d, Y %d" msgid "E188: Obtaining window position not implemented for this platform" -msgstr "E188: Pozyskiwanie pozycji okna nie jest zaimplementowane dla tego systemu" +msgstr "" +"E188: Pozyskiwanie pozycji okna nie jest zaimplementowane dla tego systemu" msgid "E466: :winpos requires two number arguments" msgstr "E466: :winpos wymaga dwóch argumentów numerycznych" @@ -1388,6 +1395,9 @@ msgstr "E602: :endtry bez :try" msgid "E193: :endfunction not inside a function" msgstr "E193: :endfunction poza funkcjÄ…" +msgid "E788: Not allowed to edit another buffer now" +msgstr "E788: Nie można teraz edytować innego bufora" + msgid "tagname" msgstr "nazwa znacznika" @@ -1514,7 +1524,8 @@ msgid "E676: No matching autocommands for acwrite buffer" msgstr "E676: Brak pasujÄ…cych autokomend dla bufora acwrite" msgid "E203: Autocommands deleted or unloaded buffer to be written" -msgstr "E203: Autokomendy skasowaÅ‚y lub wyÅ‚adowaÅ‚y bufor przeznaczony do zapisu" +msgstr "" +"E203: Autokomendy skasowaÅ‚y lub wyÅ‚adowaÅ‚y bufor przeznaczony do zapisu" msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: Autokomenda zmieniÅ‚a liczbÄ™ wierszy w nieoczekiwany sposób" @@ -1568,7 +1579,8 @@ msgid "E512: Close failed" msgstr "E512: ZamkniÄ™cie siÄ™ nie powiodÅ‚o" msgid "E513: write error, conversion failed (make 'fenc' empty to override)" -msgstr "E513: BÅ‚Ä…d zapisu, przemiana siÄ™ nie powiodÅ‚a (opróżnij 'fenc' aby wymusić)" +msgstr "" +"E513: BÅ‚Ä…d zapisu, przemiana siÄ™ nie powiodÅ‚a (opróżnij 'fenc' aby wymusić)" msgid "E514: write error (file system full?)" msgstr "E514: bÅ‚Ä…d w zapisie (może system plików jest przepeÅ‚niony?)" @@ -1699,7 +1711,8 @@ msgstr "Zobacz \":help W11\" dla dalszych informacji." #, c-format msgid "W16: Warning: Mode of file \"%s\" has changed since editing started" -msgstr "W16: OSTRZEÅ»ENIE: Tryb pliku \"%s\" zmieniÅ‚ siÄ™ od czasu rozpoczÄ™cia edycji" +msgstr "" +"W16: OSTRZEÅ»ENIE: Tryb pliku \"%s\" zmieniÅ‚ siÄ™ od czasu rozpoczÄ™cia edycji" msgid "See \":help W16\" for more info." msgstr "Zobacz \":help W16\" dla dalszych informacji." @@ -2051,7 +2064,8 @@ msgstr "" #, c-format msgid "E250: Fonts for the following charsets are missing in fontset %s:" -msgstr "E250: Brak czcionek dla nastÄ™pujÄ…cych zestawów znaków w zestawie czcionek %s:" +msgstr "" +"E250: Brak czcionek dla nastÄ™pujÄ…cych zestawów znaków w zestawie czcionek %s:" #, c-format msgid "E252: Fontset name: %s" @@ -2480,7 +2494,8 @@ msgstr "<okno %d>" msgid "no such window" msgstr "nie ma takiego okna" -msgid "E266: Sorry, this command is disabled, the Ruby library could not be loaded." +msgid "" +"E266: Sorry, this command is disabled, the Ruby library could not be loaded." msgstr "" "E263: Przykro mi, ta komenda jest wyÅ‚Ä…czona, bo nie można zaÅ‚adować " "biblioteki Ruby." @@ -2613,7 +2628,8 @@ msgstr "bÅ‚Ä…d vima" msgid "cannot create buffer/window command: object is being deleted" msgstr "nie mogÄ™ stworzyć bufora/okna komendy: obiekt jest kasowany" -msgid "cannot register callback command: buffer/window is already being deleted" +msgid "" |