# HG changeset patch # User Christian Brabandt # Date 1712760303 -7200 # Node ID de4405462a2acc10e90479fa16390704c171c538 # Parent 48cd599b2380067c09ea56f6dc63551ef1dc5fc2 patch 9.1.0298: MS-Windows: GETTEXT_PATH hard-coded in src/po/Make_mvc.mak Commit: https://github.com/vim/vim/commit/2f27c65410dcb68fd06cb6c54c1ed8fae2d11c79 Author: Cthulhux Date: Wed Apr 10 16:34:49 2024 +0200 patch 9.1.0298: MS-Windows: GETTEXT_PATH hard-coded in src/po/Make_mvc.mak Problem: MS-Windows: GETTEXT_PATH hard-coded in src/po/Make_mvc.mak Solution: Add IFNDEF/ENDIF around the definition of GETTEXT_PATH (Cthulhux) It makes no sense to enforce modifying Vim source files just because your build stuff is not where it's expected. My change is supposed to add support for a locally-defined %GETTEXT_PATH%. closes: #14480 Signed-off-by: Cthulhux Signed-off-by: Christian Brabandt diff --git a/src/po/Make_mvc.mak b/src/po/Make_mvc.mak --- a/src/po/Make_mvc.mak +++ b/src/po/Make_mvc.mak @@ -44,7 +44,9 @@ VIM = ..\vim.exe # Correct the following line for the directory where gettext et al is # installed. Please do not put the path in quotes. +!IFNDEF GETTEXT_PATH GETTEXT_PATH = D:\Programs\GetText\bin +!ENDIF # Starting from version 0.22, msgfmt forcibly converts text to UTF-8 regardless # of the value of the "charset" field. diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 298, +/**/ 297, /**/ 296,