Skip to content

Commit 401adfb

Browse files
committed
Fix MacVim configure scripts to parse Vim version without 0 patches
Vim 9.1 just landed with 0 patches (i.e. 9.1.0) and existing configure scripts weren't set up to deal with this.
1 parent f112c12 commit 401adfb

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/auto/configure

+4-1
Original file line numberDiff line numberDiff line change
@@ -10700,9 +10700,12 @@ system ("touch conf.gtktest");
1070010700
tmp_version = g_strdup("$min_gtk_version");
1070110701
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
1070210702
printf("%s, bad version string\n", "$min_gtk_version");
10703+
g_free(tmp_version);
1070310704
exit(1);
1070410705
}
1070510706

10707+
g_free(tmp_version);
10708+
1070610709
if ((gtk_major_version > major) ||
1070710710
((gtk_major_version == major) && (gtk_minor_version > minor)) ||
1070810711
((gtk_major_version == major) && (gtk_minor_version == minor) &&
@@ -16560,7 +16563,7 @@ fi
1656016563

1656116564
vim_major_version_string=`/usr/bin/grep -m 1 'define.*VIM_VERSION_MAJOR' $srcdir/version.h|sed -E -e 's/^.*([0-9]+).*/\1/'`
1656216565
vim_minor_version_string=`/usr/bin/grep -m 1 'define.*VIM_VERSION_MINOR' $srcdir/version.h|sed -E -e 's/^.*([0-9]+).*/\1/'`
16563-
snapshot=`/usr/bin/grep -C2 "Add new patch number below this line" $srcdir/version.c|tail -1|sed -E -e 's/^ *([0-9]+),.*/\1/'`
16566+
snapshot=`/usr/bin/grep -C2 "Add new patch number below this line" $srcdir/version.c|tail -1|sed -E -e 's/^ *([0-9]+).*/\1/'`
1656416567
vim_short_version_string="$vim_major_version_string.$vim_minor_version_string.$snapshot"
1656516568

1656616569
if echo "$vim_short_version_string" | /usr/bin/grep -q "^[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+$"; then

src/configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -4894,7 +4894,7 @@ if test "x$MACOS_X" = "xyes"; then
48944894
dnl Set CFBundleShortVersionString of Info.plist
48954895
vim_major_version_string=`/usr/bin/grep -m 1 'define.*VIM_VERSION_MAJOR' $srcdir/version.h|sed -E -e 's/^.*([[0-9]]+).*/\1/'`
48964896
vim_minor_version_string=`/usr/bin/grep -m 1 'define.*VIM_VERSION_MINOR' $srcdir/version.h|sed -E -e 's/^.*([[0-9]]+).*/\1/'`
4897-
snapshot=`/usr/bin/grep -C2 "Add new patch number below this line" $srcdir/version.c|tail -1|sed -E -e 's/^ *([[0-9]]+),.*/\1/'`
4897+
snapshot=`/usr/bin/grep -C2 "Add new patch number below this line" $srcdir/version.c|tail -1|sed -E -e 's/^ *([[0-9]]+).*/\1/'`
48984898
vim_short_version_string="$vim_major_version_string.$vim_minor_version_string.$snapshot"
48994899

49004900
if echo "$vim_short_version_string" | /usr/bin/grep -q "^[[[:digit:]]]\+\.[[[:digit:]]]\+\.[[[:digit:]]]\+$"; then

0 commit comments

Comments
 (0)