qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-12-01 01:32:04 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into issue/339-md-preview

Browse Source
This commit is contained in:
Tae Won Ha 2017-01-07 20:29:08 +01:00
commit c78b4f3413
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
9 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OutlineViewTest/Info.plist
View File

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.12.4</string>
<string>SNAPSHOT-158</string>
<key>CFBundleVersion</key>
<string>157</string>
<string>158</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>

4
SwiftNeoVim/Info.plist
View File

@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.12.4</string>
<string>SNAPSHOT-158</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>157</string>
<string>158</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2016 Tae Won Ha. All rights reserved.</string>
<key>NSPrincipalClass</key>

19
SwiftNeoVim/NeoVimView.swift
View File

@ -740,6 +740,11 @@ extension NeoVimView {
return
}
if self.mode == .Cmdline || self.mode == .Replace || self.mode == .Term {
self.agent.vimInput(self.vimPlainString(content))
return
}
guard let curPasteMode = self.agent.boolOption("paste") else {
self.ipcBecameInvalid("Reason: 'set paste' failed")
return
@ -754,17 +759,15 @@ extension NeoVimView {
pasteModeSet = false
}
let resetPasteModeCmd = pasteModeSet ? ":set nopaste<CR>" : ""
switch self.mode {
case .Insert:
self.agent.vimInput("<ESC>\"+pa")
case .Cmdline, .Replace, .Term:
self.agent.vimInput(self.vimPlainString(content))
self.agent.vimInput("<ESC>\"+p\(resetPasteModeCmd)a")
case .Normal, .Visual:
self.agent.vimInput("\"+p")
}
if pasteModeSet {
self.agent.setBoolOption("paste", to: curPasteMode.boolValue)
self.agent.vimInput("\"+p\(resetPasteModeCmd)")
default:
return
}
}

4
SwiftNeoVimTests/Info.plist
View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>0.12.4</string>
<string>SNAPSHOT-158</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>157</string>
<string>158</string>
</dict>
</plist>

4
VimR-Workspace-Demo/Info.plist
View File

@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.12.4</string>
<string>SNAPSHOT-158</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>157</string>
<string>158</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>

8
VimR.xcodeproj/project.pbxproj
View File

@ -1415,7 +1415,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 157;
DYLIB_CURRENT_VERSION = 158;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -1439,7 +1439,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 157;
DYLIB_CURRENT_VERSION = 158;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -1631,7 +1631,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 157;
CURRENT_PROJECT_VERSION = 158;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@ -1681,7 +1681,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 157;
CURRENT_PROJECT_VERSION = 158;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;

4
VimR/Info.plist
View File

@ -36,7 +36,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.12.4</string>
<string>SNAPSHOT-158</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@ -53,7 +53,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>157</string>
<string>158</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>

4
VimRTests/Info.plist
View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>0.12.4</string>
<string>SNAPSHOT-158</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>157</string>
<string>158</string>
</dict>
</plist>

4
resources/release-notes.md
View File

@ -1,3 +1,7 @@
# next
* GH-376: Bugfix, cf. GH-376
# 0.12.4-156
* GH-376: Fix a part of the bug. There's still an issue, cf. discussions in GH-376.