<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6418dc0d7fa5fa66993a2959a3704cd0196c4b38">https://github.com/macports/macports-ports/commit/6418dc0d7fa5fa66993a2959a3704cd0196c4b38</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 6418dc0d7fa MacVim: Update to version 8.1.snapshot166
</span>6418dc0d7fa is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 6418dc0d7fa5fa66993a2959a3704cd0196c4b38
</span>Author: Andrew Zhou <0az@afzhou.com>
AuthorDate: Thu Sep 24 10:57:13 2020 -0500

<span style='display:block; white-space:pre;color:#404040;'>    MacVim: Update to version 8.1.snapshot166
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - Add Python 3.8 Variant
</span><span style='display:block; white-space:pre;color:#404040;'>    - Remove GCC Version patch
</span><span style='display:block; white-space:pre;color:#404040;'>    - Update Homebrew Python patch
</span><span style='display:block; white-space:pre;color:#404040;'>    - Update Sparkle patch
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/60242
</span>---
 editors/MacVim/Portfile                            |  26 ++--
 editors/MacVim/files/patch-MacVim-GCC-VERSION.diff |  20 ---
 .../MacVim/files/patch-remove-Homebrew-python.diff |  16 +--
 editors/MacVim/files/patch-remove-sparkle.diff     | 143 +++++++--------------
 4 files changed, 74 insertions(+), 131 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/Portfile b/editors/MacVim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 46b95fbdbf6..525ae396160 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,8 +2,8 @@ PortSystem          1.0
</span> PortGroup           github 1.0
 PortGroup           compiler_blacklist_versions 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set vim_version     8.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set snapshot        161
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set vim_version     8.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set snapshot        166
</span> github.setup        macvim-dev macvim ${snapshot} snapshot-
 name                MacVim
 version             ${vim_version}.snapshot${snapshot}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +19,9 @@ long_description \
</span> 
 homepage            https://macvim-dev.github.io/macvim/
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  25adc7f380af17101948b2d6fc39e347672c3383 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  bbc220da67525d1bc4732c8c0689ef04dc1f39603acf1530c6938aca049f3017 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    21198775
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  653794d83ca1dbf116a3c765acea5d25b5f6749f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  7ebc9c5ad56e4a75a3fc1c35b2730c646f5fb82635c04b9e5b8e9192e92652f7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    21834717
</span> 
 depends_lib         port:ncurses \
                     port:gettext \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,8 +31,7 @@ depends_lib         port:ncurses \
