diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 5 | ||||
| -rw-r--r-- | src/ex_getln.c | 32 | ||||
| -rw-r--r-- | src/po/pl.cp1250.po | 18 | ||||
| -rw-r--r-- | src/screen.c | 12 | ||||
| -rw-r--r-- | src/testdir/test49.vim | 2 | ||||
| -rw-r--r-- | src/version.h | 6 |
6 files changed, 55 insertions, 20 deletions
diff --git a/src/Makefile b/src/Makefile index 585349b5c..85725511b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1719,6 +1719,9 @@ test check: -if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \ cd $(PODIR); $(MAKE) -f Makefile check VIM=../$(VIMTARGET); \ fi + -if test $(VIMTARGET) != vim -a ! -e vim; then \ + ln -s $(VIMTARGET) vim; \ + fi cd testdir; $(MAKE) -f Makefile $(GUI_TESTTARGET) VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) testclean: @@ -2148,7 +2151,7 @@ uninstall_runtime: # Clean up all the files that have been produced, except configure's. # We support common typing mistakes for Juergen! :-) clean celan: testclean - -rm -f *.o objects/* core $(VIMTARGET).core $(VIMTARGET) xxd/*.o + -rm -f *.o objects/* core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o -rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c -rm -f conftest* *~ auto/link.sed -rm -rf $(APPDIR) diff --git a/src/ex_getln.c b/src/ex_getln.c index ce48b6751..376cbcc49 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -2841,6 +2841,38 @@ restore_cmdline(ccp) prev_ccline = *ccp; } +#if defined(FEAT_EVAL) || defined(PROTO) +/* + * Save the command line into allocated memory. Returns a pointer to be + * passed to restore_cmdline_alloc() later. + * Returns NULL when failed. + */ + char_u * +save_cmdline_alloc() +{ + struct cmdline_info *p; + + p = (struct cmdline_info *)alloc((unsigned)sizeof(struct cmdline_info)); + if (p != NULL) + save_cmdline(p); + return (char_u *)p; +} + +/* + * Restore the command line from the return value of save_cmdline_alloc(). + */ + void +restore_cmdline_alloc(p) + char_u *p; +{ + if (p != NULL) + { + restore_cmdline((struct cmdline_info *)p); + vim_free(p); + } +} +#endif + /* * paste a yank register into the command line. * used by CTRL-R command in command-line mode diff --git a/src/po/pl.cp1250.po b/src/po/pl.cp1250.po index 0631ac4c3..e10e74541 100644 --- a/src/po/pl.cp1250.po +++ b/src/po/pl.cp1250.po @@ -910,7 +910,7 @@ msgstr "" #, c-format msgid "# Value of 'encoding' when this file was written\n" -msgstr "# Wartość 'encoding' w czasie zapsu tego pliku\n" +msgstr "# Wartość 'encoding' w czasie zapisu tego pliku\n" msgid "Illegal starting char" msgstr "Niedopuszczalny początkowy znak" @@ -1483,7 +1483,7 @@ msgstr "Wczytywanie ze stdin..." #. Re-opening the original file failed! msgid "E202: Conversion made file unreadable!" -msgstr "E202: Plik stworzony poprzez przemianę jest nieodczytywalny!" +msgstr "E202: Nie można otworzyć pliku utworzonego przez przemianę!" msgid "[fifo/socket]" msgstr "[fifo/socket]" @@ -1648,13 +1648,13 @@ msgid "[mac]" msgstr "[mac]" msgid "[mac format]" -msgstr "[format mac-a]" +msgstr "[format maca]" msgid "[unix]" msgstr "[unix]" msgid "[unix format]" -msgstr "[format unix-a]" +msgstr "[format unixa]" msgid "1 line, " msgstr "1 wiersz, " @@ -1928,7 +1928,7 @@ msgid "Input _Methods" msgstr "Input _Methods" msgid "VIM - Search and Replace..." -msgstr "VIM - Szukaj i Zamieniaj..." +msgstr "VIM - Szukaj i Zamień..." msgid "VIM - Search..." msgstr "VIM - Szukaj..." @@ -1967,7 +1967,7 @@ msgid "Replace All" msgstr "Zamień wszystkie" msgid "Vim: Received \"die\" request from session manager\n" -msgstr "Vim: otrzymano żądanie \"die\" od manadżera sesji\n" +msgstr "Vim: otrzymano żądanie \"die\" od menedżera sesji\n" msgid "Close" msgstr "Zamknij" @@ -2463,7 +2463,7 @@ msgid "writelines() requires list of strings" msgstr "writelines() wymaga listy ciągów" msgid "E264: Python: Error initialising I/O objects" -msgstr "E264: Python: Błąd w inicjalizacji obiektów I/O" +msgstr "E264: Python: Błąd w uruchomieniu obiektów I/O" msgid "attempt to refer to deleted buffer" msgstr "próba odniesienia do skasowanego bufora" @@ -2542,7 +2542,7 @@ msgid "Show base class of" msgstr "Pokaż bazę klasy" msgid "Show overridden member function" -msgstr "Pokaż przepisaną funkcję członkową" +msgstr "Pokaż przepisaną funkcję członową" msgid "Retrieve from file" msgstr "Pobieraj z pliku" @@ -2587,7 +2587,7 @@ msgid "Show docu of" msgstr "Pokaż dokumentację dla" msgid "Generate docu for" -msgstr "Wygeneruj dokumentację dla" +msgstr "Utwórz dokumentację dla" msgid "" "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in " diff --git a/src/screen.c b/src/screen.c index c293de115..8c52aad92 100644 --- a/src/screen.c +++ b/src/screen.c @@ -463,6 +463,12 @@ update_screen(type) )) curwin->w_redr_type = type; +#ifdef FEAT_WINDOWS + /* Redraw the tab pages line if needed. */ + if (redraw_tabline || type >= NOT_VALID) + draw_tabline(); +#endif + #ifdef FEAT_SYN_HL /* * Correct stored syntax highlighting info for changes in each displayed @@ -490,12 +496,6 @@ update_screen(type) } #endif -#ifdef FEAT_WINDOWS - /* Redraw the tab pages line if needed. */ - if (redraw_tabline || type >= NOT_VALID) - draw_tabline(); -#endif - /* * Go from top to bottom through the windows, redrawing the ones that need * it. diff --git a/src/testdir/test49.vim b/src/testdir/test49.vim index 19ef949ac..3b0982a68 100644 --- a/src/testdir/test49.vim +++ b/src/testdir/test49.vim @@ -1,6 +1,6 @@ " Vim script language tests " Author: Servatius Brandt <Servatius.Brandt@fujitsu-siemens.com> -" Last Change: 2006 Feb 28 +" Last Change: 2006 Apr 28 "------------------------------------------------------------------------------- " Test environment {{{1 diff --git a/src/version.h b/src/version.h index c91cb0b1c..af0ef0ef1 100644 --- a/src/version.h +++ b/src/version.h @@ -35,6 +35,6 @@ */ #define VIM_VERSION_NODOT "vim70f" #define VIM_VERSION_SHORT "7.0f" -#define VIM_VERSION_MEDIUM "7.0f03 BETA" -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0f03 BETA (2006 Apr 27)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0f03 BETA (2006 Apr 27, compiled " +#define VIM_VERSION_MEDIUM "7.0f04 BETA" +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0f04 BETA (2006 Apr 28)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0f04 BETA (2006 Apr 28, compiled " |