From 228de1dfd2687af16dc7bc88942c65b5af9d7e04 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 14 Mar 2018 20:11:12 +0100 Subject: [PATCH 1/3] patch 8.0.1606: singular/plural variants not translated Problem: Singular/plural variants not translated. Solution: Add NGETTEXT argument to xgettext. (Sergey Alyoshin) --- src/po/Make_cyg.mak | 4 ++-- src/po/Make_ming.mak | 4 ++-- src/po/Make_mvc.mak | 4 ++-- src/po/Makefile | 2 +- src/version.c | 2 ++ 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/po/Make_cyg.mak b/src/po/Make_cyg.mak index f8e45badfe..fe49a34295 100644 --- a/src/po/Make_cyg.mak +++ b/src/po/Make_cyg.mak @@ -128,11 +128,11 @@ all: $(MOFILES) first_time: $(XGETTEXT) --default-domain=$(LANGUAGE) \ - --add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h + --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h $(LANGUAGES): $(XGETTEXT) --default-domain=$(PACKAGE) \ - --add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h + --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h $(MV) $(PACKAGE).po $(PACKAGE).pot $(CP) $@.po $@.po.orig $(MV) $@.po $@.po.old diff --git a/src/po/Make_ming.mak b/src/po/Make_ming.mak index cd84c1b49d..5dd2f2b1a1 100644 --- a/src/po/Make_ming.mak +++ b/src/po/Make_ming.mak @@ -137,11 +137,11 @@ all: $(MOFILES) first_time: $(XGETTEXT) --default-domain=$(LANGUAGE) \ - --add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h + --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h $(LANGUAGES): $(XGETTEXT) --default-domain=$(PACKAGE) \ - --add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h + --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h $(MV) $(PACKAGE).po $(PACKAGE).pot $(CP) $@.po $@.po.orig $(MV) $@.po $@.po.old diff --git a/src/po/Make_mvc.mak b/src/po/Make_mvc.mak index 85013f497e..23a6e733ce 100644 --- a/src/po/Make_mvc.mak +++ b/src/po/Make_mvc.mak @@ -122,12 +122,12 @@ files: first_time: files set OLD_PO_FILE_INPUT=yes set OLD_PO_FILE_OUTPUT=yes - $(XGETTEXT) --default-domain=$(LANGUAGE) --add-comments --keyword=_ --keyword=N_ --files-from=.\files + $(XGETTEXT) --default-domain=$(LANGUAGE) --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 --files-from=.\files $(LANGUAGES): files set OLD_PO_FILE_INPUT=yes set OLD_PO_FILE_OUTPUT=yes - $(XGETTEXT) --default-domain=$(PACKAGE) --add-comments --keyword=_ --keyword=N_ --files-from=.\files + $(XGETTEXT) --default-domain=$(PACKAGE) --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 --files-from=.\files $(MV) $(PACKAGE).po $(PACKAGE).pot $(CP) $@.po $@.po.orig $(MV) $@.po $@.po.old diff --git a/src/po/Makefile b/src/po/Makefile index 8c4aaf3649..fc78c43086 100644 --- a/src/po/Makefile +++ b/src/po/Makefile @@ -283,7 +283,7 @@ checkclean: $(PACKAGE).pot: ../*.c ../if_perl.xs ../GvimExt/gvimext.cpp ../globals.h ../if_py_both.h cd ..; $(XGETTEXT) --default-domain=$(PACKAGE) \ - --add-comments --keyword=_ --keyword=N_ \ + --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 \ *.c if_perl.xs GvimExt/gvimext.cpp globals.h if_py_both.h mv -f ../$(PACKAGE).po $(PACKAGE).pot diff --git a/src/version.c b/src/version.c index 3236096c1c..4531c82c3e 100644 --- a/src/version.c +++ b/src/version.c @@ -766,6 +766,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1606, /**/ 1605, /**/ From 62dd452d02f4a17f7e9fdfb3656b71bea62e12fe Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 14 Mar 2018 21:20:02 +0100 Subject: [PATCH 2/3] patch 8.0.1607: --clean loads user settings from .gvimrc Problem: --clean loads user settings from .gvimrc. Solution: Behave like "-U NONE" was used. (Ken Takata) --- runtime/doc/starting.txt | 3 ++- src/main.c | 3 +++ src/version.c | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index 235846043f..9d5e43f3d3 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -510,11 +510,12 @@ a slash. Thus "-R" means recovery and "-/R" readonly. {not in Vi} *--clean* ---clean Equal to "-u DEFAULTS -i NONE": +--clean Equal to "-u DEFAULTS -U NONE -i NONE": - initializations from files and environment variables is skipped - the |defaults.vim| script is loaded, which implies 'nocompatible': use Vim defaults + - no |gvimrc| script is loaded - no viminfo file is read or written - the home directory is excluded from 'runtimepath' *-x* diff --git a/src/main.c b/src/main.c index ff01fd968f..61543b171f 100644 --- a/src/main.c +++ b/src/main.c @@ -1881,6 +1881,9 @@ command_line_scan(mparm_T *parmp) else if (STRNICMP(argv[0] + argv_idx, "clean", 5) == 0) { parmp->use_vimrc = (char_u *)"DEFAULTS"; +#ifdef FEAT_GUI + use_gvimrc = (char_u *)"NONE"; +#endif parmp->clean = TRUE; set_option_value((char_u *)"vif", 0L, (char_u *)"NONE", 0); } diff --git a/src/version.c b/src/version.c index 4531c82c3e..e7e3f493f0 100644 --- a/src/version.c +++ b/src/version.c @@ -766,6 +766,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1607, /**/ 1606, /**/ From 43cb6262141c0a0853680bd8d0433e04db3bf182 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 14 Mar 2018 21:39:02 +0100 Subject: [PATCH 3/3] patch 8.0.1608: Win32: directx not enabled by default Problem: Win32: directx not enabled by default. Solution: Change Makefile to enable directx by default. (Ken Takata) --- runtime/doc/various.txt | 2 +- src/Make_cyg_ming.mak | 6 +++--- src/Make_mvc.mak | 6 +++++- src/version.c | 2 ++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index 0e1e1ab3e5..4b1c853930 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -352,7 +352,7 @@ N *+dialog_con* Support for |:confirm| with console dialog. N *+dialog_con_gui* Support for |:confirm| with GUI and console dialog. N *+diff* |vimdiff| and 'diff' N *+digraphs* |digraphs| *E196* -m *+directx* Win32 GUI only: DirectX and |'renderoptions'| + *+directx* Win32 GUI only: DirectX and |'renderoptions'| *+dnd* Support for DnD into the "~ register |quote_~|. B *+emacs_tags* |emacs-tags| files N *+eval* expression evaluation |eval.txt| diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index b2a11c1a2f..cefc430b29 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -20,7 +20,7 @@ # # "make upx" makes *compressed* versions of the 32 bit GUI and console EXEs, # using the excellent UPX compressor: -# http://upx.sourceforge.net/ +# https://upx.github.io/ # "make mpress" uses the MPRESS compressor for 32- and 64-bit EXEs: # http://www.matcode.com/mpress.htm # @@ -34,9 +34,9 @@ DEBUG=no OPTIMIZE=MAXSPEED # set to yes to make gvim, no for vim GUI=yes -# set to yes if you want to use DirectWrite (DirectX) +# set to no if you do not want to use DirectWrite (DirectX) # MinGW-w64 is needed, and ARCH should be set to i686 or x86-64. -DIRECTX=no +DIRECTX=yes # FEATURES=[TINY | SMALL | NORMAL | BIG | HUGE] # Set to TINY to make minimal version (few features). FEATURES=HUGE diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 65da331b73..d5159abd9f 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -26,7 +26,7 @@ # GUI interface: GUI=yes (default is no) # # GUI with DirectWrite (DirectX): DIRECTX=yes -# (default is no, requires GUI=yes and MBYTE=yes) +# (default is yes if GUI=yes, requires GUI=yes and MBYTE=yes) # # Color emoji support: COLOR_EMOJI=yes # (default is yes if DIRECTX=yes, requires WinSDK 8.1 or later.) @@ -180,6 +180,10 @@ TARGETOS = WINNT +!ifndef DIRECTX +DIRECTX = $(GUI) +!endif + # Select one of eight object code directories, depends on GUI, OLE, DEBUG and # interfaces. # If you change something else, do "make clean" first! diff --git a/src/version.c b/src/version.c index e7e3f493f0..7e12ce75c3 100644 --- a/src/version.c +++ b/src/version.c @@ -766,6 +766,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1608, /**/ 1607, /**/