aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--pages/options.coffee3
2 files changed, 4 insertions, 1 deletions
diff --git a/README.md b/README.md
index 4eef7cb0..604e35ef 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Keyboard Bindings
-----------------
Modifier keys are specified as `<c-x>`, `<m-x>`, and `<a-x>` for ctrl+x, meta+x, and alt+x
-respectively. See the next section for how to customize these bindings.
+respectively. For shift+x and ctrl-shift-x, just type `X` and `<c-X>`. See the next section for how to customize these bindings.
Once you have Vimium installed, you can see this list of key bindings at any time by typing `?`.
diff --git a/pages/options.coffee b/pages/options.coffee
index 86b6122d..0d4f5999 100644
--- a/pages/options.coffee
+++ b/pages/options.coffee
@@ -333,6 +333,9 @@ document.addEventListener "DOMContentLoaded", ->
#
# Backup and restore. "?" is for the tests."
DomUtils?.documentReady ->
+ # Only initialize backup/restore on the options page (not the popup).
+ return unless location.pathname == "/pages/options.html"
+
restoreSettingsVersion = null
populateBackupLinkUrl = ->