diff --git a/MsgPackRpc/MsgPackRpc.xcodeproj/project.pbxproj b/MsgPackRpc/MsgPackRpc.xcodeproj/project.pbxproj index 714d70d1..ba9570d8 100644 --- a/MsgPackRpc/MsgPackRpc.xcodeproj/project.pbxproj +++ b/MsgPackRpc/MsgPackRpc.xcodeproj/project.pbxproj @@ -218,7 +218,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 269; + CURRENT_PROJECT_VERSION = 270; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -278,7 +278,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 269; + CURRENT_PROJECT_VERSION = 270; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -308,7 +308,7 @@ COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 269; + DYLIB_CURRENT_VERSION = 270; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; INFOPLIST_FILE = MsgPackRpc/Info.plist; @@ -331,7 +331,7 @@ COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 269; + DYLIB_CURRENT_VERSION = 270; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; INFOPLIST_FILE = MsgPackRpc/Info.plist; diff --git a/MsgPackRpc/MsgPackRpc/Info.plist b/MsgPackRpc/MsgPackRpc/Info.plist index b8bf173a..ce939925 100644 --- a/MsgPackRpc/MsgPackRpc/Info.plist +++ b/MsgPackRpc/MsgPackRpc/Info.plist @@ -15,9 +15,9 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.21.1 + SNAPSHOT-270 CFBundleVersion - 269 + 270 NSHumanReadableCopyright Copyright © 2017 Tae Won Ha. All rights reserved. NSPrincipalClass diff --git a/NvimMsgPack/NvimMsgPack.xcodeproj/project.pbxproj b/NvimMsgPack/NvimMsgPack.xcodeproj/project.pbxproj index f8e80adb..a8d99865 100644 --- a/NvimMsgPack/NvimMsgPack.xcodeproj/project.pbxproj +++ b/NvimMsgPack/NvimMsgPack.xcodeproj/project.pbxproj @@ -218,7 +218,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 269; + CURRENT_PROJECT_VERSION = 270; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -278,7 +278,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 269; + CURRENT_PROJECT_VERSION = 270; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -308,7 +308,7 @@ COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 269; + DYLIB_CURRENT_VERSION = 270; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; INFOPLIST_FILE = NvimMsgPack/Info.plist; @@ -331,7 +331,7 @@ COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 269; + DYLIB_CURRENT_VERSION = 270; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; INFOPLIST_FILE = NvimMsgPack/Info.plist; diff --git a/NvimMsgPack/NvimMsgPack/Info.plist b/NvimMsgPack/NvimMsgPack/Info.plist index b8bf173a..ce939925 100644 --- a/NvimMsgPack/NvimMsgPack/Info.plist +++ b/NvimMsgPack/NvimMsgPack/Info.plist @@ -15,9 +15,9 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.21.1 + SNAPSHOT-270 CFBundleVersion - 269 + 270 NSHumanReadableCopyright Copyright © 2017 Tae Won Ha. All rights reserved. NSPrincipalClass diff --git a/NvimView/NvimView.xcodeproj/project.pbxproj b/NvimView/NvimView.xcodeproj/project.pbxproj index e4f7309f..32524249 100644 --- a/NvimView/NvimView.xcodeproj/project.pbxproj +++ b/NvimView/NvimView.xcodeproj/project.pbxproj @@ -458,7 +458,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 269; + CURRENT_PROJECT_VERSION = 270; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -516,7 +516,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 269; + CURRENT_PROJECT_VERSION = 270; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -543,7 +543,7 @@ COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 269; + DYLIB_CURRENT_VERSION = 270; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; FRAMEWORK_VERSION = A; @@ -565,7 +565,7 @@ COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 269; + DYLIB_CURRENT_VERSION = 270; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; FRAMEWORK_VERSION = A; diff --git a/NvimView/NvimView/Info.plist b/NvimView/NvimView/Info.plist index b8bf173a..ce939925 100644 --- a/NvimView/NvimView/Info.plist +++ b/NvimView/NvimView/Info.plist @@ -15,9 +15,9 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.21.1 + SNAPSHOT-270 CFBundleVersion - 269 + 270 NSHumanReadableCopyright Copyright © 2017 Tae Won Ha. All rights reserved. NSPrincipalClass diff --git a/NvimView/NvimView/NvimView+Key.swift b/NvimView/NvimView/NvimView+Key.swift index 373f655b..b6a4b2cc 100644 --- a/NvimView/NvimView/NvimView+Key.swift +++ b/NvimView/NvimView/NvimView+Key.swift @@ -81,16 +81,19 @@ extension NvimView { if .keyDown != event.type { return false } let flags = event.modifierFlags.intersection(.deviceIndependentFlagsMask) - /* & do not trigger keyDown events. - Catch the key event here and pass it to keyDown. - (By rogual in NeoVim dot app - https://github.com/rogual/neovim-dot-app/pull/248/files ) - */ + // & do not trigger keyDown events. + // Catch the key event here and pass it to keyDown. + // (By rogual in NeoVim dot app: https://github.com/rogual/neovim-dot-app/pull/248/files) if flags.contains(.control) && 48 == event.keyCode { self.keyDown(with: event) return true } + // Emoji menu: Cmd-Ctrl-Space + if flags.contains([.command, .control]) && 49 == event.keyCode { + return false + } + guard let chars = event.characters else { return false; } @@ -114,7 +117,7 @@ extension NvimView { self.uiBridge.vimInput(self.wrapNamedKeys("Nul")) return true } - // NsEvent already sets \u{1f} for && + // NSEvent already sets \u{1f} for && return false } diff --git a/VimR/VimR.xcodeproj/project.pbxproj b/VimR/VimR.xcodeproj/project.pbxproj index 8fa7317f..bf3131c7 100644 --- a/VimR/VimR.xcodeproj/project.pbxproj +++ b/VimR/VimR.xcodeproj/project.pbxproj @@ -1032,7 +1032,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 269; + CURRENT_PROJECT_VERSION = 270; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -1087,7 +1087,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 269; + CURRENT_PROJECT_VERSION = 270; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; diff --git a/VimR/VimR/Info.plist b/VimR/VimR/Info.plist index 6c55565a..b3866f1b 100644 --- a/VimR/VimR/Info.plist +++ b/VimR/VimR/Info.plist @@ -32,7 +32,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.21.1 + SNAPSHOT-270 CFBundleSignature ???? CFBundleURLTypes @@ -49,7 +49,7 @@ CFBundleVersion - 269 + 270 LSApplicationCategoryType public.app-category.productivity LSMinimumSystemVersion diff --git a/VimR/VimRTests/Info.plist b/VimR/VimRTests/Info.plist index b9aa3dfc..44fefdd6 100644 --- a/VimR/VimRTests/Info.plist +++ b/VimR/VimRTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 0.21.1 + SNAPSHOT-270 CFBundleSignature ???? CFBundleVersion - 269 + 270 diff --git a/appcast_snapshot.xml b/appcast_snapshot.xml index 2853e035..036ba2c5 100644 --- a/appcast_snapshot.xml +++ b/appcast_snapshot.xml @@ -7,27 +7,22 @@ Most recent changes with links to updates for VimR. en - v0.21.1-269 + SNAPSHOT-270 -
  • GH-548: Bugfix: When using certain plugings, writing beyond the right border crashes.
  • -
  • GH-620: Bugfix: Wrong underline rendering.
  • -
  • Dependencies updates:
      -
    • httpswift/swifter@1.4.0
    • -
    -
  • +
  • GH-626: Bugfix: Emoji menu (Cmd-Ctrl-Space) does not work.
  • ]]>
    - https://github.com/qvacua/vimr/releases/tag/v0.21.1-269 + https://github.com/qvacua/vimr/releases/tag/snapshot/270 - 2018-03-21T18:25:33.483368 + 2018-03-25T10:41:49.378845 10.10.0 -
    diff --git a/resources/release-notes.md b/resources/release-notes.md index d1792fe4..f6ea96b0 100644 --- a/resources/release-notes.md +++ b/resources/release-notes.md @@ -1,3 +1,7 @@ +# next + +* GH-626: Bugfix: Emoji menu (`Cmd-Ctrl-Space`) does not work. + # 0.21.1-269 * GH-548: Bugfix: When using certain plugings, writing beyond the right border crashes.