From 02ab74465c68e9976c57a91bdc26c257e3dc0fd9 Mon Sep 17 00:00:00 2001
From: jazzpi <jasper@mezzo.de>
Date: Thu, 25 May 2017 01:08:21 +0200
Subject: [PATCH 1/4] Support vim-mode-plus marks

---
 lib/command.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/command.coffee b/lib/command.coffee
index 0cfd6f2..fcc1144 100644
--- a/lib/command.coffee
+++ b/lib/command.coffee
@@ -22,7 +22,7 @@ class Command
     else if str[0] is "'" # Parse Mark...
       unless @vimState?
         throw new CommandError("Couldn't get access to vim-mode.")
-      mark = @vimState.marks[str[1]]
+      mark = @vimState.mark.marks[str[1]]
       unless mark?
         throw new CommandError("Mark #{str} not set.")
       addr = mark.getEndBufferPosition().row

From 708aa94eb0d94b3cb951ab35255739b6428f6dbe Mon Sep 17 00:00:00 2001
From: jazzpi <jasper@mezzo.de>
Date: Thu, 25 May 2017 01:08:38 +0200
Subject: [PATCH 2/4] Use vim-mode-plus in specs

---
 spec/ex-commands-spec.coffee | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spec/ex-commands-spec.coffee b/spec/ex-commands-spec.coffee
index cc349ac..4e3d839 100644
--- a/spec/ex-commands-spec.coffee
+++ b/spec/ex-commands-spec.coffee
@@ -11,7 +11,7 @@ describe "the commands", ->
   [editor, editorElement, vimState, exState, dir, dir2] = []
   projectPath = (fileName) -> path.join(dir, fileName)
   beforeEach ->
-    vimMode = atom.packages.loadPackage('vim-mode')
+    vimMode = atom.packages.loadPackage('vim-mode-plus')
     exMode = atom.packages.loadPackage('ex-mode')
     waitsForPromise ->
       activationPromise = exMode.activate()
@@ -42,7 +42,6 @@ describe "the commands", ->
         editor = editorElement.getModel()
         vimState = vimMode.mainModule.getEditorState(editor)
         exState = exMode.mainModule.exStates.get(editor)
-        vimState.activateNormalMode()
         vimState.resetNormalMode()
         editor.setText("abc\ndef\nabc\ndef")
 

From 99dd953370ded740057119fda1a4761cbd8a4b12 Mon Sep 17 00:00:00 2001
From: jazzpi <jasper@mezzo.de>
Date: Thu, 25 May 2017 01:18:58 +0200
Subject: [PATCH 3/4] Use vim-mode-plus on Travis

Also use Linux on Travis because there are more machines available
---
 .travis.yml | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3a85896..e8e09d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,45 @@
-language: objective-c
+## Project specific config ###
+language: generic
+
 env:
-    - APM_TEST_PACKAGES="vim-mode"
+  global:
+    - APM_TEST_PACKAGES="vim-mode-plus"
+    - ATOM_LINT_WITH_BUNDLED_NODE="true"
+
+  matrix:
+    - ATOM_CHANNEL=stable
+    - ATOM_CHANNEL=beta
+
+os:
+  - linux
+
+dist: trusty
+
+### Generic setup follows ###
+script:
+  - curl -s -O https://raw.githubusercontent.com/atom/ci/master/build-package.sh
+  - chmod u+x build-package.sh
+  - ./build-package.sh
 
 notifications:
   email:
     on_success: never
     on_failure: change
 
-script: 'curl -s https://raw.githubusercontent.com/atom/ci/master/build-package.sh | sh'
+branches:
+  only:
+    - master
 
 git:
   depth: 10
+
+sudo: false
+
+addons:
+  apt:
+    packages:
+    - build-essential
+    - git
+    - libgnome-keyring-dev
+    - libsecret-1-dev
+    - fakeroot

From 546aa9f95c42aaa8b439d64ac85207423e54f710 Mon Sep 17 00:00:00 2001
From: jazzpi <jasper@mezzo.de>
Date: Thu, 25 May 2017 01:33:11 +0200
Subject: [PATCH 4/4] Use vim-mode-plus in ex-input-spec as well

---
 spec/ex-input-spec.coffee | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spec/ex-input-spec.coffee b/spec/ex-input-spec.coffee
index 3d076b9..cd7fbd0 100644
--- a/spec/ex-input-spec.coffee
+++ b/spec/ex-input-spec.coffee
@@ -2,7 +2,7 @@ helpers = require './spec-helper'
 describe "the input element", ->
   [editor, editorElement, vimState, exState] = []
   beforeEach ->
-    vimMode = atom.packages.loadPackage('vim-mode')
+    vimMode = atom.packages.loadPackage('vim-mode-plus')
     exMode = atom.packages.loadPackage('ex-mode')
     waitsForPromise ->
       activationPromise = exMode.activate()
@@ -26,7 +26,6 @@ describe "the input element", ->
         atom.commands.dispatch(getCommandEditor(), "core:cancel")
         vimState = vimMode.mainModule.getEditorState(editor)
         exState = exMode.mainModule.exStates.get(editor)
-        vimState.activateNormalMode()
         vimState.resetNormalMode()
         editor.setText("abc\ndef\nabc\ndef")