# HG changeset patch # User vimboss # Date 1146779648 0 # Node ID bc620d6bdf0668880d3afeada4268fdc0b68c004 # Parent dbc6b23eff3eca2e482c75f2433436c9f6954ec4 updated for version 7.0g03 diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.0g. Last change: 2006 May 03 +*eval.txt* For Vim version 7.0g. Last change: 2006 May 04 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2313,6 +2313,8 @@ exists({expr}) The result is a Number, w 3 matches several user commands To check for a supported command always check the return value to be 2. + :2match The |:2match| command. + :3match The |:3match| command. #event autocommand defined for this event #event#pattern autocommand defined for this event and pattern (the pattern is taken @@ -2683,9 +2685,9 @@ getchar([expr]) *getchar()* If [expr] is omitted, wait until a character is available. If [expr] is 0, only get a character when one is available. If [expr] is 1, only check if a character is available, it is - not consumed. If a normal character is - available, it is returned, otherwise a - non-zero value is returned. + not consumed. If one is available a non-zero + number is returned. For a one-byte character + it is the character itself. If a normal character available, it is returned as a Number. Use nr2char() to convert it to a String. The returned value is zero if no character is available. diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt --- a/runtime/doc/help.txt +++ b/runtime/doc/help.txt @@ -1,4 +1,4 @@ -*help.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*help.txt* For Vim version 7.0g. Last change: 2006 May 04 VIM - main help file k @@ -7,9 +7,9 @@ Close this window: Use ":q". Get out of Vim: Use ":qa!" (careful, all changes are lost!). -Jump to a subject: Position the cursor on a tag between |bars| and hit CTRL-]. +Jump to a subject: Position the cursor on a tag (e.g. |bars|) and hit CTRL-]. With the mouse: ":set mouse=a" to enable the mouse (in xterm or GUI). - Double-click the left mouse button on a tag between |bars|. + Double-click the left mouse button on a tag, e.g. |bars|. Jump back: Type CTRL-T or CTRL-O (repeat to go further back). Get specific help: It is possible to go directly to whatever you want help @@ -196,11 +196,24 @@ Standard plugins ~ |pi_zip.txt| Zip archive explorer LOCAL ADDITIONS: *local-additions* +|cecutil.txt| DrChip's Utilities Jun 11, 2004 +|example.txt| Example for a locally added help file +|matchit.txt| Extended "%" matching +|test.txt| Testing the hélp cömmĺnd nôw +|typecorr.txt| Plugin for correcting typing mistakes +|helpp.txt| Dummy line to avoid an error message ------------------------------------------------------------------------------ *bars* Bars example Now that you've jumped here with CTRL-] or a double mouse click, you can use CTRL-T, CTRL-O, g, or to go back to where you were. + +Note that tags are within | characters, but when highlighting is enabled these +are hidden. That makes it easier to read the command. + +Anyway, you can use CTRL-] on any word, also when it is not within |, and Vim +will try to find help for it. + ------------------------------------------------------------------------------ vim:tw=78:fo=tcq2:isk=!-~,^*,^\|,^\":ts=8:ft=help:norl: diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.0g. Last change: 2006 May 03 +*options.txt* For Vim version 7.0g. Last change: 2006 May 04 VIM REFERENCE MANUAL by Bram Moolenaar @@ -763,7 +763,7 @@ A jump table for the options with a shor global Write the contents of the file, if it has been modified, on each :next, :rewind, :last, :first, :previous, :stop, :suspend, :tag, :!, - :make, CTRL-] and CTRL-^ command; and when a CTRL-O, CTRL-I, + :make, CTRL-] and CTRL-^ command; and when a :buffer, CTRL-O, CTRL-I, '{A-Z0-9}, or `{A-Z0-9} command takes one to another file. Note that for some commands the 'autowrite' option is not used, see 'autowriteall' for that. diff --git a/runtime/lang/menu_pl_pl.iso_8859-2.vim b/runtime/lang/menu_pl_pl.iso_8859-2.vim --- a/runtime/lang/menu_pl_pl.iso_8859-2.vim +++ b/runtime/lang/menu_pl_pl.iso_8859-2.vim @@ -1,7 +1,7 @@ " Menu Translations: Polish -" Maintainer: Rafal M. Sulejman +" Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl ) " Initial Translation: Marcin Dalecki -" Last Change: 5 May 2004 +" Last Change: 4 May 2006 " Quit when menu translations have already been done. if exists("did_menu_trans") @@ -19,9 +19,9 @@ menutrans &Credits Po&dziękowania menutrans &User\ Manual Podręcznik\ &użytkownika menutrans Co&pying &Kopiowanie menutrans &Version &Wersja -menutrans &About o\ &Aplikacji +menutrans &About o\ &Programie menutrans &Sponsor/Register &Sponsorowanie/Rejestracja -menutrans O&rphans K&ibaale\ Children\'s\ Center +menutrans O&rphans Sie&roty " File menu menutrans &File &Plik @@ -36,6 +36,7 @@ menutrans Split\ Patched\ &By\.\.\. Podziel\ łatane\ przez\.\.\. menutrans &Print &Drukuj menutrans Sa&ve-Exit:wqa W&yj¶cie\ z\ zapisem:wqa menutrans E&xit:qa &Wyj¶cie:qa +menutrans Open\ Tab\.\.\.:tabnew Otwórz\ &kartę\.\.\.:tabnew " Edit menu menutrans &Edit &Edycja @@ -57,6 +58,7 @@ menutrans Find\ and\ Rep&lace:s &Zamień:s menutrans Options\.\.\. Opcje\.\.\. menutrans Settings\ &Window Ustawienia menutrans &Global\ Settings Ustawienia\ &globalne +menutrans Startup\ &Settings Ustawienia\ &startowe menutrans F&ile\ Settings Ustawienia\ dla\ pliku menutrans Toggle\ Line\ &Numbering:set\ nu! &Numerowanie\ wierszy:set\ nu! menutrans Toggle\ &List\ Mode:set\ list! Tryb\ &listowania:set\ list! @@ -110,6 +112,23 @@ menutrans &Tools &Narzędzia menutrans &Jump\ to\ this\ tagg^] &Skocz\ do\ tagag^] menutrans Jump\ &back^T Skok\ w\ &tył^T menutrans Build\ &Tags\ File &Twórz\ plik\ tagów +" Spelling +menutrans &Spelling Pi&sownia +menutrans &Spell\ Check\ On Wł±cz +menutrans Spell\ Check\ &Off Wył±cz +menutrans To\ &Next\ error]s Do\ &następnego\ błędu]s +menutrans To\ &Previous\ error[s Do\ &poprzedniego\ błędu[s +menutrans Suggest\ &Correctionsz= Sugestie\ poprawekz= +menutrans &Repeat\ correction:spellrepall Powtó&z\ poprawkę:spellrepall +menutrans Set\ language\ to\ "en" Ustaw\ język\ na\ "en" +menutrans Set\ language\ to\ "en_au" Ustaw\ język\ na\ "en_au" +menutrans Set\ language\ to\ "en_ca" Ustaw\ język\ na\ "en_ca" +menutrans Set\ language\ to\ "en_gb" Ustaw\ język\ na\ "en_gb" +menutrans Set\ language\ to\ "en_nz" Ustaw\ język\ na\ "en_nz" +menutrans Set\ language\ to\ "en_us" Ustaw\ język\ na\ "en_us" +menutrans Set\ language\ to\ "pl" Ustaw\ język\ na\ "pl" +menutrans &Find\ More\ Languages &ZnajdĽ\ więcej\ języków + " Folding menutrans &Folding &Zwijanie menutrans &Enable/Disable\ foldszi &Zwiń/rozwińzi @@ -149,7 +168,7 @@ menutrans &Update:cwin Akt&ualizu menutrans &Close:cclose &Zamknij:cclose menutrans &Open:copen &Otwórz:copen -menutrans &Set\ Compiler U&staw\ kompilator +menutrans Se&T\ Compiler U&staw\ kompilator menutrans &Convert\ to\ HEX:%!xxd Kody\ szesnastkowe:%!xxd menutrans Conve&rt\ back:%!xxd\ -r Zwykły\ tekst:%!xxd\ -r @@ -198,10 +217,13 @@ menutrans &Copy &Kopiuj menutrans &Paste &Wklej menutrans &Delete &Skasuj menutrans Select\ Blockwise Zaznacz\ &blok +menutrans Select\ &Sentence Zaznacz\ &zdanie +menutrans Select\ Pa&ragraph Zaznacz\ aka&pit menutrans Select\ &Word Zaznacz\ &słowo menutrans Select\ &Line Zaznacz\ w&iersz menutrans Select\ &Block Zaznacz\ &blok menutrans Select\ &All Zaznacz\ c&ało¶ć +menutrans Input\ &Methods Wprowadza&nie " The GUI toolbar if has("toolbar") @@ -261,3 +283,4 @@ let g:menutrans_path_dialog = "WprowadĽ ¶cieżkę poszukiwania plików.\nProszę rozdzielać nazwy katalogów przecinkiem." let g:menutrans_tags_dialog = "Podaj nazwy plików tagów.\nProszę rozdzielać nazwy przecinkiem." let g:menutrans_textwidth_dialog = "WprowadĽ now± szeroko¶ć tekstu (0 wył±cza przewijanie): " let g:menutrans_fileformat_dialog = "Wybierz format w którym ten plik ma być zapisany" +let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&Anuluj" diff --git a/runtime/lang/menu_polish_poland.1250.vim b/runtime/lang/menu_polish_poland.1250.vim --- a/runtime/lang/menu_polish_poland.1250.vim +++ b/runtime/lang/menu_polish_poland.1250.vim @@ -1,7 +1,7 @@ " Menu Translations: Polish -" Maintainer: Rafal M. Sulejman +" Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl ) " Initial Translation: Marcin Dalecki -" Last Change: 06 Sep 2001 +" Last Change: 4 May 2006 " Quit when menu translations have already been done. if exists("did_menu_trans") @@ -13,13 +13,15 @@ scriptencoding cp1250 " Help menu menutrans &Help Po&moc -menutrans &Overview &Spis\ Treści +menutrans &Overview &Spis\ treści menutrans &How-to\ links &Odnośniki\ JTZ menutrans &Credits Po&dziękowania menutrans &User\ Manual Podręcznik\ &użytkownika menutrans Co&pying &Kopiowanie menutrans &Version &Wersja -menutrans &About o\ &Aplikacji +menutrans &About o\ &Programie +menutrans &Sponsor/Register &Sponsorowanie/Rejestracja +menutrans O&rphans Sie&roty " File menu menutrans &File &Plik @@ -32,8 +34,9 @@ menutrans Save\ &As\.\.\.:sav Zapis menutrans Split\ &Diff\ with\.\.\. Podziel\ na\ diff-a\ między\.\.\. menutrans Split\ Patched\ &By\.\.\. Podziel\ łatane\ przez\.\.\. menutrans &Print &Drukuj -menutrans Sa&ve-Exit:wqa Zapisz\ i\ w&yjdź:wqa +menutrans Sa&ve-Exit:wqa W&yjście\ z\ zapisem:wqa menutrans E&xit:qa &Wyjście:qa +menutrans Open\ Tab\.\.\.:tabnew Otwórz\ &kartę\.\.\.:tabnew " Edit menu menutrans &Edit &Edycja @@ -45,7 +48,7 @@ menutrans &Copy"+y &Kopiuj"+ menutrans &Paste"+gP &Wklej"+gP menutrans Put\ &Before[p Wstaw\ p&rzed[p menutrans Put\ &After]p Wstaw\ p&o]p -menutrans &Select\ allggVG Z&aznacz\ całośćggVG +menutrans &Select\ AllggVG Z&aznacz\ całośćggVG menutrans &Find\.\.\. &Szukaj\.\.\. menutrans &Find/ &Szukaj/ menutrans Find\ and\ Rep&lace\.\.\. &Zamień\.\.\. @@ -55,6 +58,7 @@ menutrans Find\ and\ Rep&lace:s &Zamień:s menutrans Options\.\.\. Opcje\.\.\. menutrans Settings\ &Window Ustawienia menutrans &Global\ Settings Ustawienia\ &globalne +menutrans Startup\ &Settings Ustawienia\ &startowe menutrans F&ile\ Settings Ustawienia\ dla\ pliku menutrans Toggle\ Line\ &Numbering:set\ nu! &Numerowanie\ wierszy:set\ nu! menutrans Toggle\ &List\ Mode:set\ list! Tryb\ &listowania:set\ list! @@ -87,6 +91,7 @@ menutrans &Virtual\ Edit Obróbka\ &wirtualna menutrans Never Nigdy menutrans Block\ Selection Zaznaczanie\ zakresu menutrans Insert\ mode Tryb\ wprowadzania +menutrans Toggle\ Vi\ C&ompatible:set\ cp! Tryb\ zg&odności\ z\ Vi:set\ cp! menutrans Block\ and\ Insert Zakres\ i\ wprowadzanie menutrans Always Zawsze @@ -107,6 +112,23 @@ menutrans &Tools &Narzędzia menutrans &Jump\ to\ this\ tagg^] &Skocz\ do\ tagag^] menutrans Jump\ &back^T Skok\ w\ &tył^T menutrans Build\ &Tags\ File &Twórz\ plik\ tagów +" Spelling +menutrans &Spelling Pi&sownia +menutrans &Spell\ Check\ On Włącz +menutrans Spell\ Check\ &Off Wyłącz +menutrans To\ &Next\ error]s Do\ &następnego\ błędu]s +menutrans To\ &Previous\ error[s Do\ &poprzedniego\ błędu[s +menutrans Suggest\ &Correctionsz= Sugestie\ poprawekz= +menutrans &Repeat\ correction:spellrepall Powtó&z\ poprawkę:spellrepall +menutrans Set\ language\ to\ "en" Ustaw\ język\ na\ "en" +menutrans Set\ language\ to\ "en_au" Ustaw\ język\ na\ "en_au" +menutrans Set\ language\ to\ "en_ca" Ustaw\ język\ na\ "en_ca" +menutrans Set\ language\ to\ "en_gb" Ustaw\ język\ na\ "en_gb" +menutrans Set\ language\ to\ "en_nz" Ustaw\ język\ na\ "en_nz" +menutrans Set\ language\ to\ "en_us" Ustaw\ język\ na\ "en_us" +menutrans Set\ language\ to\ "pl" Ustaw\ język\ na\ "pl" +menutrans &Find\ More\ Languages &Znajdź\ więcej\ języków + " Folding menutrans &Folding &Zwijanie menutrans &Enable/Disable\ foldszi &Zwiń/rozwińzi @@ -146,7 +168,7 @@ menutrans &Update:cwin Akt&ualizu menutrans &Close:cclose &Zamknij:cclose menutrans &Open:copen &Otwórz:copen -menutrans &Set\ Compiler U&staw\ kompilator +menutrans Se&T\ Compiler U&staw\ kompilator menutrans &Convert\ to\ HEX:%!xxd Kody\ szesnastkowe:%!xxd menutrans Conve&rt\ back:%!xxd\ -r Zwykły\ tekst:%!xxd\ -r @@ -195,10 +217,13 @@ menutrans &Copy &Kopiuj menutrans &Paste &Wklej menutrans &Delete &Skasuj menutrans Select\ Blockwise Zaznacz\ &blok +menutrans Select\ &Sentence Zaznacz\ &zdanie +menutrans Select\ Pa&ragraph Zaznacz\ aka&pit menutrans Select\ &Word Zaznacz\ &słowo menutrans Select\ &Line Zaznacz\ w&iersz menutrans Select\ &Block Zaznacz\ &blok menutrans Select\ &All Zaznacz\ c&ałość +menutrans Input\ &Methods Wprowadza&nie " The GUI toolbar if has("toolbar") @@ -240,6 +265,7 @@ endif " Syntax menu menutrans &Syntax &Składnia +menutrans &Show\ filetypes\ in\ menu Pokaż\ typy\ &plików\ w\ menu menutrans Set\ '&syntax'\ only Ustaw\ tylko\ '&syntax' menutrans Set\ '&filetype'\ too Ustaw\ również\ '&filetype' menutrans &Off &Wyłącz @@ -257,3 +283,4 @@ let g:menutrans_path_dialog = "Wprowadź ścieżkę poszukiwania plików.\nProszę rozdzielać nazwy katalogów przecinkiem." let g:menutrans_tags_dialog = "Podaj nazwy plików tagów.\nProszę rozdzielać nazwy przecinkiem." let g:menutrans_textwidth_dialog = "Wprowadź nową szerokość tekstu (0 wyłącza przewijanie): " let g:menutrans_fileformat_dialog = "Wybierz format w którym ten plik ma być zapisany" +let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&Anuluj" diff --git a/src/auto/configure b/src/auto/configure --- a/src/auto/configure +++ b/src/auto/configure @@ -3394,12 +3394,6 @@ fi if test "x$CARBON" = "xyes"; then if test -z "$with_x" -a "X$enable_gui" != Xmotif -a "X$enable_gui" != Xathena -a "X$enable_gui" != Xgtk -a "X$enable_gui" != Xgtk2; then with_x=no - - if test x$prefix = xNONE; then - prefix=/Applications - fi - - datadir='${prefix}/Vim.app/Contents/Resources' fi fi fi @@ -7266,6 +7260,13 @@ echo "${ECHO_T}yes" >&6; if test "$VIMNAME" = "vim"; then VIMNAME=Vim fi + + if test x$prefix = xNONE; then + prefix=/Applications + fi + + datadir='${prefix}/Vim.app/Contents/Resources' + SKIP_GTK=YES; SKIP_GTK2=YES; SKIP_GNOME=YES; diff --git a/src/configure.in b/src/configure.in --- a/src/configure.in +++ b/src/configure.in @@ -165,14 +165,6 @@ if test "`(uname) 2>/dev/null`" = Darwin if test "x$CARBON" = "xyes"; then if test -z "$with_x" -a "X$enable_gui" != Xmotif -a "X$enable_gui" != Xathena -a "X$enable_gui" != Xgtk -a "X$enable_gui" != Xgtk2; then with_x=no - - dnl Default install directory is not /usr/local - if test x$prefix = xNONE; then - prefix=/Applications - fi - - dnl Sorry for the hard coded default - datadir='${prefix}/Vim.app/Contents/Resources' fi fi fi @@ -1305,12 +1297,21 @@ fi if test "x$MACOSX" = "xyes" -a -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then AC_MSG_CHECKING(for Carbon GUI) - dnl already did this + dnl already did the check, just give the message AC_MSG_RESULT(yes); GUITYPE=CARBONGUI if test "$VIMNAME" = "vim"; then VIMNAME=Vim fi + + dnl Default install directory is not /usr/local + if test x$prefix = xNONE; then + prefix=/Applications + fi + + dnl Sorry for the hard coded default + datadir='${prefix}/Vim.app/Contents/Resources' + dnl skip everything else SKIP_GTK=YES; SKIP_GTK2=YES; diff --git a/src/edit.c b/src/edit.c --- a/src/edit.c +++ b/src/edit.c @@ -4150,6 +4150,15 @@ ins_compl_next(allow_get_expansion, coun /* display the updated popup menu */ ins_compl_show_pum(); +#ifdef FEAT_GUI + if (gui.in_use) + { + /* Show the cursor after the match, not after the redrawn text. */ + setcursor(); + out_flush(); + gui_update_cursor(FALSE, FALSE); + } +#endif /* Delete old text to be replaced, since we're still searching and * don't want to match ourselves! */ diff --git a/src/gui_gtk.c b/src/gui_gtk.c --- a/src/gui_gtk.c +++ b/src/gui_gtk.c @@ -2221,6 +2221,7 @@ dialog_key_press_event_cb(GtkWidget *wid { DialogInfo *di = (DialogInfo *)data; +#ifndef HAVE_GTK2 /* Ignore hitting "Enter" if there is no default button. */ if (event->keyval == GDK_Return) { @@ -2228,6 +2229,7 @@ dialog_key_press_event_cb(GtkWidget *wid gtk_dialog_response(di->dialog, GTK_RESPONSE_ACCEPT); return TRUE; } +#endif /* Close the dialog when hitting "Esc". */ if (event->keyval == GDK_Escape) @@ -2290,7 +2292,7 @@ gui_mch_dialog(int type, /* type of dialoginfo.noalt = TRUE; /* Allow activation of mnemonic accelerators without pressing when - * there is no textfield. Handle pressing Enter and Esc. */ + * there is no textfield. Handle pressing Esc. */ g_signal_connect(G_OBJECT(dialog), "key_press_event", G_CALLBACK(&dialog_key_press_event_cb), &dialoginfo); diff --git a/src/hardcopy.c b/src/hardcopy.c --- a/src/hardcopy.c +++ b/src/hardcopy.c @@ -2507,12 +2507,13 @@ mch_print_init(psettings, jobname, force if (*p_encoding == NUL) p_encoding = enc_skip(p_enc); - /* Look for recognised multi-byte coding, and if the charset is recognised. - * This is to cope with the fact that various unicode encodings are - * supported in more than one of CJK. */ + /* Look for a multi-byte font that matches the encoding and character set. + * Only look if multi-byte character set is defined, or using multi-byte + * encoding other than Unicode. This is because a Unicode encoding does not + * uniquely identify a CJK character set to use. */ p_mbenc = NULL; props = enc_canon_props(p_encoding); - if (!(props & ENC_8BIT) && (*p_penc != NUL || *p_pmcs != NUL)) + if (!(props & ENC_8BIT) && ((*p_pmcs != NUL) || !(props & ENC_UNICODE))) { p_mbenc_first = NULL; p_mbchar = NULL; diff --git a/src/misc2.c b/src/misc2.c --- a/src/misc2.c +++ b/src/misc2.c @@ -3413,6 +3413,13 @@ update_mouseshape(shape_idx) return; } + /* When ignoring the mouse don't change shape on the statusline. */ + if (*p_mouse == NUL + && (shape_idx == SHAPE_IDX_CLINE + || shape_idx == SHAPE_IDX_STATUS + || shape_idx == SHAPE_IDX_VSEP)) + shape_idx = -2; + if (shape_idx == -2 && old_mouse_shape != shape_table[SHAPE_IDX_CLINE].mshape && old_mouse_shape != shape_table[SHAPE_IDX_STATUS].mshape diff --git a/src/version.h b/src/version.h --- a/src/version.h +++ b/src/version.h @@ -35,6 +35,6 @@ */ #define VIM_VERSION_NODOT "vim70g" #define VIM_VERSION_SHORT "7.0g" -#define VIM_VERSION_MEDIUM "7.0g02 BETA" -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0g02 BETA (2006 May 3)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0g02 BETA (2006 May 3, compiled " +#define VIM_VERSION_MEDIUM "7.0g03 BETA" +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0g03 BETA (2006 May 4)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0g03 BETA (2006 May 4, compiled "