From f4eb1aef7d0607f6c4d12fc0ff91cb648c1a1a0a Mon Sep 17 00:00:00 2001
From: mkiken <mkiken0@gmail.com>
Date: Mon, 20 Mar 2017 12:03:35 +0900
Subject: [PATCH 1/4] test package.json change.

---
 package.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package.json b/package.json
index 7fa69ff..9f8c99d 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,11 @@
   },
   "consumedServices": {
     "vim-mode": {
+      "versions": {
+        "^0.1.0": "_consumeVim"
+      }
+    },
+    "vim-mode-plus": {
       "versions": {
         "^0.1.0": "consumeVim"
       }

From 50f1beb1e987db5f7c181c8d9c9a3af4b2b7204e Mon Sep 17 00:00:00 2001
From: mkiken <mkiken0@gmail.com>
Date: Mon, 20 Mar 2017 13:49:33 +0900
Subject: [PATCH 2/4] switch searchHistory

---
 lib/ex.coffee | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/ex.coffee b/lib/ex.coffee
index 5edf5a8..d2e9ed9 100644
--- a/lib/ex.coffee
+++ b/lib/ex.coffee
@@ -335,12 +335,23 @@ class Ex
 
     [pattern, substition, flags] = parsed
     if pattern is ''
-      pattern = vimState.getSearchHistoryItem()
+      if vimState.getSearchHistoryItem?
+        # vim-mode
+        pattern = vimState.getSearchHistoryItem()
+      else if vimState.searchHistory?
+        #vim-mode-plus
+        pattern = vimState.searchHistory.get('prev')
+
       if not pattern?
         atom.beep()
         throw new CommandError('No previous regular expression')
     else
-      vimState.pushSearchHistory(pattern)
+      if vimState.pushSearchHistory?
+        # vim-mode
+        vimState.pushSearchHistory(pattern)
+      else if vimState.searchHistory?
+        #vim-mode-plus
+        vimState.searchHistory.save(pattern)
 
     try
       flagsObj = {}

From 0abb61fcb8970658d13fb1fc42d405fbb7fb4748 Mon Sep 17 00:00:00 2001
From: mkiken <mkiken0@gmail.com>
Date: Mon, 20 Mar 2017 14:02:05 +0900
Subject: [PATCH 3/4] add consumeVimModePlus.

---
 lib/ex-mode.coffee | 3 +++
 package.json       | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/ex-mode.coffee b/lib/ex-mode.coffee
index 490003e..5274e0a 100644
--- a/lib/ex-mode.coffee
+++ b/lib/ex-mode.coffee
@@ -36,6 +36,9 @@ module.exports = ExMode =
     @vim = vim
     @globalExState.setVim(vim)
 
+  consumeVimModePlus: (vim) ->
+    this.consumeVim(vim)
+
   config:
     splitbelow:
       title: 'Split below'
diff --git a/package.json b/package.json
index 9f8c99d..0984409 100644
--- a/package.json
+++ b/package.json
@@ -21,12 +21,12 @@
   "consumedServices": {
     "vim-mode": {
       "versions": {
-        "^0.1.0": "_consumeVim"
+        "^0.1.0": "consumeVim"
       }
     },
     "vim-mode-plus": {
       "versions": {
-        "^0.1.0": "consumeVim"
+        "^0.1.0": "consumeVimModePlus"
       }
     }
   },

From 378cf6cff4e9db8d7af5cb3b2666c97004b08309 Mon Sep 17 00:00:00 2001
From: mkiken <mkiken0@gmail.com>
Date: Mon, 20 Mar 2017 14:07:44 +0900
Subject: [PATCH 4/4] comment refactoring.

---
 lib/ex.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ex.coffee b/lib/ex.coffee
index d2e9ed9..e026b96 100644
--- a/lib/ex.coffee
+++ b/lib/ex.coffee
@@ -339,7 +339,7 @@ class Ex
         # vim-mode
         pattern = vimState.getSearchHistoryItem()
       else if vimState.searchHistory?
-        #vim-mode-plus
+        # vim-mode-plus
         pattern = vimState.searchHistory.get('prev')
 
       if not pattern?
@@ -350,7 +350,7 @@ class Ex
         # vim-mode
         vimState.pushSearchHistory(pattern)
       else if vimState.searchHistory?
-        #vim-mode-plus
+        # vim-mode-plus
         vimState.searchHistory.save(pattern)
 
     try