Mercurial > vim

changeset 31089:bbd5549acced v9.0.0879

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.0879: unnecessary nesting in makefile Commit: https://github.com/vim/vim/commit/dcbdd82d059a9b621e09f4447446a92ae2562e16 Author: K.Takata <kentkt@csc.jp> Date: Mon Nov 14 14:50:15 2022 +0000 patch 9.0.0879: unnecessary nesting in makefile Problem: Unnecessary nesting in makefile. Solution: Join "else" and "ifeq". (Ken Takata, closes https://github.com/vim/vim/issues/11547)
author Bram Moolenaar <Bram@vim.org>
date Mon, 14 Nov 2022 16:00:05 +0100
parents c7c9ec57cd55
children a681edbc4386
files src/Make_cyg_ming.mak src/version.c
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -226,13 +226,11 @@ CXX := $(CROSS_COMPILE)g++
 endif
 ifeq ($(UNDER_CYGWIN),yes)
 WINDRES := $(CROSS_COMPILE)windres
-else
-ifeq ($(findstring clang,$(CC)),)
+else ifeq ($(findstring clang,$(CC)),)
 WINDRES := windres
 else
 WINDRES := llvm-windres
 endif
-endif
 
 # Get the default ARCH.
 ifndef ARCH
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    879,
+/**/
     878,
 /**/
     877,