</span> # https://trac.macports.org/ticket/54666
 supported_archs     x86_64
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          patch-MacVim-GCC-VERSION.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-remove-sparkle.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-remove-sparkle.diff \
</span>                     patch-remove-Homebrew-python.diff
 
 pre-fetch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,7 +130,7 @@ variant python27 description {Enable Python scripting} {
</span>     # Overwriting autoconf.cmd above removes dependency, add it again
     depends_build-append port:autoconf
 }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 conflicts python37 description {Enable Python scripting} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 conflicts python37 python38 description {Enable Python scripting} {
</span>     configure.args-append   --enable-python3interp --with-python3-command=${prefix}/bin/python3.6
     patchfiles-append       patch-python3.diff
     depends_lib-append      port:python36
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,7 +139,7 @@ variant python36 conflicts python37 description {Enable Python scripting} {
</span>     # Overwriting autoconf.cmd above removes dependency, add it again
     depends_build-append port:autoconf
 }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python36 description {Enable Python scripting} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python36 python38 description {Enable Python scripting} {
</span>     configure.args-append   --enable-python3interp --with-python3-command=${prefix}/bin/python3.7
     patchfiles-append       patch-python3.diff
     depends_lib-append      port:python37
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,6 +148,15 @@ variant python37 conflicts python36 description {Enable Python scripting} {
</span>     # Overwriting autoconf.cmd above removes dependency, add it again
     depends_build-append port:autoconf
 }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python36 python37 description {Enable Python scripting} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append   --enable-python3interp --with-python3-command=${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append       patch-python3.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      port:python38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    use_autoconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Overwriting autoconf.cmd above removes dependency, add it again
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_build-append port:autoconf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 variant ruby requires ruby18 description {Compatibility variant, requires +ruby18} {}
 variant ruby18 conflicts ruby19 ruby20 ruby21 ruby22 ruby23 ruby24 ruby25 description {Enable Ruby scripting} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/files/patch-MacVim-GCC-VERSION.diff b/editors/MacVim/files/patch-MacVim-GCC-VERSION.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 70bbfe56e65..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/files/patch-MacVim-GCC-VERSION.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/MacVim/MacVim.xcodeproj/project.pbxproj.orig       2015-12-09 18:06:35.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/MacVim/MacVim.xcodeproj/project.pbxproj    2015-12-09 18:06:38.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1055,7 +1055,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   isa = XCBuildConfiguration;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   buildSettings = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           ENABLE_TESTABILITY = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                          GCC_VERSION = 4.2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+                          GCC_VERSION = "";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           GCC_WARN_ABOUT_RETURN_TYPE = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           GCC_WARN_UNUSED_VARIABLE = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           ONLY_ACTIVE_ARCH = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1067,7 +1067,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           C01FCF5008A954540054247B /* Release */ = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   isa = XCBuildConfiguration;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   buildSettings = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                          GCC_VERSION = 4.2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+                          GCC_VERSION = "";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           GCC_WARN_ABOUT_RETURN_TYPE = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           GCC_WARN_UNUSED_VARIABLE = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           ONLY_ACTIVE_ARCH = YES;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/files/patch-remove-Homebrew-python.diff b/editors/MacVim/files/patch-remove-Homebrew-python.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a1172b266bf..bc102d12f78 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/files/patch-remove-Homebrew-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/files/patch-remove-Homebrew-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream: https://github.com/macvim-dev/macvim/pull/423 (reverting partly)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/MacVim/vimrc       2019-10-30 12:33:12.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/MacVim/vimrc       2019-12-29 01:10:11.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/MacVim/vimrc       2020-09-15 01:48:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/MacVim/vimrc       2020-09-15 01:54:22.000000000 -0500
</span> @@ -13,36 +13,3 @@
  " the entire MacVim menu is set up in a nib file which currently only is
  " translated to English).
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,12 +28,12 @@ Upstream: https://github.com/macvim-dev/macvim/pull/423 (reverting partly)
</span> -" or an installation from python.org:
 -if exists("&pythonthreedll") && exists("&pythonthreehome") &&
 -      \ !filereadable(&pythonthreedll)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--  if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.7/Python")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    " MacPorts python 3.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.7/Python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.7/Python")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.8/Python")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    " MacPorts python 3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.8/Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.8/Python")
</span> -    " https://www.python.org/downloads/mac-osx/
<span style='display:block; white-space:pre;background:#ffe0e0;'>--    set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.7/Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.8/Python
</span> -  endif
 -endif
 -
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/files/patch-remove-sparkle.diff b/editors/MacVim/files/patch-remove-sparkle.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index cab6c9e85af..78485d07fc4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/files/patch-remove-sparkle.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/files/patch-remove-sparkle.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,95 +1,52 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/MacVim/English.lproj/Preferences.nib/designable.nib        2018-12-12 12:45:19.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/MacVim/English.lproj/Preferences.nib/designable.nib        2018-12-27 15:38:28.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -75,28 +75,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                         <binding destination="58" name="selectedTag" keyPath="values.MMOpenLayout" id="441"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     </connections>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 </popUpButton>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                <textField verticalHuggingPriority="750" id="124">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                    <rect key="frame" x="17" y="209" width="187" height="17"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                    <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="When MacVim launches:" id="976">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                        <font key="font" metaFont="system"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                    </textFieldCell>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                </textField>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                <button id="122">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                    <rect key="frame" x="207" y="208" width="258" height="18"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                    <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                    <string key="toolTip">Checks for updates and presents a dialog box showing the release notes and prompt for whether you want to install the new version.</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                    <buttonCell key="cell" type="check" title="Check for updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="975">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                        <font key="font" metaFont="system"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                    </buttonCell>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                    <connections>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                        <action selector="checkForUpdatesChanged:" target="-2" id="YjS-ig-M1j"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                        <binding destination="58" name="value" keyPath="values.SUCheckAtStartup" id="169"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                    </connections>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                </button>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 <textField verticalHuggingPriority="750" id="121">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     <rect key="frame" x="209" y="50" width="243" height="58"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/MacVim/MacVim.xcodeproj/project.pbxproj    2019-12-29 01:02:12.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/MacVim/MacVim.xcodeproj/project.pbxproj    2019-12-29 01:02:12.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,8 +66,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           1DFE25A50C527BC4003000F7 /* PSMTabBarControl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           52818B031C1C08CE00F59085 /* QLStephen.qlgenerator in Copy QuickLookPlugin */ = {isa = PBXBuildFile; fileRef = 52818AFF1C1C075300F59085 /* QLStephen.qlgenerator */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           528DA66A1426D4F9003380F1 /* macvim-askpass in Copy Scripts */ = {isa = PBXBuildFile; fileRef = 528DA6691426D4EB003380F1 /* macvim-askpass */; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--          52A364731C4A5789005757EC /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52A364721C4A5789005757EC /* Sparkle.framework */; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--          52A364761C4A57C1005757EC /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 52A364721C4A5789005757EC /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           52B7ED9B1C4A4D6900AFFF15 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 52B7ED9A1C4A4D6900AFFF15 /* dsa_pub.pem */; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -124,7 +122,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   dstPath = "";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   dstSubfolderSpec = 10;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   files = (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                          52A364761C4A57C1005757EC /* Sparkle.framework in Copy Frameworks */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           1D493DBA0C52534300AB718C /* PSMTabBarControl.framework in Copy Frameworks */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   name = "Copy Frameworks";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -250,7 +247,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           32CA4F630368D1EE00C91783 /* MacVim_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacVim_Prefix.pch; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           52818AFA1C1C075300F59085 /* QuickLookStephen.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = QuickLookStephen.xcodeproj; path = qlstephen/QuickLookStephen.xcodeproj; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           528DA6691426D4EB003380F1 /* macvim-askpass */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "macvim-askpass"; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--          52A364721C4A5789005757EC /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           52B7ED9A1C4A4D6900AFFF15 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           8D1107320486CEB800E47090 /* MacVim.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacVim.app; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -395,7 +391,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           1DFE25A50C527BC4003000F7 /* PSMTabBarControl.framework in Frameworks */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           1D8B5A53104AF9FF002E59D5 /* Carbon.framework in Frameworks */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                          52A364731C4A5789005757EC /* Sparkle.framework in Frameworks */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   runOnlyForDeploymentPostprocessing = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -575,7 +570,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           29B97323FDCFA39411CA2CEA /* Frameworks */ = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   isa = PBXGroup;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   children = (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                          52A364721C4A5789005757EC /* Sparkle.framework */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           1D8B5A52104AF9FF002E59D5 /* Carbon.framework */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           1D493DB30C52533B00AB718C /* PSMTabBarControl.xcodeproj */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/MacVim/English.lproj/MainMenu.nib/designable.nib   2019-10-30 12:33:12.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/MacVim/English.lproj/MainMenu.nib/designable.nib   2019-12-29 01:07:47.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,11 +24,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                     <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                 </connections>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                             </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                            <menuItem title="Check for Updates…" id="255">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/MacVim/English.lproj/Preferences.nib/designable.nib        2020-09-15 01:22:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/MacVim/English.lproj/Preferences.nib/designable.nib        2020-09-15 01:36:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -180,49 +180,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                         </popUpButton>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                     </subviews>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 </customView>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0hT-y8-Hge" userLabel="Updater">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                    <rect key="frame" x="19" y="22" width="444" height="36"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                    <subviews>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                        <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="122">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                            <rect key="frame" x="188" y="18" width="258" height="18"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                            <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                            <string key="toolTip">Checks for updates and presents a dialog box showing the release notes and prompt for whether you want to install the new version.</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                            <buttonCell key="cell" type="check" title="Check for updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="975">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                                <font key="font" metaFont="system"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                            </buttonCell>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                            <connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                                <action selector="checkForUpdatesChanged:" target="-2" id="YjS-ig-M1j"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                                <binding destination="58" name="value" keyPath="values.SUCheckAtStartup" id="169"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                            </connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                        </button>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                        <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UYM-W0-Kgl" userLabel="Auto-install updates">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                            <rect key="frame" x="202" y="-2" width="244" height="18"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                            <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                            <string key="toolTip">MacVim will automatically download and install updates without prompting. The updated version will be used the next time MacVim starts.</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                            <buttonCell key="cell" type="check" title="Automatically install updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="GfP-vg-mec">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                                <font key="font" metaFont="system"/>
</span> -                                <connections>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--                                    <action selector="checkForUpdates:" target="Jqk-qh-n0J" id="Wau-rL-cbn"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                                    <binding destination="58" name="enabled" keyPath="values.SUCheckAtStartup" id="5oY-Gf-XJN"/>
</span> -                                </connections>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--                            </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                             <menuItem isSeparatorItem="YES" id="196">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                             </menuItem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -208,6 +203,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             </items>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             <point key="canvasLocation" x="139" y="67"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         </menu>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        <customObject id="Jqk-qh-n0J" customClass="SUUpdater"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     </objects>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </document>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                            </buttonCell>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                            <connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                                <binding destination="58" name="value" keyPath="values.SUAutomaticallyUpdate" id="kyZ-ah-zKf"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                            </connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                        </button>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="124">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                            <rect key="frame" x="-2" y="19" width="187" height="17"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                            <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="When MacVim launches:" id="976">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                                <font key="font" metaFont="system"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                            </textFieldCell>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                        </textField>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                    </subviews>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                </customView>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             </subviews>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             <point key="canvasLocation" x="137.5" y="382"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         </customView>
</span></pre><pre style='margin:0'>

</pre>