From 0be38fa1261cdb29be8d1bb07d8bf1e30b98cb44 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sun, 19 Apr 2015 11:13:44 +0100
Subject: Fix merge oversight.

---
 content_scripts/vimium_frontend.coffee | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index b14cd9c7..7502e1c1 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -733,7 +733,10 @@ class FindMode extends Mode
       exitOnClick: true
 
       keydown: (event) =>
-        window.scrollTo @scrollX, @scrollY if options.returnToViewport
+        console.log "aaa", options.returnToViewport
+        if options.returnToViewport
+          console.log "window.scrollTo", @scrollX, @scrollY
+          window.scrollTo @scrollX, @scrollY
         if event.keyCode == keyCodes.backspace || event.keyCode == keyCodes.deleteKey
           @exit() unless handleDeleteForFindMode()
           @suppressEvent
@@ -994,7 +997,7 @@ window.enterFindMode = (options = {}) ->
   # Save the selection, so performFindInPlace can restore it.
   findModeSaveSelection()
   findModeQuery = rawQuery: ""
-  findMode = new FindMode()
+  findMode = new FindMode options
   HUD.show "/"
   findMode
 
-- 
cgit v1.2.3