Merge branch 'develop' into issue/296-workspace

SwiftNeoVim/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.11.0-SNAPSHOT-20161113.1502</string>
+	<string>0.10.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>126</string>
+	<string>127</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2016 Tae Won Ha. All rights reserved.</string>
 	<key>NSPrincipalClass</key>

SwiftNeoVimTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.11.0-SNAPSHOT-20161113.1502</string>
+	<string>0.10.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>126</string>
+	<string>127</string>
 </dict>
 </plist>

VimR-Workspace-Demo/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.11.0-SNAPSHOT-20161113.1502</string>
+	<string>0.10.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>126</string>
+	<string>127</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>

VimR.xcodeproj/project.pbxproj

@@ -1201,7 +1201,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 126;
+				DYLIB_CURRENT_VERSION = 127;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1225,7 +1225,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 126;
+				DYLIB_CURRENT_VERSION = 127;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1374,7 +1374,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 126;
+				CURRENT_PROJECT_VERSION = 127;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -1424,7 +1424,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 126;
+				CURRENT_PROJECT_VERSION = 127;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;

VimR/Info.plist

@@ -36,7 +36,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.11.0-SNAPSHOT-20161113.1502</string>
+	<string>0.10.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -53,7 +53,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>126</string>
+	<string>127</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>

VimRTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.11.0-SNAPSHOT-20161113.1502</string>
+	<string>0.10.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>126</string>
+	<string>127</string>
 </dict>
 </plist>

appcast.xml

@@ -7,29 +7,31 @@
     <description>Most recent changes with links to updates for VimR.</description>
     <language>en</language>
     <item>
-      <title>v0.10.1-122</title>
+      <title>v0.10.2-127</title>
       <description><![CDATA[
     <ul>
-<li>GH-321: <code>Cmd-V</code> now works in the terminal mode.</li>
+<li>GH-332: Turn on <code>paste</code> option before <code>Cmd-V</code>ing (and reset the value)</li>
-<li>GH-330: Closing the file browser with <code>Cmd-1</code> now focuses the Neovim view.</li>
+<li>GH-333: Set <code>$LANG</code> to <code>utf-8</code> such that non-ASCII characters are not garbled when copied to the system clipboard.<ul>
-<li>GU-308: Set <code>cwd</code> to the parent folder of the file when opening a file in a new window</li>
+<li>GH-337: With the first version of GH-333, strangely, on 10.12.X <code>init.vim</code> did not get read. GH-337 fixes this issue.</li>
-<li>Update RxSwift from <code>3.0.0-rc1</code> to <code>3.0.1</code></li>
-<li>Update Neovim to neovim/neovim@0213e99aaf6eba303fd459183dd14a4a11cc5b07<ul>
-<li>includes <code>inccommand</code>! 😆</li>
 </ul>
 </li>
+<li>GH-334: <code>set</code> <code>title</code> and <code>termguicolors</code> by default such that airline works without changing <code>init.vim</code>.</li>
+<li>GH-276: Draw a different, i.e. thin, cursor in the insert mode.</li>
+<li>GH-299: Add a context menu to the file browser.</li>
+<li>GH-237: Increase mouse scrollwheel sensitivity.</li>
+<li>neovim/neovim@598f5af58b21747ea9d6dc0a7d846cb85ae52824</li>
 </ul>
   ]]></description>
       <releaseNotesLink>
-        https://github.com/qvacua/vimr/releases/tag/v0.10.1-122
+        https://github.com/qvacua/vimr/releases/tag/v0.10.2-127
       </releaseNotesLink>
-      <pubDate>2016-11-10T15:28:19.011522</pubDate>
+      <pubDate>2016-11-14T23:42:19.142910</pubDate>
       <minimumSystemVersion>10.10.0</minimumSystemVersion>
-      <enclosure url="https://github.com/qvacua/vimr/releases/download/v0.10.1-122/VimR-v0.10.1-122.tar.bz2"
+      <enclosure url="https://github.com/qvacua/vimr/releases/download/v0.10.2-127/VimR-v0.10.2-127.tar.bz2"
-                 sparkle:version="122"
+                 sparkle:version="127"
-                 sparkle:shortVersionString="0.10.1"
+                 sparkle:shortVersionString="0.10.2"
-                 sparkle:dsaSignature="MC0CFC7+7qp8frwZsNq2uDKyx3nEDw10AhUA4cj44vvMUiFB63oVZay/zZxcAGU="
+                 sparkle:dsaSignature="MC0CFQCll8J9mjwkBuTRXfUEWa/EC8583gIUT1eY52uanc3nNZNxa9uVCf90hAg="
-                 length="8906932"
+                 length="8924729"
                  type="application/octet-stream"/>
     </item>
   </channel>

resources/release-notes.md

@@ -1,5 +1,9 @@
 # next
 
+* ...
+
+# 0.10.2-127
+
 * GH-332: Turn on `paste` option before `Cmd-V`ing (and reset the value)
 * GH-333: Set `$LANG` to `utf-8` such that non-ASCII characters are not garbled when copied to the system clipboard.
     - GH-337: With the first version of GH-333, strangely, on 10.12.X `init.vim` did not get read. GH-337 fixes this issue.
@@ -7,6 +11,7 @@
 * GH-276: Draw a different, i.e. thin, cursor in the insert mode.
 * GH-299: Add a context menu to the file browser.
 * GH-237: Increase mouse scrollwheel sensitivity.
+* neovim/neovim@598f5af58b21747ea9d6dc0a7d846cb85ae52824
 
 # 0.10.1-122