Merge branch 'master' into develop

Conflicts: OutlineViewTest/Info.plist SwiftNeoVim/Info.plist SwiftNeoVimTests/Info.plist VimR-Workspace-Demo/Info.plist VimR.xcodeproj/project.pbxproj VimR/AppearancePref.swift VimR/Info.plist VimRTests/Info.plist resources/release-notes.md
2024-11-27 14:14:19 +03:00 · 2017-05-04 22:09:40 +02:00 · 2017-05-04 22:09:40 +02:00 · fca5e34e13
commit fca5e34e13
parent b774aef833 624d29b541
11 changed files with 36 additions and 27 deletions
--- a/OutlineViewTest/Info.plist
+++ b/OutlineViewTest/Info.plist
@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>SNAPSHOT-183</string>
+	<string>0.14.2</string>
 	<key>CFBundleVersion</key>
-	<string>183</string>
+	<string>184</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
--- a/SwiftNeoVim/Info.plist
+++ b/SwiftNeoVim/Info.plist
@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>SNAPSHOT-183</string>
+	<string>0.14.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>183</string>
+	<string>184</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2016 Tae Won Ha. All rights reserved.</string>
 	<key>NSPrincipalClass</key>
--- a/SwiftNeoVimTests/Info.plist
+++ b/SwiftNeoVimTests/Info.plist
@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>SNAPSHOT-183</string>
+	<string>0.14.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>183</string>
+	<string>184</string>
 </dict>
 </plist>
--- a/VimR-Workspace-Demo/Info.plist
+++ b/VimR-Workspace-Demo/Info.plist
@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>SNAPSHOT-183</string>
+	<string>0.14.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>183</string>
+	<string>184</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
--- a/VimR.xcodeproj/project.pbxproj
+++ b/VimR.xcodeproj/project.pbxproj
@ -1674,7 +1674,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 183;
+				DYLIB_CURRENT_VERSION = 184;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@ -1699,7 +1699,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 183;
+				DYLIB_CURRENT_VERSION = 184;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@ -1934,7 +1934,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 183;
+				CURRENT_PROJECT_VERSION = 184;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@ -1984,7 +1984,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 183;
+				CURRENT_PROJECT_VERSION = 184;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
--- a/VimR/AppearancePref.swift
+++ b/VimR/AppearancePref.swift
@ -101,6 +101,7 @@ class AppearancePref: PrefPane, NSComboBoxDelegate, NSControlTextEditingDelegate
    // This takes approx. 0.8s - 1s on my machine... -_-
    DispatchQueue.global(qos: .background).async {
      fontPopup.addItems(withTitles: self.fontManager.availableFontNames(with: .fixedPitchFontMask)!)
+      self.updateViews()
    }

    let sizeCombo = self.sizeCombo
--- a/VimR/Info.plist
+++ b/VimR/Info.plist
@ -32,7 +32,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>SNAPSHOT-183</string>
+	<string>0.14.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@ -49,7 +49,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>183</string>
+	<string>184</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSMinimumSystemVersion</key>
--- a/VimRTests/Info.plist
+++ b/VimRTests/Info.plist
@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>SNAPSHOT-183</string>
+	<string>0.14.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>183</string>
+	<string>184</string>
 </dict>
 </plist>
--- a/appcast.xml
+++ b/appcast.xml
@ -7,22 +7,22 @@
    <description>Most recent changes with links to updates for VimR.</description>
    <language>en</language>
    <item>
-      <title>v0.14.1-182</title>
+      <title>v0.14.2-184</title>
      <description><![CDATA[
    <ul>
-<li>Make app launch time much faster: now just one bounce in the Dock on my machine 😆</li>
+<li>GH-438: Bugfix: <code>:help</code> does not work.</li>
 </ul>
  ]]></description>
      <releaseNotesLink>
-        https://github.com/qvacua/vimr/releases/tag/v0.14.1-182
+        https://github.com/qvacua/vimr/releases/tag/v0.14.2-184
      </releaseNotesLink>
-      <pubDate>2017-05-01T11:02:53.057696</pubDate>
+      <pubDate>2017-05-04T22:05:42.932030</pubDate>
      <minimumSystemVersion>10.10.0</minimumSystemVersion>
-      <enclosure url="https://github.com/qvacua/vimr/releases/download/v0.14.1-182/VimR-v0.14.1-182.tar.bz2"
-                 sparkle:version="182"
-                 sparkle:shortVersionString="0.14.1"
-                 sparkle:dsaSignature="MC0CFQCn/FY33VnX7Wkr9bMp+RdWFD8tygIUXZnAsmGsnKE2XKbpuys+2ZLn4eQ="
-                 length="12175315"
+      <enclosure url="https://github.com/qvacua/vimr/releases/download/v0.14.2-184/VimR-v0.14.2-184.tar.bz2"
+                 sparkle:version="184"
+                 sparkle:shortVersionString="0.14.2"
+                 sparkle:dsaSignature="MC4CFQDBWoYcmlW33sAUJUMhL9BETl21CwIVALa6F0cLuFqAJU5chVW03B6pYoh0"
+                 length="12193126"
                 type="application/octet-stream"/>
    </item>
  </channel>
--- a/bin/build_vimr.sh
+++ b/bin/build_vimr.sh
@ -17,11 +17,11 @@ pushd neovim
 ln -f -s ../local.mk .

 rm -rf build
-make clean
+make distclean

 echo "### Building nvim to get the runtime folder"
+rm -rf /tmp/nvim
 make CMAKE_FLAGS="-DCUSTOM_UI=0 -DCMAKE_INSTALL_PREFIX=/tmp/nvim" install
-cp -r /tmp/nvim/share/nvim/runtime .

 rm -rf build
 make clean
@ -29,6 +29,10 @@ make clean
 echo "### Building libnvim"
 make libnvim

+echo "### Copying runtime"
+rm -rf runtime
+cp -r /tmp/nvim/share/nvim/runtime .
+
 popd

 echo "### Updating carthage"
--- a/resources/release-notes.md
+++ b/resources/release-notes.md
@ -3,6 +3,10 @@
 * Dependencies updates:
    - RxSwift: 3.4.1

+# 0.14.2-183
+
+* GH-438: Bugfix: `:help` does not work.
+
 # 0.14.1-182

 * Make app launch time much faster.