From 8dab334fa2fde9d4815ce0a12c0d2ab9dd44ff05 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Wed, 3 Jun 2015 16:15:31 +0100
Subject: Also set previous position for  before global mark movement.

---
 content_scripts/mode.coffee            | 3 +--
 content_scripts/vimium_frontend.coffee | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'content_scripts')

diff --git a/content_scripts/mode.coffee b/content_scripts/mode.coffee
index 22b6120f..86d3e011 100644
--- a/content_scripts/mode.coffee
+++ b/content_scripts/mode.coffee
@@ -52,8 +52,7 @@ class Mode
     # and 2) worry about their return value.
     if @options.suppressAllKeyboardEvents
       for type in [ "keydown", "keypress", "keyup" ]
-        do (type) =>
-          handler = @options[type]
+        do (handler = @options[type]) =>
           @options[type] = (event) => handler? event; @stopBubblingAndFalse
 
     @push
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 9ff9b6db..fec0dae2 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -266,7 +266,9 @@ executePageCommand = (request) ->
 
 setScrollPosition = (scrollX, scrollY) ->
   if (scrollX > 0 || scrollY > 0)
-    DomUtils.documentReady(-> window.scrollTo(scrollX, scrollY))
+    DomUtils.documentReady ->
+      Marks.markPosition()
+      window.scrollTo scrollX, scrollY
 
 #
 # Called from the backend in order to change frame focus.
-- 
cgit v1.2.3