From 2f27c65410dcb68fd06cb6c54c1ed8fae2d11c79 Mon Sep 17 00:00:00 2001 From: Cthulhux Date: Wed, 10 Apr 2024 16:34:49 +0200 Subject: [PATCH] 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 --- src/po/Make_mvc.mak | 2 ++ src/version.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/po/Make_mvc.mak b/src/po/Make_mvc.mak index fa6a1ba59..a9a69fdcc 100644 --- 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 index 5bf9581b5..520b7e9c2 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 298, /**/ 297, /**/