Merge remote-tracking branch 'upstream/master' into post-1.46

4 files changed, 30 insertions, 21 deletions

diff --git a/README.md b/README.md
index 20331785..8256f9f7 100644
--- a/README.md
+++ b/README.md
@@ -140,6 +140,15 @@ Please see [CONTRIBUTING.md](https://github.com/philc/vimium/blob/master/CONTRIB
 
 Release Notes
 -------------
+1.46, 1.47, 1.48 (2014-12-15)
+
+- Site-specific excluded keys: you can disable some Vimium key bindings on sites like gmail.com, so you can use the key bindings provided by the site itself.
+- Smooth scrolling.
+- The Vomnibar now orders tabs by recency. Use this to quickly switch between your most recently-used tabs.
+- New commands: "close tabs to the left", "close tabs to the right", "close all other tabs".
+- Usability improvements.
+- Bug fixes.
+
 1.45 (2014-07-20)
 
 - Vimium's settings are now synced across computers.
@@ -147,12 +156,12 @@ Release Notes
 - Vomnibar can now use [search engine shortcuts](https://github.com/philc/vimium/wiki/Search-Engines), similar to Chrome's Omnibar.
 - Due to significant ranking improvements, Vomnibar's search results are now even more helpful.
 - When reopening a closed tab, its history is now preserved.
-- Bugfixes.
+- Bug fixes.
 
 1.44 (2013-11-06)
 
 - Add support for recent versions of Chromium.
-- Bugfixes.
+- Bug fixes.
 
 1.43 (2013-05-18)
 
@@ -164,25 +173,25 @@ Release Notes
 - Added "LinkHints.activateModeToOpenIncognito", currently an advanced, unbound command.
 - Disallowed repeat tab closings, since this causes trouble for many people.
 - Update our Chrome APIs so Vimium works on Chrome 28+.
-- Bugfixes.
+- Bug fixes.
 
 1.42 (2012-11-03)
 
-- Bugfixes.
+- Bug fixes.
 
 1.41 (2012-10-27)
 
-- Bugfixes.
+- Bug fixes.
 
 1.40 (2012-10-27)
 
-- Bugfixes.
+- Bug fixes.
 - Added options for search engines and regex find.
 - Pressing unmapped keys in hints mode now deactivates the mode.
 
 1.39 (2012-09-09)
 
-- Bugfixes.
+- Bug fixes.
 
 1.38 (2012-09-08)
 
@@ -190,7 +199,7 @@ Release Notes
 - Add a browser icon to quickly add sites to Vimium's exclude list.
 - Restyle options page.
 - `gi` now launches a new mode that allows the user to tab through the input elements on the page.
-- Bugfixes.
+- Bug fixes.
 
 1.37 (2012-07-07)
 
@@ -203,11 +212,11 @@ Release Notes
 
 1.35 (2012-07-05)
 
-- Bugfixes.
+- Bug fixes.
 
 1.34 (2012-07-03)
 
-- A bugfix for bookmarklets in Vomnibar.
+- A bug fix for bookmarklets in Vomnibar.
 
 1.33 (2012-07-02)
 
@@ -247,11 +256,11 @@ Release Notes
 
 - Support for opening bookmarks (`b` and `B`).
 - Support for contenteditable text boxes.
-- Speed improvements and bugfixes.
+- Speed improvements and bug fixes.
 
 1.27 (2011-03-24)
 
-- Improvements and bugfixes.
+- Improvements and bug fixes.
 
 1.26 (2011-02-17)
 
@@ -266,11 +275,11 @@ Release Notes
 -  Many of the less-used commands are now marked as "advanced" and hidden in the help dialog by default, so
    that the core command set is more focused and approachable.
 -  Improvements to link hinting.
--  Bugfixes.
+-  Bug fixes.
 
 1.21 (2010-10-24)
 
--  Critical bugfix for an excluded URLs regression due to frame support.
+-  Critical bug fix for an excluded URLs regression due to frame support.
 
 1.20 (2010-10-24)
 
@@ -317,7 +326,7 @@ does not support command repetition.
 
 -  Make the CSS used by the link hints configurable. It's under Advanced Options.
 -  Add a notification linking to the changelog when Vimium is updated in the background.
--  Link-hinting performance improvements and bugfixes.
+-  Link-hinting performance improvements and bug fixes.
 -  Ctrl+D and Ctrl+U now scroll by 1/2 page instead of a fixed amount, to mirror Vim's behavior.
 
 1.14 (2010-01-21)
@@ -327,7 +336,7 @@ does not support command repetition.
 1.13 (2010-01-21)
 
 - `<c-f>` and `<c-b>` are now mapped to scroll a full page up or down respectively.
--  Bugfixes related to entering insert mode when the page first loads, and when focusing Flash embeds.
+-  Bug fixes related to entering insert mode when the page first loads, and when focusing Flash embeds.
 -  Added command listing to the Options page for easy reference.
 -  J & K have reversed for tab switching: J goes left and K goes right.
 -  `<c-[>` is now equivalent to ESC, to match the behavior of VIM.
diff --git a/content_scripts/scroller.coffee b/content_scripts/scroller.coffee
index 5eb1c5e2..a2617289 100644
--- a/content_scripts/scroller.coffee
+++ b/content_scripts/scroller.coffee
@@ -34,12 +34,12 @@ getDimension = (el, direction, amount) ->
   else
     amount
 
-# Perform a scroll. Return true if we successfully scrolled by the requested amount, and false otherwise.
+# Perform a scroll. Return true if we successfully scrolled by any amount, and false otherwise.
 performScroll = (element, direction, amount) ->
   axisName = scrollProperties[direction].axisName
   before = element[axisName]
   element[axisName] += amount
-  element[axisName] == amount + before
+  element[axisName] != before
 
 # Test whether `element` should be scrolled. E.g. hidden elements should not be scrolled.
 shouldScroll = (element, direction) ->
diff --git a/content_scripts/vimium.css b/content_scripts/vimium.css
index a042a4cf..f582824a 100644
--- a/content_scripts/vimium.css
+++ b/content_scripts/vimium.css
@@ -4,8 +4,8 @@
  * Vimium dialogs.
  *
  * The z-indexes of Vimium elements are very large, because we always want them to show on top. Chrome may
- * support up to Number.MAX_VALUE, which is approximately 1.7976e+308. We're using 2**31, which is the max value of a singed 32 bit int.
- * Let's use try larger valeus if 2**31 empirically isn't large enough.
+ * support up to Number.MAX_VALUE, which is approximately 1.7976e+308. We're using 2^31, which is the max
+ * value of a singed 32 bit int. Let's try larger valeus if 2**31 empirically isn't large enough.
  */
 
 /*
diff --git a/manifest.json b/manifest.json
index d52ac8f6..67704677 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Vimium",
-  "version": "1.45",
+  "version": "1.48",
   "description": "The Hacker's Browser. Vimium provides keyboard shortcuts for navigation and control in the spirit of Vim.",
   "icons": {  "16": "icons/icon16.png",
               "48": "icons/icon48.png",