From b184d2f94dc40f07e1c857348264c0e3dbfcde3a Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 16 Nov 2017 19:22:08 +0600
Subject: [PATCH 001/574] dirty initial port of chrome caretbrowser extension

---
 qutebrowser/browser/webengine/webenginetab.py |    5 +-
 qutebrowser/javascript/axs_testing.js         | 2643 +++++++++++++++++
 qutebrowser/javascript/webengine_caret.js     | 2188 ++++++++++++++
 qutebrowser/keyinput/modeman.py               |    4 -
 4 files changed, 4835 insertions(+), 5 deletions(-)
 create mode 100644 qutebrowser/javascript/axs_testing.js
 create mode 100644 qutebrowser/javascript/webengine_caret.js

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 7339cd422..3a779f480 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -179,7 +179,8 @@ class WebEngineCaret(browsertab.AbstractCaret):
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_entered(self, mode):
-        pass
+        js_code = javascript.assemble('caret', 'setInitialCursor')
+        self._tab.run_js_async(js_code)
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_left(self):
@@ -547,6 +548,8 @@ class WebEngineTab(browsertab.AbstractTab):
             'window._qutebrowser = {};',
             utils.read_file('javascript/scroll.js'),
             utils.read_file('javascript/webelem.js'),
+            utils.read_file('javascript/webengine_caret.js'),
+            utils.read_file('javascript/axs_testing.js'),
         ])
         script = QWebEngineScript()
         script.setInjectionPoint(QWebEngineScript.DocumentCreation)
diff --git a/qutebrowser/javascript/axs_testing.js b/qutebrowser/javascript/axs_testing.js
new file mode 100644
index 000000000..e6b1a3755
--- /dev/null
+++ b/qutebrowser/javascript/axs_testing.js
@@ -0,0 +1,2643 @@
+/*
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Generated from http://github.com/GoogleChrome/accessibility-developer-tools/tree/7d778f7da58af341a47b3a6f6457c2842b24d4d8
+ *
+ * See project README for build steps.
+ */
+
+// AUTO-GENERATED CONTENT BELOW: DO NOT EDIT! See above for details.
+
+var fn = (function() {
+  var COMPILED = !0, goog = goog || {};
+goog.global = this;
+goog.isDef = function(a) {
+  return void 0 !== a;
+};
+goog.exportPath_ = function(a, b, c) {
+  a = a.split(".");
+  c = c || goog.global;
+  a[0] in c || !c.execScript || c.execScript("var " + a[0]);
+  for (var d;a.length && (d = a.shift());) {
+    !a.length && goog.isDef(b) ? c[d] = b : c = c[d] ? c[d] : c[d] = {};
+  }
+};
+goog.define = function(a, b) {
+  var c = b;
+  COMPILED || (goog.global.CLOSURE_UNCOMPILED_DEFINES && Object.prototype.hasOwnProperty.call(goog.global.CLOSURE_UNCOMPILED_DEFINES, a) ? c = goog.global.CLOSURE_UNCOMPILED_DEFINES[a] : goog.global.CLOSURE_DEFINES && Object.prototype.hasOwnProperty.call(goog.global.CLOSURE_DEFINES, a) && (c = goog.global.CLOSURE_DEFINES[a]));
+  goog.exportPath_(a, c);
+};
+goog.DEBUG = !0;
+goog.LOCALE = "en";
+goog.TRUSTED_SITE = !0;
+goog.STRICT_MODE_COMPATIBLE = !1;
+goog.DISALLOW_TEST_ONLY_CODE = COMPILED && !goog.DEBUG;
+goog.ENABLE_CHROME_APP_SAFE_SCRIPT_LOADING = !1;
+goog.provide = function(a) {
+  if (goog.isInModuleLoader_()) {
+    throw Error("goog.provide can not be used within a goog.module.");
+  }
+  if (!COMPILED && goog.isProvided_(a)) {
+    throw Error('Namespace "' + a + '" already declared.');
+  }
+  goog.constructNamespace_(a);
+};
+goog.constructNamespace_ = function(a, b) {
+  if (!COMPILED) {
+    delete goog.implicitNamespaces_[a];
+    for (var c = a;(c = c.substring(0, c.lastIndexOf("."))) && !goog.getObjectByName(c);) {
+      goog.implicitNamespaces_[c] = !0;
+    }
+  }
+  goog.exportPath_(a, b);
+};
+goog.VALID_MODULE_RE_ = /^[a-zA-Z_$][a-zA-Z0-9._$]*$/;
+goog.module = function(a) {
+  if (!goog.isString(a) || !a || -1 == a.search(goog.VALID_MODULE_RE_)) {
+    throw Error("Invalid module identifier");
+  }
+  if (!goog.isInModuleLoader_()) {
+    throw Error("Module " + a + " has been loaded incorrectly.");
+  }
+  if (goog.moduleLoaderState_.moduleName) {
+    throw Error("goog.module may only be called once per module.");
+  }
+  goog.moduleLoaderState_.moduleName = a;
+  if (!COMPILED) {
+    if (goog.isProvided_(a)) {
+      throw Error('Namespace "' + a + '" already declared.');
+    }
+    delete goog.implicitNamespaces_[a];
+  }
+};
+goog.module.get = function(a) {
+  return goog.module.getInternal_(a);
+};
+goog.module.getInternal_ = function(a) {
+  if (!COMPILED) {
+    return goog.isProvided_(a) ? a in goog.loadedModules_ ? goog.loadedModules_[a] : goog.getObjectByName(a) : null;
+  }
+};
+goog.moduleLoaderState_ = null;
+goog.isInModuleLoader_ = function() {
+  return null != goog.moduleLoaderState_;
+};
+goog.module.declareLegacyNamespace = function() {
+  if (!COMPILED && !goog.isInModuleLoader_()) {
+    throw Error("goog.module.declareLegacyNamespace must be called from within a goog.module");
+  }
+  if (!COMPILED && !goog.moduleLoaderState_.moduleName) {
+    throw Error("goog.module must be called prior to goog.module.declareLegacyNamespace.");
+  }
+  goog.moduleLoaderState_.declareLegacyNamespace = !0;
+};
+goog.setTestOnly = function(a) {
+  if (goog.DISALLOW_TEST_ONLY_CODE) {
+    throw a = a || "", Error("Importing test-only code into non-debug environment" + (a ? ": " + a : "."));
+  }
+};
+goog.forwardDeclare = function(a) {
+};
+COMPILED || (goog.isProvided_ = function(a) {
+  return a in goog.loadedModules_ || !goog.implicitNamespaces_[a] && goog.isDefAndNotNull(goog.getObjectByName(a));
+}, goog.implicitNamespaces_ = {"goog.module":!0});
+goog.getObjectByName = function(a, b) {
+  for (var c = a.split("."), d = b || goog.global, e;e = c.shift();) {
+    if (goog.isDefAndNotNull(d[e])) {
+      d = d[e];
+    } else {
+      return null;
+    }
+  }
+  return d;
+};
+goog.globalize = function(a, b) {
+  var c = b || goog.global, d;
+  for (d in a) {
+    c[d] = a[d];
+  }
+};
+goog.addDependency = function(a, b, c, d) {
+  if (goog.DEPENDENCIES_ENABLED) {
+    var e;
+    a = a.replace(/\\/g, "/");
+    var f = goog.dependencies_;
+    d && "boolean" !== typeof d || (d = d ? {module:"goog"} : {});
+    for (var g = 0;e = b[g];g++) {
+      f.nameToPath[e] = a, f.loadFlags[a] = d;
+    }
+    for (d = 0;b = c[d];d++) {
+      a in f.requires || (f.requires[a] = {}), f.requires[a][b] = !0;
+    }
+  }
+};
+goog.ENABLE_DEBUG_LOADER = !0;
+goog.logToConsole_ = function(a) {
+  goog.global.console && goog.global.console.error(a);
+};
+goog.require = function(a) {
+  if (!COMPILED) {
+    goog.ENABLE_DEBUG_LOADER && goog.IS_OLD_IE_ && goog.maybeProcessDeferredDep_(a);
+    if (goog.isProvided_(a)) {
+      return goog.isInModuleLoader_() ? goog.module.getInternal_(a) : null;
+    }
+    if (goog.ENABLE_DEBUG_LOADER) {
+      var b = goog.getPathFromDeps_(a);
+      if (b) {
+        return goog.writeScripts_(b), null;
+      }
+    }
+    a = "goog.require could not find: " + a;
+    goog.logToConsole_(a);
+    throw Error(a);
+  }
+};
+goog.basePath = "";
+goog.nullFunction = function() {
+};
+goog.abstractMethod = function() {
+  throw Error("unimplemented abstract method");
+};
+goog.addSingletonGetter = function(a) {
+  a.getInstance = function() {
+    if (a.instance_) {
+      return a.instance_;
+    }
+    goog.DEBUG && (goog.instantiatedSingletons_[goog.instantiatedSingletons_.length] = a);
+    return a.instance_ = new a;
+  };
+};
+goog.instantiatedSingletons_ = [];
+goog.LOAD_MODULE_USING_EVAL = !0;
+goog.SEAL_MODULE_EXPORTS = goog.DEBUG;
+goog.loadedModules_ = {};
+goog.DEPENDENCIES_ENABLED = !COMPILED && goog.ENABLE_DEBUG_LOADER;
+goog.ALWAYS_TRANSPILE = !1;
+goog.NEVER_TRANSPILE = !1;
+goog.DEPENDENCIES_ENABLED && (goog.dependencies_ = {loadFlags:{}, nameToPath:{}, requires:{}, visited:{}, written:{}, deferred:{}}, goog.inHtmlDocument_ = function() {
+  var a = goog.global.document;
+  return null != a && "write" in a;
+}, goog.findBasePath_ = function() {
+  if (goog.isDef(goog.global.CLOSURE_BASE_PATH)) {
+    goog.basePath = goog.global.CLOSURE_BASE_PATH;
+  } else {
+    if (goog.inHtmlDocument_()) {
+      for (var a = goog.global.document.getElementsByTagName("SCRIPT"), b = a.length - 1;0 <= b;--b) {
+        var c = a[b].src, d = c.lastIndexOf("?"), d = -1 == d ? c.length : d;
+        if ("base.js" == c.substr(d - 7, 7)) {
+          goog.basePath = c.substr(0, d - 7);
+          break;
+        }
+      }
+    }
+  }
+}, goog.importScript_ = function(a, b) {
+  (goog.global.CLOSURE_IMPORT_SCRIPT || goog.writeScriptTag_)(a, b) && (goog.dependencies_.written[a] = !0);
+}, goog.IS_OLD_IE_ = !(goog.global.atob || !goog.global.document || !goog.global.document.all), goog.importProcessedScript_ = function(a, b, c) {
+  goog.importScript_("", 'goog.retrieveAndExec_("' + a + '", ' + b + ", " + c + ");");
+}, goog.queuedModules_ = [], goog.wrapModule_ = function(a, b) {
+  return goog.LOAD_MODULE_USING_EVAL && goog.isDef(goog.global.JSON) ? "goog.loadModule(" + goog.global.JSON.stringify(b + "\n//# sourceURL=" + a + "\n") + ");" : 'goog.loadModule(function(exports) {"use strict";' + b + "\n;return exports});\n//# sourceURL=" + a + "\n";
+}, goog.loadQueuedModules_ = function() {
+  var a = goog.queuedModules_.length;
+  if (0 < a) {
+    var b = goog.queuedModules_;
+    goog.queuedModules_ = [];
+    for (var c = 0;c < a;c++) {
+      goog.maybeProcessDeferredPath_(b[c]);
+    }
+  }
+}, goog.maybeProcessDeferredDep_ = function(a) {
+  goog.isDeferredModule_(a) && goog.allDepsAreAvailable_(a) && (a = goog.getPathFromDeps_(a), goog.maybeProcessDeferredPath_(goog.basePath + a));
+}, goog.isDeferredModule_ = function(a) {
+  var b = (a = goog.getPathFromDeps_(a)) && goog.dependencies_.loadFlags[a] || {};
+  return a && ("goog" == b.module || goog.needsTranspile_(b.lang)) ? goog.basePath + a in goog.dependencies_.deferred : !1;
+}, goog.allDepsAreAvailable_ = function(a) {
+  if ((a = goog.getPathFromDeps_(a)) && a in goog.dependencies_.requires) {
+    for (var b in goog.dependencies_.requires[a]) {
+      if (!goog.isProvided_(b) && !goog.isDeferredModule_(b)) {
+        return !1;
+      }
+    }
+  }
+  return !0;
+}, goog.maybeProcessDeferredPath_ = function(a) {
+  if (a in goog.dependencies_.deferred) {
+    var b = goog.dependencies_.deferred[a];
+    delete goog.dependencies_.deferred[a];
+    goog.globalEval(b);
+  }
+}, goog.loadModuleFromUrl = function(a) {
+  goog.retrieveAndExec_(a, !0, !1);
+}, goog.loadModule = function(a) {
+  var b = goog.moduleLoaderState_;
+  try {
+    goog.moduleLoaderState_ = {moduleName:void 0, declareLegacyNamespace:!1};
+    var c;
+    if (goog.isFunction(a)) {
+      c = a.call(goog.global, {});
+    } else {
+      if (goog.isString(a)) {
+        c = goog.loadModuleFromSource_.call(goog.global, a);
+      } else {
+        throw Error("Invalid module definition");
+      }
+    }
+    var d = goog.moduleLoaderState_.moduleName;
+    if (!goog.isString(d) || !d) {
+      throw Error('Invalid module name "' + d + '"');
+    }
+    goog.moduleLoaderState_.declareLegacyNamespace ? goog.constructNamespace_(d, c) : goog.SEAL_MODULE_EXPORTS && Object.seal && Object.seal(c);
+    goog.loadedModules_[d] = c;
+  } finally {
+    goog.moduleLoaderState_ = b;
+  }
+}, goog.loadModuleFromSource_ = function(a) {
+  eval(a);
+  return {};
+}, goog.writeScriptSrcNode_ = function(a) {
+  goog.global.document.write('<script type="text/javascript" src="' + a + '">\x3c/script>');
+}, goog.appendScriptSrcNode_ = function(a) {
+  var b = goog.global.document, c = b.createElement("script");
+  c.type = "text/javascript";
+  c.src = a;
+  c.defer = !1;
+  c.async = !1;
+  b.head.appendChild(c);
+}, goog.writeScriptTag_ = function(a, b) {
+  if (goog.inHtmlDocument_()) {
+    var c = goog.global.document;
+    if (!goog.ENABLE_CHROME_APP_SAFE_SCRIPT_LOADING && "complete" == c.readyState) {
+      if (/\bdeps.js$/.test(a)) {
+        return !1;
+      }
+      throw Error('Cannot write "' + a + '" after document load');
+    }
+    if (void 0 === b) {
+      if (goog.IS_OLD_IE_) {
+        var d = " onreadystatechange='goog.onScriptLoad_(this, " + ++goog.lastNonModuleScriptIndex_ + ")' ";
+        c.write('<script type="text/javascript" src="' + a + '"' + d + ">\x3c/script>");
+      } else {
+        goog.ENABLE_CHROME_APP_SAFE_SCRIPT_LOADING ? goog.appendScriptSrcNode_(a) : goog.writeScriptSrcNode_(a);
+      }
+    } else {
+      c.write('<script type="text/javascript">' + b + "\x3c/script>");
+    }
+    return !0;
+  }
+  return !1;
+}, goog.needsTranspile_ = function(a) {
+  if (goog.ALWAYS_TRANSPILE) {
+    return !0;
+  }
+  if (goog.NEVER_TRANSPILE) {
+    return !1;
+  }
+  if (!goog.transpiledLanguages_) {
+    goog.transpiledLanguages_ = {es5:!0, es6:!0, "es6-impl":!0};
+    try {
+      goog.transpiledLanguages_.es5 = eval("[1,].length!=1"), eval('(()=>{"use strict";let a={};const X=class{constructor(){}x(z){return new Map([...arguments]).get(z[0])==3}};return new X().x([a,3])})()') && (goog.transpiledLanguages_["es6-impl"] = !1), eval('(()=>{"use strict";class X{constructor(){if(new.target!=String)throw 1;this.x=42}}let q=Reflect.construct(X,[],String);if(q.x!=42||!(q instanceof String))throw 1;for(const a of[2,3]){if(a==2)continue;function f(z={a}){let a=0;return z.a}{function f(){return 0;}}return f()==3}})()') && 
+      (goog.transpiledLanguages_.es6 = !1);
+    } catch (b) {
+    }
+  }
+  return !!goog.transpiledLanguages_[a];
+}, goog.transpiledLanguages_ = null, goog.lastNonModuleScriptIndex_ = 0, goog.onScriptLoad_ = function(a, b) {
+  "complete" == a.readyState && goog.lastNonModuleScriptIndex_ == b && goog.loadQueuedModules_();
+  return !0;
+}, goog.writeScripts_ = function(a) {
+  function b(a) {
+    if (!(a in e.written || a in e.visited)) {
+      e.visited[a] = !0;
+      if (a in e.requires) {
+        for (var f in e.requires[a]) {
+          if (!goog.isProvided_(f)) {
+            if (f in e.nameToPath) {
+              b(e.nameToPath[f]);
+            } else {
+              throw Error("Undefined nameToPath for " + f);
+            }
+          }
+        }
+      }
+      a in d || (d[a] = !0, c.push(a));
+    }
+  }
+  var c = [], d = {}, e = goog.dependencies_;
+  b(a);
+  for (a = 0;a < c.length;a++) {
+    var f = c[a];
+    goog.dependencies_.written[f] = !0;
+  }
+  var g = goog.moduleLoaderState_;
+  goog.moduleLoaderState_ = null;
+  for (a = 0;a < c.length;a++) {
+    if (f = c[a]) {
+      var h = e.loadFlags[f] || {}, k = goog.needsTranspile_(h.lang);
+      "goog" == h.module || k ? goog.importProcessedScript_(goog.basePath + f, "goog" == h.module, k) : goog.importScript_(goog.basePath + f);
+    } else {
+      throw goog.moduleLoaderState_ = g, Error("Undefined script input");
+    }
+  }
+  goog.moduleLoaderState_ = g;
+}, goog.getPathFromDeps_ = function(a) {
+  return a in goog.dependencies_.nameToPath ? goog.dependencies_.nameToPath[a] : null;
+}, goog.findBasePath_(), goog.global.CLOSURE_NO_DEPS || goog.importScript_(goog.basePath + "deps.js"));
+goog.normalizePath_ = function(a) {
+  a = a.split("/");
+  for (var b = 0;b < a.length;) {
+    "." == a[b] ? a.splice(b, 1) : b && ".." == a[b] && a[b - 1] && ".." != a[b - 1] ? a.splice(--b, 2) : b++;
+  }
+  return a.join("/");
+};
+goog.loadFileSync_ = function(a) {
+  if (goog.global.CLOSURE_LOAD_FILE_SYNC) {
+    return goog.global.CLOSURE_LOAD_FILE_SYNC(a);
+  }
+  try {
+    var b = new goog.global.XMLHttpRequest;
+    b.open("get", a, !1);
+    b.send();
+    return 0 == b.status || 200 == b.status ? b.responseText : null;
+  } catch (c) {
+    return null;
+  }
+};
+goog.retrieveAndExec_ = function(a, b, c) {
+  if (!COMPILED) {
+    var d = a;
+    a = goog.normalizePath_(a);
+    var e = goog.global.CLOSURE_IMPORT_SCRIPT || goog.writeScriptTag_, f = goog.loadFileSync_(a);
+    if (null == f) {
+      throw Error('Load of "' + a + '" failed');
+    }
+    c && (f = goog.transpile_.call(goog.global, f, a));
+    f = b ? goog.wrapModule_(a, f) : f + ("\n//# sourceURL=" + a);
+    goog.IS_OLD_IE_ ? (goog.dependencies_.deferred[d] = f, goog.queuedModules_.push(d)) : e(a, f);
+  }
+};
+goog.transpile_ = function(a, b) {
+  var c = goog.global.$jscomp;
+  c || (goog.global.$jscomp = c = {});
+  var d = c.transpile;
+  if (!d) {
+    var e = goog.basePath + "transpile.js", f = goog.loadFileSync_(e);
+    f && (eval(f + "\n//# sourceURL=" + e), c = goog.global.$jscomp, d = c.transpile);
+  }
+  d || (d = c.transpile = function(a, b) {
+    goog.logToConsole_(b + " requires transpilation but no transpiler was found.");
+    return a;
+  });
+  return d(a, b);
+};
+goog.typeOf = function(a) {
+  var b = typeof a;
+  if ("object" == b) {
+    if (a) {
+      if (a instanceof Array) {
+        return "array";
+      }
+      if (a instanceof Object) {
+        return b;
+      }
+      var c = Object.prototype.toString.call(a);
+      if ("[object Window]" == c) {
+        return "object";
+      }
+      if ("[object Array]" == c || "number" == typeof a.length && "undefined" != typeof a.splice && "undefined" != typeof a.propertyIsEnumerable && !a.propertyIsEnumerable("splice")) {
+        return "array";
+      }
+      if ("[object Function]" == c || "undefined" != typeof a.call && "undefined" != typeof a.propertyIsEnumerable && !a.propertyIsEnumerable("call")) {
+        return "function";
+      }
+    } else {
+      return "null";
+    }
+  } else {
+    if ("function" == b && "undefined" == typeof a.call) {
+      return "object";
+    }
+  }
+  return b;
+};
+goog.isNull = function(a) {
+  return null === a;
+};
+goog.isDefAndNotNull = function(a) {
+  return null != a;
+};
+goog.isArray = function(a) {
+  return "array" == goog.typeOf(a);
+};
+goog.isArrayLike = function(a) {
+  var b = goog.typeOf(a);
+  return "array" == b || "object" == b && "number" == typeof a.length;
+};
+goog.isDateLike = function(a) {
+  return goog.isObject(a) && "function" == typeof a.getFullYear;
+};
+goog.isString = function(a) {
+  return "string" == typeof a;
+};
+goog.isBoolean = function(a) {
+  return "boolean" == typeof a;
+};
+goog.isNumber = function(a) {
+  return "number" == typeof a;
+};
+goog.isFunction = function(a) {
+  return "function" == goog.typeOf(a);
+};
+goog.isObject = function(a) {
+  var b = typeof a;
+  return "object" == b && null != a || "function" == b;
+};
+goog.getUid = function(a) {
+  return a[goog.UID_PROPERTY_] || (a[goog.UID_PROPERTY_] = ++goog.uidCounter_);
+};
+goog.hasUid = function(a) {
+  return !!a[goog.UID_PROPERTY_];
+};
+goog.removeUid = function(a) {
+  null !== a && "removeAttribute" in a && a.removeAttribute(goog.UID_PROPERTY_);
+  try {
+    delete a[goog.UID_PROPERTY_];
+  } catch (b) {
+  }
+};
+goog.UID_PROPERTY_ = "closure_uid_" + (1E9 * Math.random() >>> 0);
+goog.uidCounter_ = 0;
+goog.getHashCode = goog.getUid;
+goog.removeHashCode = goog.removeUid;
+goog.cloneObject = function(a) {
+  var b = goog.typeOf(a);
+  if ("object" == b || "array" == b) {
+    if (a.clone) {
+      return a.clone();
+    }
+    var b = "array" == b ? [] : {}, c;
+    for (c in a) {
+      b[c] = goog.cloneObject(a[c]);
+    }
+    return b;
+  }
+  return a;
+};
+goog.bindNative_ = function(a, b, c) {
+  return a.call.apply(a.bind, arguments);
+};
+goog.bindJs_ = function(a, b, c) {
+  if (!a) {
+    throw Error();
+  }
+  if (2 < arguments.length) {
+    var d = Array.prototype.slice.call(arguments, 2);
+    return function() {
+      var c = Array.prototype.slice.call(arguments);
+      Array.prototype.unshift.apply(c, d);
+      return a.apply(b, c);
+    };
+  }
+  return function() {
+    return a.apply(b, arguments);
+  };
+};
+goog.bind = function(a, b, c) {
+  Function.prototype.bind && -1 != Function.prototype.bind.toString().indexOf("native code") ? goog.bind = goog.bindNative_ : goog.bind = goog.bindJs_;
+  return goog.bind.apply(null, arguments);
+};
+goog.partial = function(a, b) {
+  var c = Array.prototype.slice.call(arguments, 1);
+  return function() {
+    var b = c.slice();
+    b.push.apply(b, arguments);
+    return a.apply(this, b);
+  };
+};
+goog.mixin = function(a, b) {
+  for (var c in b) {
+    a[c] = b[c];
+  }
+};
+goog.now = goog.TRUSTED_SITE && Date.now || function() {
+  return +new Date;
+};
+goog.globalEval = function(a) {
+  if (goog.global.execScript) {
+    goog.global.execScript(a, "JavaScript");
+  } else {
+    if (goog.global.eval) {
+      if (null == goog.evalWorksForGlobals_) {
+        if (goog.global.eval("var _evalTest_ = 1;"), "undefined" != typeof goog.global._evalTest_) {
+          try {
+            delete goog.global._evalTest_;
+          } catch (d) {
+          }
+          goog.evalWorksForGlobals_ = !0;
+        } else {
+          goog.evalWorksForGlobals_ = !1;
+        }
+      }
+      if (goog.evalWorksForGlobals_) {
+        goog.global.eval(a);
+      } else {
+        var b = goog.global.document, c = b.createElement("SCRIPT");
+        c.type = "text/javascript";
+        c.defer = !1;
+        c.appendChild(b.createTextNode(a));
+        b.body.appendChild(c);
+        b.body.removeChild(c);
+      }
+    } else {
+      throw Error("goog.globalEval not available");
+    }
+  }
+};
+goog.evalWorksForGlobals_ = null;
+goog.getCssName = function(a, b) {
+  var c = function(a) {
+    return goog.cssNameMapping_[a] || a;
+  }, d = function(a) {
+    a = a.split("-");
+    for (var b = [], d = 0;d < a.length;d++) {
+      b.push(c(a[d]));
+    }
+    return b.join("-");
+  }, d = goog.cssNameMapping_ ? "BY_WHOLE" == goog.cssNameMappingStyle_ ? c : d : function(a) {
+    return a;
+  };
+  return b ? a + "-" + d(b) : d(a);
+};
+goog.setCssNameMapping = function(a, b) {
+  goog.cssNameMapping_ = a;
+  goog.cssNameMappingStyle_ = b;
+};
+!COMPILED && goog.global.CLOSURE_CSS_NAME_MAPPING && (goog.cssNameMapping_ = goog.global.CLOSURE_CSS_NAME_MAPPING);
+goog.getMsg = function(a, b) {
+  b && (a = a.replace(/\{\$([^}]+)}/g, function(a, d) {
+    return null != b && d in b ? b[d] : a;
+  }));
+  return a;
+};
+goog.getMsgWithFallback = function(a, b) {
+  return a;
+};
+goog.exportSymbol = function(a, b, c) {
+  goog.exportPath_(a, b, c);
+};
+goog.exportProperty = function(a, b, c) {
+  a[b] = c;
+};
+goog.inherits = function(a, b) {
+  function c() {
+  }
+  c.prototype = b.prototype;
+  a.superClass_ = b.prototype;
+  a.prototype = new c;
+  a.prototype.constructor = a;
+  a.base = function(a, c, f) {
+    for (var g = Array(arguments.length - 2), h = 2;h < arguments.length;h++) {
+      g[h - 2] = arguments[h];
+    }
+    return b.prototype[c].apply(a, g);
+  };
+};
+goog.base = function(a, b, c) {
+  var d = arguments.callee.caller;
+  if (goog.STRICT_MODE_COMPATIBLE || goog.DEBUG && !d) {
+    throw Error("arguments.caller not defined.  goog.base() cannot be used with strict mode code. See http://www.ecma-international.org/ecma-262/5.1/#sec-C");
+  }
+  if (d.superClass_) {
+    for (var e = Array(arguments.length - 1), f = 1;f < arguments.length;f++) {
+      e[f - 1] = arguments[f];
+    }
+    return d.superClass_.constructor.apply(a, e);
+  }
+  e = Array(arguments.length - 2);
+  for (f = 2;f < arguments.length;f++) {
+    e[f - 2] = arguments[f];
+  }
+  for (var f = !1, g = a.constructor;g;g = g.superClass_ && g.superClass_.constructor) {
+    if (g.prototype[b] === d) {
+      f = !0;
+    } else {
+      if (f) {
+        return g.prototype[b].apply(a, e);
+      }
+    }
+  }
+  if (a[b] === d) {
+    return a.constructor.prototype[b].apply(a, e);
+  }
+  throw Error("goog.base called from a method of one name to a method of a different name");
+};
+goog.scope = function(a) {
+  if (goog.isInModuleLoader_()) {
+    throw Error("goog.scope is not supported within a goog.module.");
+  }
+  a.call(goog.global);
+};
+COMPILED || (goog.global.COMPILED = COMPILED);
+goog.defineClass = function(a, b) {
+  var c = b.constructor, d = b.statics;
+  c && c != Object.prototype.constructor || (c = function() {
+    throw Error("cannot instantiate an interface (no constructor defined).");
+  });
+  c = goog.defineClass.createSealingConstructor_(c, a);
+  a && goog.inherits(c, a);
+  delete b.constructor;
+  delete b.statics;
+  goog.defineClass.applyProperties_(c.prototype, b);
+  null != d && (d instanceof Function ? d(c) : goog.defineClass.applyProperties_(c, d));
+  return c;
+};
+goog.defineClass.SEAL_CLASS_INSTANCES = goog.DEBUG;
+goog.defineClass.createSealingConstructor_ = function(a, b) {
+  if (!goog.defineClass.SEAL_CLASS_INSTANCES) {
+    return a;
+  }
+  var c = !goog.defineClass.isUnsealable_(b), d = function() {
+    var b = a.apply(this, arguments) || this;
+    b[goog.UID_PROPERTY_] = b[goog.UID_PROPERTY_];
+    this.constructor === d && c && Object.seal instanceof Function && Object.seal(b);
+    return b;
+  };
+  return d;
+};
+goog.defineClass.isUnsealable_ = function(a) {
+  return a && a.prototype && a.prototype[goog.UNSEALABLE_CONSTRUCTOR_PROPERTY_];
+};
+goog.defineClass.OBJECT_PROTOTYPE_FIELDS_ = "constructor hasOwnProperty isPrototypeOf propertyIsEnumerable toLocaleString toString valueOf".split(" ");
+goog.defineClass.applyProperties_ = function(a, b) {
+  for (var c in b) {
+    Object.prototype.hasOwnProperty.call(b, c) && (a[c] = b[c]);
+  }
+  for (var d = 0;d < goog.defineClass.OBJECT_PROTOTYPE_FIELDS_.length;d++) {
+    c = goog.defineClass.OBJECT_PROTOTYPE_FIELDS_[d], Object.prototype.hasOwnProperty.call(b, c) && (a[c] = b[c]);
+  }
+};
+goog.tagUnsealableClass = function(a) {
+  !COMPILED && goog.defineClass.SEAL_CLASS_INSTANCES && (a.prototype[goog.UNSEALABLE_CONSTRUCTOR_PROPERTY_] = !0);
+};
+goog.UNSEALABLE_CONSTRUCTOR_PROPERTY_ = "goog_defineClass_legacy_unsealable";
+var axs = {};
+axs.browserUtils = {};
+axs.browserUtils.matchSelector = function(a, b) {
+  return a.matches ? a.matches(b) : a.webkitMatchesSelector ? a.webkitMatchesSelector(b) : a.mozMatchesSelector ? a.mozMatchesSelector(b) : a.msMatchesSelector ? a.msMatchesSelector(b) : !1;
+};
+axs.constants = {};
+axs.constants.ARIA_ROLES = {alert:{namefrom:["author"], parent:["region"]}, alertdialog:{namefrom:["author"], namerequired:!0, parent:["alert", "dialog"]}, application:{namefrom:["author"], namerequired:!0, parent:["landmark"]}, article:{namefrom:["author"], parent:["document", "region"]}, banner:{namefrom:["author"], parent:["landmark"]}, button:{childpresentational:!0, namefrom:["contents", "author"], namerequired:!0, parent:["command"], properties:["aria-expanded", "aria-pressed"]}, checkbox:{namefrom:["contents", 
+"author"], namerequired:!0, parent:["input"], requiredProperties:["aria-checked"], properties:["aria-checked"]}, columnheader:{namefrom:["contents", "author"], namerequired:!0, parent:["gridcell", "sectionhead", "widget"], properties:["aria-sort"], scope:["row"]}, combobox:{mustcontain:["listbox", "textbox"], namefrom:["author"], namerequired:!0, parent:["select"], requiredProperties:["aria-expanded"], properties:["aria-expanded", "aria-autocomplete", "aria-required"]}, command:{"abstract":!0, namefrom:["author"], 
+parent:["widget"]}, complementary:{namefrom:["author"], parent:["landmark"]}, composite:{"abstract":!0, childpresentational:!1, namefrom:["author"], parent:["widget"], properties:["aria-activedescendant"]}, contentinfo:{namefrom:["author"], parent:["landmark"]}, definition:{namefrom:["author"], parent:["section"]}, dialog:{namefrom:["author"], namerequired:!0, parent:["window"]}, directory:{namefrom:["contents", "author"], parent:["list"]}, document:{namefrom:[" author"], namerequired:!0, parent:["structure"], 
+properties:["aria-expanded"]}, form:{namefrom:["author"], parent:["landmark"]}, grid:{mustcontain:["row", "rowgroup"], namefrom:["author"], namerequired:!0, parent:["composite", "region"], properties:["aria-level", "aria-multiselectable", "aria-readonly"]}, gridcell:{namefrom:["contents", "author"], namerequired:!0, parent:["section", "widget"], properties:["aria-readonly", "aria-required", "aria-selected"], scope:["row"]}, group:{namefrom:[" author"], parent:["section"], properties:["aria-activedescendant"]}, 
+heading:{namerequired:!0, parent:["sectionhead"], properties:["aria-level"]}, img:{childpresentational:!0, namefrom:["author"], namerequired:!0, parent:["section"]}, input:{"abstract":!0, namefrom:["author"], parent:["widget"]}, landmark:{"abstract":!0, namefrom:["contents", "author"], namerequired:!1, parent:["region"]}, link:{namefrom:["contents", "author"], namerequired:!0, parent:["command"], properties:["aria-expanded"]}, list:{mustcontain:["group", "listitem"], namefrom:["author"], parent:["region"]}, 
+listbox:{mustcontain:["option"], namefrom:["author"], namerequired:!0, parent:["list", "select"], properties:["aria-multiselectable", "aria-required"]}, listitem:{namefrom:["contents", "author"], namerequired:!0, parent:["section"], properties:["aria-level", "aria-posinset", "aria-setsize"], scope:["list"]}, log:{namefrom:[" author"], namerequired:!0, parent:["region"]}, main:{namefrom:["author"], parent:["landmark"]}, marquee:{namerequired:!0, parent:["section"]}, math:{childpresentational:!0, namefrom:["author"], 
+parent:["section"]}, menu:{mustcontain:["group", "menuitemradio", "menuitem", "menuitemcheckbox"], namefrom:["author"], namerequired:!0, parent:["list", "select"]}, menubar:{namefrom:["author"], parent:["menu"]}, menuitem:{namefrom:["contents", "author"], namerequired:!0, parent:["command"], scope:["menu", "menubar"]}, menuitemcheckbox:{namefrom:["contents", "author"], namerequired:!0, parent:["checkbox", "menuitem"], scope:["menu", "menubar"]}, menuitemradio:{namefrom:["contents", "author"], namerequired:!0, 
+parent:["menuitemcheckbox", "radio"], scope:["menu", "menubar"]}, navigation:{namefrom:["author"], parent:["landmark"]}, note:{namefrom:["author"], parent:["section"]}, option:{namefrom:["contents", "author"], namerequired:!0, parent:["input"], properties:["aria-checked", "aria-posinset", "aria-selected", "aria-setsize"]}, presentation:{parent:["structure"]}, progressbar:{childpresentational:!0, namefrom:["author"], namerequired:!0, parent:["range"]}, radio:{namefrom:["contents", "author"], namerequired:!0, 
+parent:["checkbox", "option"]}, radiogroup:{mustcontain:["radio"], namefrom:["author"], namerequired:!0, parent:["select"], properties:["aria-required"]}, range:{"abstract":!0, namefrom:["author"], parent:["widget"], properties:["aria-valuemax", "aria-valuemin", "aria-valuenow", "aria-valuetext"]}, region:{namefrom:[" author"], parent:["section"]}, roletype:{"abstract":!0, properties:"aria-atomic aria-busy aria-controls aria-describedby aria-disabled aria-dropeffect aria-flowto aria-grabbed aria-haspopup aria-hidden aria-invalid aria-label aria-labelledby aria-live aria-owns aria-relevant".split(" ")}, 
+row:{mustcontain:["columnheader", "gridcell", "rowheader"], namefrom:["contents", "author"], parent:["group", "widget"], properties:["aria-level", "aria-selected"], scope:["grid", "rowgroup", "treegrid"]}, rowgroup:{mustcontain:["row"], namefrom:["contents", "author"], parent:["group"], scope:["grid"]}, rowheader:{namefrom:["contents", "author"], namerequired:!0, parent:["gridcell", "sectionhead", "widget"], properties:["aria-sort"], scope:["row"]}, search:{namefrom:["author"], parent:["landmark"]}, 
+section:{"abstract":!0, namefrom:["contents", "author"], parent:["structure"], properties:["aria-expanded"]}, sectionhead:{"abstract":!0, namefrom:["contents", "author"], parent:["structure"], properties:["aria-expanded"]}, select:{"abstract":!0, namefrom:["author"], parent:["composite", "group", "input"]}, separator:{childpresentational:!0, namefrom:["author"], parent:["structure"], properties:["aria-expanded", "aria-orientation"]}, scrollbar:{childpresentational:!0, namefrom:["author"], namerequired:!1, 
+parent:["input", "range"], requiredProperties:["aria-controls", "aria-orientation", "aria-valuemax", "aria-valuemin", "aria-valuenow"], properties:["aria-controls", "aria-orientation", "aria-valuemax", "aria-valuemin", "aria-valuenow"]}, slider:{childpresentational:!0, namefrom:["author"], namerequired:!0, parent:["input", "range"], requiredProperties:["aria-valuemax", "aria-valuemin", "aria-valuenow"], properties:["aria-valuemax", "aria-valuemin", "aria-valuenow", "aria-orientation"]}, spinbutton:{namefrom:["author"], 
+namerequired:!0, parent:["input", "range"], requiredProperties:["aria-valuemax", "aria-valuemin", "aria-valuenow"], properties:["aria-valuemax", "aria-valuemin", "aria-valuenow", "aria-required"]}, status:{parent:["region"]}, structure:{"abstract":!0, parent:["roletype"]}, tab:{namefrom:["contents", "author"], parent:["sectionhead", "widget"], properties:["aria-selected"], scope:["tablist"]}, tablist:{mustcontain:["tab"], namefrom:["author"], parent:["composite", "directory"], properties:["aria-level"]}, 
+tabpanel:{namefrom:["author"], namerequired:!0, parent:["region"]}, textbox:{namefrom:["author"], namerequired:!0, parent:["input"], properties:["aria-activedescendant", "aria-autocomplete", "aria-multiline", "aria-readonly", "aria-required"]}, timer:{namefrom:["author"], namerequired:!0, parent:["status"]}, toolbar:{namefrom:["author"], parent:["group"]}, tooltip:{namerequired:!0, parent:["section"]}, tree:{mustcontain:["group", "treeitem"], namefrom:["author"], namerequired:!0, parent:["select"], 
+properties:["aria-multiselectable", "aria-required"]}, treegrid:{mustcontain:["row"], namefrom:["author"], namerequired:!0, parent:["grid", "tree"]}, treeitem:{namefrom:["contents", "author"], namerequired:!0, parent:["listitem", "option"], scope:["group", "tree"]}, widget:{"abstract":!0, parent:["roletype"]}, window:{"abstract":!0, namefrom:[" author"], parent:["roletype"], properties:["aria-expanded"]}};
+axs.constants.WIDGET_ROLES = {};
+axs.constants.addAllParentRolesToSet_ = function(a, b) {
+  if (a.parent) {
+    for (var c = a.parent, d = 0;d < c.length;d++) {
+      var e = c[d];
+      b[e] = !0;
+      axs.constants.addAllParentRolesToSet_(axs.constants.ARIA_ROLES[e], b);
+    }
+  }
+};
+axs.constants.addAllPropertiesToSet_ = function(a, b, c) {
+  var d = a[b];
+  if (d) {
+    for (var e = 0;e < d.length;e++) {
+      c[d[e]] = !0;
+    }
+  }
+  if (a.parent) {
+    for (a = a.parent, d = 0;d < a.length;d++) {
+      axs.constants.addAllPropertiesToSet_(axs.constants.ARIA_ROLES[a[d]], b, c);
+    }
+  }
+};
+for (var roleName in axs.constants.ARIA_ROLES) {
+  var role = axs.constants.ARIA_ROLES[roleName], propertiesSet = {};
+  axs.constants.addAllPropertiesToSet_(role, "properties", propertiesSet);
+  role.propertiesSet = propertiesSet;
+  var requiredPropertiesSet = {};
+  axs.constants.addAllPropertiesToSet_(role, "requiredProperties", requiredPropertiesSet);
+  role.requiredPropertiesSet = requiredPropertiesSet;
+  var parentRolesSet = {};
+  axs.constants.addAllParentRolesToSet_(role, parentRolesSet);
+  role.allParentRolesSet = parentRolesSet;
+  "widget" in parentRolesSet && (axs.constants.WIDGET_ROLES[roleName] = role);
+}
+axs.constants.ARIA_PROPERTIES = {activedescendant:{type:"property", valueType:"idref"}, atomic:{defaultValue:"false", type:"property", valueType:"boolean"}, autocomplete:{defaultValue:"none", type:"property", valueType:"token", values:["inline", "list", "both", "none"]}, busy:{defaultValue:"false", type:"state", valueType:"boolean"}, checked:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", "mixed", "undefined"]}, controls:{type:"property", valueType:"idref_list"}, 
+describedby:{type:"property", valueType:"idref_list"}, disabled:{defaultValue:"false", type:"state", valueType:"boolean"}, dropeffect:{defaultValue:"none", type:"property", valueType:"token_list", values:"copy move link execute popup none".split(" ")}, expanded:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", "undefined"]}, flowto:{type:"property", valueType:"idref_list"}, grabbed:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", 
+"undefined"]}, haspopup:{defaultValue:"false", type:"property", valueType:"boolean"}, hidden:{defaultValue:"false", type:"state", valueType:"boolean"}, invalid:{defaultValue:"false", type:"state", valueType:"token", values:["grammar", "false", "spelling", "true"]}, label:{type:"property", valueType:"string"}, labelledby:{type:"property", valueType:"idref_list"}, level:{type:"property", valueType:"integer"}, live:{defaultValue:"off", type:"property", valueType:"token", values:["off", "polite", "assertive"]}, 
+multiline:{defaultValue:"false", type:"property", valueType:"boolean"}, multiselectable:{defaultValue:"false", type:"property", valueType:"boolean"}, orientation:{defaultValue:"vertical", type:"property", valueType:"token", values:["horizontal", "vertical"]}, owns:{type:"property", valueType:"idref_list"}, posinset:{type:"property", valueType:"integer"}, pressed:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", "mixed", "undefined"]}, readonly:{defaultValue:"false", 
+type:"property", valueType:"boolean"}, relevant:{defaultValue:"additions text", type:"property", valueType:"token_list", values:["additions", "removals", "text", "all"]}, required:{defaultValue:"false", type:"property", valueType:"boolean"}, selected:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", "undefined"]}, setsize:{type:"property", valueType:"integer"}, sort:{defaultValue:"none", type:"property", valueType:"token", values:["ascending", "descending", "none", 
+"other"]}, valuemax:{type:"property", valueType:"decimal"}, valuemin:{type:"property", valueType:"decimal"}, valuenow:{type:"property", valueType:"decimal"}, valuetext:{type:"property", valueType:"string"}};
+(function() {
+  for (var a in axs.constants.ARIA_PROPERTIES) {
+    var b = axs.constants.ARIA_PROPERTIES[a];
+    if (b.values) {
+      for (var c = {}, d = 0;d < b.values.length;d++) {
+        c[b.values[d]] = !0;
+      }
+      b.valuesSet = c;
+    }
+  }
+})();
+axs.constants.GLOBAL_PROPERTIES = axs.constants.ARIA_ROLES.roletype.propertiesSet;
+axs.constants.NO_ROLE_NAME = " ";
+axs.constants.WIDGET_ROLE_TO_NAME = {alert:"aria_role_alert", alertdialog:"aria_role_alertdialog", button:"aria_role_button", checkbox:"aria_role_checkbox", columnheader:"aria_role_columnheader", combobox:"aria_role_combobox", dialog:"aria_role_dialog", grid:"aria_role_grid", gridcell:"aria_role_gridcell", link:"aria_role_link", listbox:"aria_role_listbox", log:"aria_role_log", marquee:"aria_role_marquee", menu:"aria_role_menu", menubar:"aria_role_menubar", menuitem:"aria_role_menuitem", menuitemcheckbox:"aria_role_menuitemcheckbox", 
+menuitemradio:"aria_role_menuitemradio", option:axs.constants.NO_ROLE_NAME, progressbar:"aria_role_progressbar", radio:"aria_role_radio", radiogroup:"aria_role_radiogroup", rowheader:"aria_role_rowheader", scrollbar:"aria_role_scrollbar", slider:"aria_role_slider", spinbutton:"aria_role_spinbutton", status:"aria_role_status", tab:"aria_role_tab", tabpanel:"aria_role_tabpanel", textbox:"aria_role_textbox", timer:"aria_role_timer", toolbar:"aria_role_toolbar", tooltip:"aria_role_tooltip", treeitem:"aria_role_treeitem"};
+axs.constants.STRUCTURE_ROLE_TO_NAME = {article:"aria_role_article", application:"aria_role_application", banner:"aria_role_banner", columnheader:"aria_role_columnheader", complementary:"aria_role_complementary", contentinfo:"aria_role_contentinfo", definition:"aria_role_definition", directory:"aria_role_directory", document:"aria_role_document", form:"aria_role_form", group:"aria_role_group", heading:"aria_role_heading", img:"aria_role_img", list:"aria_role_list", listitem:"aria_role_listitem", 
+main:"aria_role_main", math:"aria_role_math", navigation:"aria_role_navigation", note:"aria_role_note", region:"aria_role_region", rowheader:"aria_role_rowheader", search:"aria_role_search", separator:"aria_role_separator"};
+axs.constants.ATTRIBUTE_VALUE_TO_STATUS = [{name:"aria-autocomplete", values:{inline:"aria_autocomplete_inline", list:"aria_autocomplete_list", both:"aria_autocomplete_both"}}, {name:"aria-checked", values:{"true":"aria_checked_true", "false":"aria_checked_false", mixed:"aria_checked_mixed"}}, {name:"aria-disabled", values:{"true":"aria_disabled_true"}}, {name:"aria-expanded", values:{"true":"aria_expanded_true", "false":"aria_expanded_false"}}, {name:"aria-invalid", values:{"true":"aria_invalid_true", 
+grammar:"aria_invalid_grammar", spelling:"aria_invalid_spelling"}}, {name:"aria-multiline", values:{"true":"aria_multiline_true"}}, {name:"aria-multiselectable", values:{"true":"aria_multiselectable_true"}}, {name:"aria-pressed", values:{"true":"aria_pressed_true", "false":"aria_pressed_false", mixed:"aria_pressed_mixed"}}, {name:"aria-readonly", values:{"true":"aria_readonly_true"}}, {name:"aria-required", values:{"true":"aria_required_true"}}, {name:"aria-selected", values:{"true":"aria_selected_true", 
+"false":"aria_selected_false"}}];
+axs.constants.INPUT_TYPE_TO_INFORMATION_TABLE_MSG = {button:"input_type_button", checkbox:"input_type_checkbox", color:"input_type_color", datetime:"input_type_datetime", "datetime-local":"input_type_datetime_local", date:"input_type_date", email:"input_type_email", file:"input_type_file", image:"input_type_image", month:"input_type_month", number:"input_type_number", password:"input_type_password", radio:"input_type_radio", range:"input_type_range", reset:"input_type_reset", search:"input_type_search", 
+submit:"input_type_submit", tel:"input_type_tel", text:"input_type_text", url:"input_type_url", week:"input_type_week"};
+axs.constants.TAG_TO_INFORMATION_TABLE_VERBOSE_MSG = {A:"tag_link", BUTTON:"tag_button", H1:"tag_h1", H2:"tag_h2", H3:"tag_h3", H4:"tag_h4", H5:"tag_h5", H6:"tag_h6", LI:"tag_li", OL:"tag_ol", SELECT:"tag_select", TEXTAREA:"tag_textarea", UL:"tag_ul", SECTION:"tag_section", NAV:"tag_nav", ARTICLE:"tag_article", ASIDE:"tag_aside", HGROUP:"tag_hgroup", HEADER:"tag_header", FOOTER:"tag_footer", TIME:"tag_time", MARK:"tag_mark"};
+axs.constants.TAG_TO_INFORMATION_TABLE_BRIEF_MSG = {BUTTON:"tag_button", SELECT:"tag_select", TEXTAREA:"tag_textarea"};
+axs.constants.MIXED_VALUES = {"true":!0, "false":!0, mixed:!0};
+axs.constants.Severity = {INFO:"Info", WARNING:"Warning", SEVERE:"Severe"};
+axs.constants.AuditResult = {PASS:"PASS", FAIL:"FAIL", NA:"NA"};
+axs.constants.InlineElements = {TT:!0, I:!0, B:!0, BIG:!0, SMALL:!0, EM:!0, STRONG:!0, DFN:!0, CODE:!0, SAMP:!0, KBD:!0, VAR:!0, CITE:!0, ABBR:!0, ACRONYM:!0, A:!0, IMG:!0, OBJECT:!0, BR:!0, SCRIPT:!0, MAP:!0, Q:!0, SUB:!0, SUP:!0, SPAN:!0, BDO:!0, INPUT:!0, SELECT:!0, TEXTAREA:!0, LABEL:!0, BUTTON:!0};
+axs.constants.NATIVELY_DISABLEABLE = {BUTTON:!0, INPUT:!0, SELECT:!0, TEXTAREA:!0, FIELDSET:!0, OPTGROUP:!0, OPTION:!0};
+axs.constants.ARIA_TO_HTML_ATTRIBUTE = {"aria-checked":"checked", "aria-disabled":"disabled", "aria-hidden":"hidden", "aria-expanded":"open", "aria-valuemax":"max", "aria-valuemin":"min", "aria-readonly":"readonly", "aria-required":"required", "aria-selected":"selected", "aria-valuenow":"value"};
+axs.constants.TAG_TO_IMPLICIT_SEMANTIC_INFO = {A:[{role:"link", allowed:"button checkbox menuitem menuitemcheckbox menuitemradio tab treeitem".split(" "), selector:"a[href]"}], ADDRESS:[{role:"", allowed:["contentinfo", "presentation"]}], AREA:[{role:"link", selector:"area[href]"}], ARTICLE:[{role:"article", allowed:["presentation", "article", "document", "application", "main"]}], ASIDE:[{role:"complementary", allowed:["note", "complementary", "search", "presentation"]}], AUDIO:[{role:"", allowed:["application", 
+"presentation"]}], BASE:[{role:"", reserved:!0}], BODY:[{role:"document", allowed:["presentation"]}], BUTTON:[{role:"button", allowed:["link", "menuitem", "menuitemcheckbox", "menuitemradio", "radio"], selector:'button:not([aria-pressed]):not([type="menu"])'}, {role:"button", allowed:["button"], selector:"button[aria-pressed]"}, {role:"button", attributes:{"aria-haspopup":!0}, allowed:["link", "menuitem", "menuitemcheckbox", "menuitemradio", "radio"], selector:'button[type="menu"]'}], CAPTION:[{role:"", 
+allowed:["presentation"]}], COL:[{role:"", reserved:!0}], COLGROUP:[{role:"", reserved:!0}], DATALIST:[{role:"listbox", attributes:{"aria-multiselectable":!1}, allowed:["presentation"]}], DEL:[{role:"", allowed:["*"]}], DD:[{role:"", allowed:["presentation"]}], DT:[{role:"", allowed:["presentation"]}], DETAILS:[{role:"group", allowed:["group", "presentation"]}], DIALOG:[{role:"dialog", allowed:"dialog alert alertdialog application log marquee status".split(" "), selector:"dialog[open]"}, {role:"dialog", 
+attributes:{"aria-hidden":!0}, allowed:"dialog alert alertdialog application log marquee status".split(" "), selector:"dialog:not([open])"}], DIV:[{role:"", allowed:["*"]}], DL:[{role:"list", allowed:["presentation"]}], EMBED:[{role:"", allowed:["application", "document", "img", "presentation"]}], FIGURE:[{role:"", allowed:["*"]}], FOOTER:[{role:"", allowed:["contentinfo", "presentation"]}], FORM:[{role:"form", allowed:["presentation"]}], P:[{role:"", allowed:["*"]}], PRE:[{role:"", allowed:["*"]}], 
+BLOCKQUOTE:[{role:"", allowed:["*"]}], H1:[{role:"heading"}], H2:[{role:"heading"}], H3:[{role:"heading"}], H4:[{role:"heading"}], H5:[{role:"heading"}], H6:[{role:"heading"}], HEAD:[{role:"", reserved:!0}], HEADER:[{role:"", allowed:["banner", "presentation"]}], HR:[{role:"separator", allowed:["presentation"]}], HTML:[{role:"", reserved:!0}], IFRAME:[{role:"", allowed:["application", "document", "img", "presentation"], selector:"iframe:not([seamless])"}, {role:"", allowed:["application", "document", 
+"img", "presentation", "group"], selector:"iframe[seamless]"}], IMG:[{role:"presentation", reserved:!0, selector:'img[alt=""]'}, {role:"img", allowed:["*"], selector:'img[alt]:not([alt=""])'}], INPUT:[{role:"button", allowed:["link", "menuitem", "menuitemcheckbox", "menuitemradio", "radio"], selector:'input[type="button"]:not([aria-pressed])'}, {role:"button", allowed:["button"], selector:'input[type="button"][aria-pressed]'}, {role:"checkbox", allowed:["checkbox"], selector:'input[type="checkbox"]'}, 
+{role:"", selector:'input[type="color"]'}, {role:"", selector:'input[type="date"]'}, {role:"", selector:'input[type="datetime"]'}, {role:"textbox", selector:'input[type="email"]:not([list])'}, {role:"", selector:'input[type="file"]'}, {role:"", reserved:!0, selector:'input[type="hidden"]'}, {role:"button", allowed:["button"], selector:'input[type="image"][aria-pressed]'}, {role:"button", allowed:["link", "menuitem", "menuitemcheckbox", "menuitemradio", "radio"], selector:'input[type="image"]:not([aria-pressed])'}, 
+{role:"", selector:'input[type="month"]'}, {role:"", selector:'input[type="number"]'}, {role:"textbox", selector:'input[type="password"]'}, {role:"radio", allowed:["menuitemradio"], selector:'input[type="radio"]'}, {role:"slider", selector:'input[type="range"]'}, {role:"button", selector:'input[type="reset"]'}, {role:"combobox", selector:'input[type="search"][list]'}, {role:"textbox", selector:'input[type="search"]:not([list])'}, {role:"button", selector:'input[type="submit"]'}, {role:"combobox", 
+selector:'input[type="tel"][list]'}, {role:"textbox", selector:'input[type="tel"]:not([list])'}, {role:"combobox", selector:'input[type="text"][list]'}, {role:"textbox", selector:'input[type="text"]:not([list])'}, {role:"textbox", selector:"input:not([type])"}, {role:"", selector:'input[type="time"]'}, {role:"combobox", selector:'input[type="url"][list]'}, {role:"textbox", selector:'input[type="url"]:not([list])'}, {role:"", selector:'input[type="week"]'}], INS:[{role:"", allowed:["*"]}], KEYGEN:[{role:""}], 
+LABEL:[{role:"", allowed:["presentation"]}], LI:[{role:"listitem", allowed:"menuitem menuitemcheckbox menuitemradio option tab treeitem presentation".split(" "), selector:'ol:not([role="presentation"])>li, ul:not([role="presentation"])>li'}, {role:"listitem", allowed:"listitem menuitem menuitemcheckbox menuitemradio option tab treeitem presentation".split(" "), selector:'ol[role="presentation"]>li, ul[role="presentation"]>li'}], LINK:[{role:"link", reserved:!0, selector:"link[href]"}], MAIN:[{role:"", 
+allowed:["main", "presentation"]}], MAP:[{role:"", reserved:!0}], MATH:[{role:"", allowed:["presentation"]}], MENU:[{role:"toolbar", selector:'menu[type="toolbar"]'}], MENUITEM:[{role:"menuitem", selector:'menuitem[type="command"]'}, {role:"menuitemcheckbox", selector:'menuitem[type="checkbox"]'}, {role:"menuitemradio", selector:'menuitem[type="radio"]'}], META:[{role:"", reserved:!0}], METER:[{role:"progressbar", allowed:["presentation"]}], NAV:[{role:"navigation", allowed:["navigation", "presentation"]}], 
+NOSCRIPT:[{role:"", reserved:!0}], OBJECT:[{role:"", allowed:["application", "document", "img", "presentation"]}], OL:[{role:"list", allowed:"directory group listbox menu menubar tablist toolbar tree presentation".split(" ")}], OPTGROUP:[{role:"", allowed:["presentation"]}], OPTION:[{role:"option"}], OUTPUT:[{role:"status", allowed:["*"]}], PARAM:[{role:"", reserved:!0}], PICTURE:[{role:"", reserved:!0}], PROGRESS:[{role:"progressbar", allowed:["presentation"]}], SCRIPT:[{role:"", reserved:!0}], 
+SECTION:[{role:"region", allowed:"alert alertdialog application contentinfo dialog document log marquee search status presentation".split(" ")}], SELECT:[{role:"listbox"}], SOURCE:[{role:"", reserved:!0}], SPAN:[{role:"", allowed:["*"]}], STYLE:[{role:"", reserved:!0}], SVG:[{role:"", allowed:["application", "document", "img", "presentation"]}], SUMMARY:[{role:"", allowed:["presentation"]}], TABLE:[{role:"", allowed:["*"]}], TEMPLATE:[{role:"", reserved:!0}], TEXTAREA:[{role:"textbox"}], TBODY:[{role:"rowgroup", 
+allowed:["*"]}], THEAD:[{role:"rowgroup", allowed:["*"]}], TFOOT:[{role:"rowgroup", allowed:["*"]}], TITLE:[{role:"", reserved:!0}], TD:[{role:"", allowed:["*"]}], TH:[{role:"", allowed:["*"]}], TR:[{role:"", allowed:["*"]}], TRACK:[{role:"", reserved:!0}], UL:[{role:"list", allowed:"directory group listbox menu menubar tablist toolbar tree presentation".split(" ")}], VIDEO:[{role:"", allowed:["application", "presentation"]}]};
+axs.color = {};
+axs.color.Color = function(a, b, c, d) {
+  this.red = a;
+  this.green = b;
+  this.blue = c;
+  this.alpha = d;
+};
+axs.color.YCbCr = function(a) {
+  this.luma = this.z = a[0];
+  this.Cb = this.x = a[1];
+  this.Cr = this.y = a[2];
+};
+axs.color.YCbCr.prototype = {multiply:function(a) {
+  return new axs.color.YCbCr([this.luma * a, this.Cb * a, this.Cr * a]);
+}, add:function(a) {
+  return new axs.color.YCbCr([this.luma + a.luma, this.Cb + a.Cb, this.Cr + a.Cr]);
+}, subtract:function(a) {
+  return new axs.color.YCbCr([this.luma - a.luma, this.Cb - a.Cb, this.Cr - a.Cr]);
+}};
+axs.color.calculateContrastRatio = function(a, b) {
+  1 > a.alpha && (a = axs.color.flattenColors(a, b));
+  var c = axs.color.calculateLuminance(a), d = axs.color.calculateLuminance(b);
+  return (Math.max(c, d) + .05) / (Math.min(c, d) + .05);
+};
+axs.color.calculateLuminance = function(a) {
+  return axs.color.toYCbCr(a).luma;
+};
+axs.color.luminanceRatio = function(a, b) {
+  return (Math.max(a, b) + .05) / (Math.min(a, b) + .05);
+};
+axs.color.parseColor = function(a) {
+  if ("transparent" === a) {
+    return new axs.color.Color(0, 0, 0, 0);
+  }
+  var b = a.match(/^rgb\((\d+), (\d+), (\d+)\)$/);
+  if (b) {
+    a = parseInt(b[1], 10);
+    var c = parseInt(b[2], 10), d = parseInt(b[3], 10);
+    return new axs.color.Color(a, c, d, 1);
+  }
+  return (b = a.match(/^rgba\((\d+), (\d+), (\d+), (\d*(\.\d+)?)\)/)) ? (a = parseInt(b[1], 10), c = parseInt(b[2], 10), d = parseInt(b[3], 10), b = parseFloat(b[4]), new axs.color.Color(a, c, d, b)) : null;
+};
+axs.color.colorChannelToString = function(a) {
+  a = Math.round(a);
+  return 15 >= a ? "0" + a.toString(16) : a.toString(16);
+};
+axs.color.colorToString = function(a) {
+  return 1 == a.alpha ? "#" + axs.color.colorChannelToString(a.red) + axs.color.colorChannelToString(a.green) + axs.color.colorChannelToString(a.blue) : "rgba(" + [a.red, a.green, a.blue, a.alpha].join() + ")";
+};
+axs.color.luminanceFromContrastRatio = function(a, b, c) {
+  return c ? (a + .05) * b - .05 : (a + .05) / b - .05;
+};
+axs.color.translateColor = function(a, b) {
+  for (var c = b > a.luma ? axs.color.WHITE_YCC : axs.color.BLACK_YCC, d = c == axs.color.WHITE_YCC ? axs.color.YCC_CUBE_FACES_WHITE : axs.color.YCC_CUBE_FACES_BLACK, e = new axs.color.YCbCr([0, a.Cb, a.Cr]), f = new axs.color.YCbCr([1, a.Cb, a.Cr]), f = {a:e, b:f}, e = null, g = 0;g < d.length && !(e = axs.color.findIntersection(f, d[g]), 0 <= e.z && 1 >= e.z);g++) {
+  }
+  if (!e) {
+    throw "Couldn't find intersection with YCbCr color cube for Cb=" + a.Cb + ", Cr=" + a.Cr + ".";
+  }
+  if (e.x != a.x || e.y != a.y) {
+    throw "Intersection has wrong Cb/Cr values.";
+  }
+  if (Math.abs(c.luma - e.luma) < Math.abs(c.luma - b)) {
+    return c = [b, a.Cb, a.Cr], axs.color.fromYCbCrArray(c);
+  }
+  c = (b - e.luma) / (c.luma - e.luma);
+  c = [b, e.Cb - e.Cb * c, e.Cr - e.Cr * c];
+  return axs.color.fromYCbCrArray(c);
+};
+axs.color.suggestColors = function(a, b, c) {
+  var d = {}, e = axs.color.calculateLuminance(a), f = axs.color.calculateLuminance(b), g = f > e, h = axs.color.toYCbCr(b), k = axs.color.toYCbCr(a), m;
+  for (m in c) {
+    var l = c[m], n = axs.color.luminanceFromContrastRatio(e, l + .02, g);
+    if (1 >= n && 0 <= n) {
+      var p = axs.color.translateColor(h, n), l = axs.color.calculateContrastRatio(p, a), n = {};
+      n.fg = axs.color.colorToString(p);
+      n.bg = axs.color.colorToString(a);
+      n.contrast = l.toFixed(2);
+      d[m] = n;
+    } else {
+      l = axs.color.luminanceFromContrastRatio(f, l + .02, !g), 1 >= l && 0 <= l && (p = axs.color.translateColor(k, l), l = axs.color.calculateContrastRatio(b, p), n = {}, n.bg = axs.color.colorToString(p), n.fg = axs.color.colorToString(b), n.contrast = l.toFixed(2), d[m] = n);
+    }
+  }
+  return d;
+};
+axs.color.flattenColors = function(a, b) {
+  var c = a.alpha;
+  return new axs.color.Color((1 - c) * b.red + c * a.red, (1 - c) * b.green + c * a.green, (1 - c) * b.blue + c * a.blue, a.alpha + b.alpha * (1 - a.alpha));
+};
+axs.color.multiplyMatrixVector = function(a, b) {
+  var c = b[0], d = b[1], e = b[2];
+  return [a[0][0] * c + a[0][1] * d + a[0][2] * e, a[1][0] * c + a[1][1] * d + a[1][2] * e, a[2][0] * c + a[2][1] * d + a[2][2] * e];
+};
+axs.color.toYCbCr = function(a) {
+  var b = a.red / 255, c = a.green / 255;
+  a = a.blue / 255;
+  return new axs.color.YCbCr(axs.color.multiplyMatrixVector(axs.color.YCC_MATRIX, [.03928 >= b ? b / 12.92 : Math.pow((b + .055) / 1.055, 2.4), .03928 >= c ? c / 12.92 : Math.pow((c + .055) / 1.055, 2.4), .03928 >= a ? a / 12.92 : Math.pow((a + .055) / 1.055, 2.4)]));
+};
+axs.color.fromYCbCr = function(a) {
+  return axs.color.fromYCbCrArray([a.luma, a.Cb, a.Cr]);
+};
+axs.color.fromYCbCrArray = function(a) {
+  var b = axs.color.multiplyMatrixVector(axs.color.INVERTED_YCC_MATRIX, a);
+  a = b[0];
+  var c = b[1], b = b[2];
+  return new axs.color.Color(Math.min(Math.max(Math.round(255 * (.00303949 >= a ? 12.92 * a : 1.055 * Math.pow(a, 1 / 2.4) - .055)), 0), 255), Math.min(Math.max(Math.round(255 * (.00303949 >= c ? 12.92 * c : 1.055 * Math.pow(c, 1 / 2.4) - .055)), 0), 255), Math.min(Math.max(Math.round(255 * (.00303949 >= b ? 12.92 * b : 1.055 * Math.pow(b, 1 / 2.4) - .055)), 0), 255), 1);
+};
+axs.color.RGBToYCbCrMatrix = function(a, b) {
+  return [[a, 1 - a - b, b], [-a / (2 - 2 * b), (a + b - 1) / (2 - 2 * b), (1 - b) / (2 - 2 * b)], [(1 - a) / (2 - 2 * a), (a + b - 1) / (2 - 2 * a), -b / (2 - 2 * a)]];
+};
+axs.color.invert3x3Matrix = function(a) {
+  var b = a[0][0], c = a[0][1], d = a[0][2], e = a[1][0], f = a[1][1], g = a[1][2], h = a[2][0], k = a[2][1];
+  a = a[2][2];
+  return axs.color.scalarMultiplyMatrix([[f * a - g * k, d * k - c * a, c * g - d * f], [g * h - e * a, b * a - d * h, d * e - b * g], [e * k - f * h, h * c - b * k, b * f - c * e]], 1 / (b * (f * a - g * k) - c * (a * e - g * h) + d * (e * k - f * h)));
+};
+axs.color.findIntersection = function(a, b) {
+  var c = [a.a.x - b.p0.x, a.a.y - b.p0.y, a.a.z - b.p0.z], d = axs.color.invert3x3Matrix([[a.a.x - a.b.x, b.p1.x - b.p0.x, b.p2.x - b.p0.x], [a.a.y - a.b.y, b.p1.y - b.p0.y, b.p2.y - b.p0.y], [a.a.z - a.b.z, b.p1.z - b.p0.z, b.p2.z - b.p0.z]]), c = axs.color.multiplyMatrixVector(d, c)[0];
+  return a.a.add(a.b.subtract(a.a).multiply(c));
+};
+axs.color.scalarMultiplyMatrix = function(a, b) {
+  for (var c = [], d = 0;3 > d;d++) {
+    c[d] = axs.color.scalarMultiplyVector(a[d], b);
+  }
+  return c;
+};
+axs.color.scalarMultiplyVector = function(a, b) {
+  for (var c = [], d = 0;d < a.length;d++) {
+    c[d] = a[d] * b;
+  }
+  return c;
+};
+axs.color.kR = .2126;
+axs.color.kB = .0722;
+axs.color.YCC_MATRIX = axs.color.RGBToYCbCrMatrix(axs.color.kR, axs.color.kB);
+axs.color.INVERTED_YCC_MATRIX = axs.color.invert3x3Matrix(axs.color.YCC_MATRIX);
+axs.color.BLACK = new axs.color.Color(0, 0, 0, 1);
+axs.color.BLACK_YCC = axs.color.toYCbCr(axs.color.BLACK);
+axs.color.WHITE = new axs.color.Color(255, 255, 255, 1);
+axs.color.WHITE_YCC = axs.color.toYCbCr(axs.color.WHITE);
+axs.color.RED = new axs.color.Color(255, 0, 0, 1);
+axs.color.RED_YCC = axs.color.toYCbCr(axs.color.RED);
+axs.color.GREEN = new axs.color.Color(0, 255, 0, 1);
+axs.color.GREEN_YCC = axs.color.toYCbCr(axs.color.GREEN);
+axs.color.BLUE = new axs.color.Color(0, 0, 255, 1);
+axs.color.BLUE_YCC = axs.color.toYCbCr(axs.color.BLUE);
+axs.color.CYAN = new axs.color.Color(0, 255, 255, 1);
+axs.color.CYAN_YCC = axs.color.toYCbCr(axs.color.CYAN);
+axs.color.MAGENTA = new axs.color.Color(255, 0, 255, 1);
+axs.color.MAGENTA_YCC = axs.color.toYCbCr(axs.color.MAGENTA);
+axs.color.YELLOW = new axs.color.Color(255, 255, 0, 1);
+axs.color.YELLOW_YCC = axs.color.toYCbCr(axs.color.YELLOW);
+axs.color.YCC_CUBE_FACES_BLACK = [{p0:axs.color.BLACK_YCC, p1:axs.color.RED_YCC, p2:axs.color.GREEN_YCC}, {p0:axs.color.BLACK_YCC, p1:axs.color.GREEN_YCC, p2:axs.color.BLUE_YCC}, {p0:axs.color.BLACK_YCC, p1:axs.color.BLUE_YCC, p2:axs.color.RED_YCC}];
+axs.color.YCC_CUBE_FACES_WHITE = [{p0:axs.color.WHITE_YCC, p1:axs.color.CYAN_YCC, p2:axs.color.MAGENTA_YCC}, {p0:axs.color.WHITE_YCC, p1:axs.color.MAGENTA_YCC, p2:axs.color.YELLOW_YCC}, {p0:axs.color.WHITE_YCC, p1:axs.color.YELLOW_YCC, p2:axs.color.CYAN_YCC}];
+axs.dom = {};
+axs.dom.parentElement = function(a) {
+  if (!a) {
+    return null;
+  }
+  a = axs.dom.composedParentNode(a);
+  if (!a) {
+    return null;
+  }
+  switch(a.nodeType) {
+    case Node.ELEMENT_NODE:
+      return a;
+    default:
+      return axs.dom.parentElement(a);
+  }
+};
+axs.dom.shadowHost = function(a) {
+  return "host" in a ? a.host : null;
+};
+axs.dom.composedParentNode = function(a) {
+  if (!a) {
+    return null;
+  }
+  if (a.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
+    return axs.dom.shadowHost(a);
+  }
+  var b = a.parentNode;
+  if (!b) {
+    return null;
+  }
+  if (b.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
+    return axs.dom.shadowHost(b);
+  }
+  if (!b.shadowRoot) {
+    return b;
+  }
+  a = a.getDestinationInsertionPoints();
+  return 0 < a.length ? axs.dom.composedParentNode(a[a.length - 1]) : null;
+};
+axs.dom.asElement = function(a) {
+  switch(a.nodeType) {
+    case Node.COMMENT_NODE:
+      break;
+    case Node.ELEMENT_NODE:
+      if ("script" == a.localName || "template" == a.localName) {
+        break;
+      }
+      return a;
+    case Node.DOCUMENT_FRAGMENT_NODE:
+      return a.host;
+    case Node.TEXT_NODE:
+      return axs.dom.parentElement(a);
+    default:
+      console.warn("Unhandled node type: ", a.nodeType);
+  }
+  return null;
+};
+axs.dom.composedTreeSearch = function(a, b, c, d, e) {
+  if (a === b) {
+    return !0;
+  }
+  if (a.nodeType == Node.ELEMENT_NODE) {
+    var f = a
+  }
+  var g = !1;
+  d = Object.create(d);
+  if (f) {
+    var h = f.localName;
+    d.collectIdRefs && (d.idrefs = axs.utils.getReferencedIds(f));
+    if (!d.disabled || "legend" === h && axs.browserUtils.matchSelector(f, "fieldset>legend:first-of-type")) {
+      d.disabled = axs.utils.isElementDisabled(f, !0);
+    }
+    d.hidden || (d.hidden = axs.utils.isElementHidden(f));
+    if (c.preorder && !c.preorder(f, d)) {
+      return g;
+    }
+    var k = f.shadowRoot || f.webkitShadowRoot;
+    if (k) {
+      return d.level++, g = axs.dom.composedTreeSearch(k, b, c, d, k), f && c.postorder && !g && c.postorder(f, d), g;
+    }
+    if ("content" == h) {
+      a = f.getDistributedNodes();
+      for (h = 0;h < a.length && !g;h++) {
+        g = axs.dom.composedTreeSearch(a[h], b, c, d, e);
+      }
+      c.postorder && !g && c.postorder.call(null, f, d);
+      return g;
+    }
+  }
+  for (a = a.firstChild;null != a && !g;) {
+    g = axs.dom.composedTreeSearch(a, b, c, d, e), a = a.nextSibling;
+  }
+  f && c.postorder && !g && c.postorder.call(null, f, d);
+  return g;
+};
+axs.utils = {};
+axs.utils.FOCUSABLE_ELEMENTS_SELECTOR = "input:not([type=hidden]):not([disabled]),select:not([disabled]),textarea:not([disabled]),button:not([disabled]),a[href],iframe,[tabindex]";
+axs.utils.LABELABLE_ELEMENTS_SELECTOR = "button,input:not([type=hidden]),keygen,meter,output,progress,select,textarea";
+axs.utils.elementIsTransparent = function(a) {
+  return "0" == a.style.opacity;
+};
+axs.utils.elementHasZeroArea = function(a) {
+  a = a.getBoundingClientRect();
+  var b = a.top - a.bottom;
+  return a.right - a.left && b ? !1 : !0;
+};
+axs.utils.elementIsOutsideScrollArea = function(a) {
+  for (var b = axs.dom.parentElement(a), c = a.ownerDocument.defaultView;b != c.document.body;) {
+    if (axs.utils.isClippedBy(a, b)) {
+      return !0;
+    }
+    if (axs.utils.canScrollTo(a, b) && !axs.utils.elementIsOutsideScrollArea(b)) {
+      return !1;
+    }
+    b = axs.dom.parentElement(b);
+  }
+  return !axs.utils.canScrollTo(a, c.document.body);
+};
+axs.utils.canScrollTo = function(a, b) {
+  var c = a.getBoundingClientRect(), d = b.getBoundingClientRect();
+  if (b == b.ownerDocument.body) {
+    var e = d.top, f = d.left
+  } else {
+    e = d.top - b.scrollTop, f = d.left - b.scrollLeft;
+  }
+  var g = e + b.scrollHeight, h = f + b.scrollWidth;
+  if (c.right < f || c.bottom < e || c.left > h || c.top > g) {
+    return !1;
+  }
+  e = a.ownerDocument.defaultView;
+  f = e.getComputedStyle(b);
+  return c.left > d.right || c.top > d.bottom ? "scroll" == f.overflow || "auto" == f.overflow || b instanceof e.HTMLBodyElement : !0;
+};
+axs.utils.isClippedBy = function(a, b) {
+  var c = a.getBoundingClientRect(), d = b.getBoundingClientRect(), e = d.top - b.scrollTop, f = d.left - b.scrollLeft, g = a.ownerDocument.defaultView.getComputedStyle(b);
+  return (c.right < d.left || c.bottom < d.top || c.left > d.right || c.top > d.bottom) && "hidden" == g.overflow ? !0 : c.right < f || c.bottom < e ? "visible" != g.overflow : !1;
+};
+axs.utils.isAncestor = function(a, b) {
+  if (null == b) {
+    return !1;
+  }
+  if (b === a) {
+    return !0;
+  }
+  var c = axs.dom.composedParentNode(b);
+  return axs.utils.isAncestor(a, c);
+};
+axs.utils.overlappingElements = function(a) {
+  if (axs.utils.elementHasZeroArea(a)) {
+    return null;
+  }
+  for (var b = [], c = a.getClientRects(), d = 0;d < c.length;d++) {
+    var e = c[d], e = document.elementFromPoint((e.left + e.right) / 2, (e.top + e.bottom) / 2);
+    if (null != e && e != a && !axs.utils.isAncestor(e, a) && !axs.utils.isAncestor(a, e)) {
+      var f = window.getComputedStyle(e, null);
+      f && (f = axs.utils.getBgColor(f, e)) && 0 < f.alpha && 0 > b.indexOf(e) && b.push(e);
+    }
+  }
+  return b;
+};
+axs.utils.elementIsHtmlControl = function(a) {
+  var b = a.ownerDocument.defaultView;
+  return a instanceof b.HTMLButtonElement || a instanceof b.HTMLInputElement || a instanceof b.HTMLSelectElement || a instanceof b.HTMLTextAreaElement ? !0 : !1;
+};
+axs.utils.elementIsAriaWidget = function(a) {
+  return a.hasAttribute("role") && (a = a.getAttribute("role")) && (a = axs.constants.ARIA_ROLES[a]) && "widget" in a.allParentRolesSet ? !0 : !1;
+};
+axs.utils.elementIsVisible = function(a) {
+  return axs.utils.elementIsTransparent(a) || axs.utils.elementHasZeroArea(a) || axs.utils.elementIsOutsideScrollArea(a) || axs.utils.overlappingElements(a).length ? !1 : !0;
+};
+axs.utils.isLargeFont = function(a) {
+  var b = a.fontSize;
+  a = "bold" == a.fontWeight;
+  var c = b.match(/(\d+)px/);
+  if (c) {
+    b = parseInt(c[1], 10);
+    if (c = window.getComputedStyle(document.body, null).fontSize.match(/(\d+)px/)) {
+      var d = parseInt(c[1], 10), c = 1.2 * d, d = 1.5 * d
+    } else {
+      c = 19.2, d = 24;
+    }
+    return a && b >= c || b >= d;
+  }
+  if (c = b.match(/(\d+)em/)) {
+    return b = parseInt(c[1], 10), a && 1.2 <= b || 1.5 <= b ? !0 : !1;
+  }
+  if (c = b.match(/(\d+)%/)) {
+    return b = parseInt(c[1], 10), a && 120 <= b || 150 <= b ? !0 : !1;
+  }
+  if (c = b.match(/(\d+)pt/)) {
+    if (b = parseInt(c[1], 10), a && 14 <= b || 18 <= b) {
+      return !0;
+    }
+  }
+  return !1;
+};
+axs.utils.getBgColor = function(a, b) {
+  var c = axs.color.parseColor(a.backgroundColor);
+  if (!c) {
+    return null;
+  }
+  1 > a.opacity && (c.alpha *= a.opacity);
+  if (1 > c.alpha) {
+    var d = axs.utils.getParentBgColor(b);
+    if (null == d) {
+      return null;
+    }
+    c = axs.color.flattenColors(c, d);
+  }
+  return c;
+};
+axs.utils.getParentBgColor = function(a) {
+  var b = a;
+  a = [];
+  for (var c = null;b = axs.dom.parentElement(b);) {
+    var d = window.getComputedStyle(b, null);
+    if (d) {
+      var e = axs.color.parseColor(d.backgroundColor);
+      if (e && (1 > d.opacity && (e.alpha *= d.opacity), 0 != e.alpha && (a.push(e), 1 == e.alpha))) {
+        c = !0;
+        break;
+      }
+    }
+  }
+  c || a.push(new axs.color.Color(255, 255, 255, 1));
+  for (b = a.pop();a.length;) {
+    c = a.pop(), b = axs.color.flattenColors(c, b);
+  }
+  return b;
+};
+axs.utils.getFgColor = function(a, b, c) {
+  var d = axs.color.parseColor(a.color);
+  if (!d) {
+    return null;
+  }
+  1 > d.alpha && (d = axs.color.flattenColors(d, c));
+  1 > a.opacity && (b = axs.utils.getParentBgColor(b), d.alpha *= a.opacity, d = axs.color.flattenColors(d, b));
+  return d;
+};
+axs.utils.getContrastRatioForElement = function(a) {
+  var b = window.getComputedStyle(a, null);
+  return axs.utils.getContrastRatioForElementWithComputedStyle(b, a);
+};
+axs.utils.getContrastRatioForElementWithComputedStyle = function(a, b) {
+  if (axs.utils.isElementHidden(b)) {
+    return null;
+  }
+  var c = axs.utils.getBgColor(a, b);
+  if (!c) {
+    return null;
+  }
+  var d = axs.utils.getFgColor(a, b, c);
+  return d ? axs.color.calculateContrastRatio(d, c) : null;
+};
+axs.utils.isNativeTextElement = function(a) {
+  var b = a.tagName.toLowerCase();
+  a = a.type ? a.type.toLowerCase() : "";
+  if ("textarea" == b) {
+    return !0;
+  }
+  if ("input" != b) {
+    return !1;
+  }
+  switch(a) {
+    case "email":
+    ;
+    case "number":
+    ;
+    case "password":
+    ;
+    case "search":
+    ;
+    case "text":
+    ;
+    case "tel":
+    ;
+    case "url":
+    ;
+    case "":
+      return !0;
+    default:
+      return !1;
+  }
+};
+axs.utils.isLowContrast = function(a, b, c) {
+  a = Math.round(10 * a) / 10;
+  return c ? 4.5 > a || !axs.utils.isLargeFont(b) && 7 > a : 3 > a || !axs.utils.isLargeFont(b) && 4.5 > a;
+};
+axs.utils.hasLabel = function(a) {
+  var b = a.tagName.toLowerCase(), c = a.type ? a.type.toLowerCase() : "";
+  if (a.hasAttribute("aria-label") || a.hasAttribute("title") || "img" == b && a.hasAttribute("alt") || "input" == b && "image" == c && a.hasAttribute("alt") || "input" == b && ("submit" == c || "reset" == c) || a.hasAttribute("aria-labelledby") || a.hasAttribute("id") && 0 < document.querySelectorAll('label[for="' + a.id + '"]').length) {
+    return !0;
+  }
+  for (b = axs.dom.parentElement(a);b;) {
+    if ("label" == b.tagName.toLowerCase() && b.control == a) {
+      return !0;
+    }
+    b = axs.dom.parentElement(b);
+  }
+  return !1;
+};
+axs.utils.isNativelyDisableable = function(a) {
+  return a.tagName.toUpperCase() in axs.constants.NATIVELY_DISABLEABLE;
+};
+axs.utils.isElementDisabled = function(a, b) {
+  if (axs.browserUtils.matchSelector(a, b ? "[aria-disabled=true]" : "[aria-disabled=true], [aria-disabled=true] *")) {
+    return !0;
+  }
+  if (!axs.utils.isNativelyDisableable(a) || axs.browserUtils.matchSelector(a, "fieldset>legend:first-of-type *")) {
+    return !1;
+  }
+  for (var c = a;null !== c;c = axs.dom.parentElement(c)) {
+    if (c.hasAttribute("disabled")) {
+      return !0;
+    }
+    if (b) {
+      break;
+    }
+  }
+  return !1;
+};
+axs.utils.isElementHidden = function(a) {
+  if (!(a instanceof a.ownerDocument.defaultView.HTMLElement)) {
+    return !1;
+  }
+  if (a.hasAttribute("chromevoxignoreariahidden")) {
+    var b = !0
+  }
+  var c = window.getComputedStyle(a, null);
+  return "none" == c.display || "hidden" == c.visibility ? !0 : a.hasAttribute("aria-hidden") && "true" == a.getAttribute("aria-hidden").toLowerCase() ? !b : !1;
+};
+axs.utils.isElementOrAncestorHidden = function(a) {
+  return axs.utils.isElementHidden(a) ? !0 : axs.dom.parentElement(a) ? axs.utils.isElementOrAncestorHidden(axs.dom.parentElement(a)) : !1;
+};
+axs.utils.isInlineElement = function(a) {
+  a = a.tagName.toUpperCase();
+  return axs.constants.InlineElements[a];
+};
+axs.utils.getRoles = function(a, b) {
+  if (!a || a.nodeType !== Node.ELEMENT_NODE || !a.hasAttribute("role") && !b) {
+    return null;
+  }
+  var c = a.getAttribute("role");
+  !c && b && (c = axs.properties.getImplicitRole(a));
+  if (!c) {
+    return null;
+  }
+  for (var c = c.split(" "), d = {roles:[], valid:!1}, e = 0;e < c.length;e++) {
+    var f = c[e], g = axs.constants.ARIA_ROLES[f], f = {name:f};
+    g && !g["abstract"] ? (f.details = g, d.applied || (d.applied = f), f.valid = d.valid = !0) : f.valid = !1;
+    d.roles.push(f);
+  }
+  return d;
+};
+axs.utils.getAriaPropertyValue = function(a, b, c) {
+  var d = a.replace(/^aria-/, ""), e = axs.constants.ARIA_PROPERTIES[d], d = {name:a, rawValue:b};
+  if (!e) {
+    return d.valid = !1, d.reason = '"' + a + '" is not a valid ARIA property', d;
+  }
+  e = e.valueType;
+  if (!e) {
+    return d.valid = !1, d.reason = '"' + a + '" is not a valid ARIA property', d;
+  }
+  switch(e) {
+    case "idref":
+      a = axs.utils.isValidIDRefValue(b, c), d.valid = a.valid, d.reason = a.reason, d.idref = a.idref;
+    case "idref_list":
+      a = b.split(/\s+/);
+      d.valid = !0;
+      for (b = 0;b < a.length;b++) {
+        e = axs.utils.isValidIDRefValue(a[b], c), e.valid || (d.valid = !1), d.values ? d.values.push(e) : d.values = [e];
+      }
+      return d;
+    case "integer":
+      c = axs.utils.isValidNumber(b);
+      if (!c.valid) {
+        return d.valid = !1, d.reason = c.reason, d;
+      }
+      Math.floor(c.value) !== c.value ? (d.valid = !1, d.reason = "" + b + " is not a whole integer") : (d.valid = !0, d.value = c.value);
+      return d;
+    case "decimal":
+    ;
+    case "number":
+      c = axs.utils.isValidNumber(b);
+      d.valid = c.valid;
+      if (!c.valid) {
+        return d.reason = c.reason, d;
+      }
+      d.value = c.value;
+      return d;
+    case "string":
+      return d.valid = !0, d.value = b, d;
+    case "token":
+      return c = axs.utils.isValidTokenValue(a, b.toLowerCase()), c.valid ? (d.valid = !0, d.value = c.value) : (d.valid = !1, d.value = b, d.reason = c.reason), d;
+    case "token_list":
+      e = b.split(/\s+/);
+      d.valid = !0;
+      for (b = 0;b < e.length;b++) {
+        c = axs.utils.isValidTokenValue(a, e[b].toLowerCase()), c.valid || (d.valid = !1, d.reason ? (d.reason = [d.reason], d.reason.push(c.reason)) : (d.reason = c.reason, d.possibleValues = c.possibleValues)), d.values ? d.values.push(c.value) : d.values = [c.value];
+      }
+      return d;
+    case "tristate":
+      return c = axs.utils.isPossibleValue(b.toLowerCase(), axs.constants.MIXED_VALUES, a), c.valid ? (d.valid = !0, d.value = c.value) : (d.valid = !1, d.value = b, d.reason = c.reason), d;
+    case "boolean":
+      return c = axs.utils.isValidBoolean(b), c.valid ? (d.valid = !0, d.value = c.value) : (d.valid = !1, d.value = b, d.reason = c.reason), d;
+  }
+  d.valid = !1;
+  d.reason = "Not a valid ARIA property";
+  return d;
+};
+axs.utils.isValidTokenValue = function(a, b) {
+  var c = a.replace(/^aria-/, "");
+  return axs.utils.isPossibleValue(b, axs.constants.ARIA_PROPERTIES[c].valuesSet, a);
+};
+axs.utils.isPossibleValue = function(a, b, c) {
+  return b[a] ? {valid:!0, value:a} : {valid:!1, value:a, reason:'"' + a + '" is not a valid value for ' + c, possibleValues:Object.keys(b)};
+};
+axs.utils.isValidBoolean = function(a) {
+  try {
+    var b = JSON.parse(a);
+  } catch (c) {
+    b = "";
+  }
+  return "boolean" != typeof b ? {valid:!1, value:a, reason:'"' + a + '" is not a true/false value'} : {valid:!0, value:b};
+};
+axs.utils.isValidIDRefValue = function(a, b) {
+  return 0 == a.length ? {valid:!0, idref:a} : b.ownerDocument.getElementById(a) ? {valid:!0, idref:a} : {valid:!1, idref:a, reason:'No element with ID "' + a + '"'};
+};
+axs.utils.isValidNumber = function(a) {
+  var b = {valid:!1, value:a, reason:'"' + a + '" is not a number'};
+  if (!a) {
+    return b;
+  }
+  if (/^0x/i.test(a)) {
+    return b.reason = '"' + a + '" is not a decimal number', b;
+  }
+  a *= 1;
+  return isFinite(a) ? {valid:!0, value:a} : b;
+};
+axs.utils.isElementImplicitlyFocusable = function(a) {
+  var b = a.ownerDocument.defaultView;
+  return a instanceof b.HTMLAnchorElement || a instanceof b.HTMLAreaElement ? a.hasAttribute("href") : a instanceof b.HTMLInputElement || a instanceof b.HTMLSelectElement || a instanceof b.HTMLTextAreaElement || a instanceof b.HTMLButtonElement || a instanceof b.HTMLIFrameElement ? !a.disabled : !1;
+};
+axs.utils.values = function(a) {
+  var b = [], c;
+  for (c in a) {
+    a.hasOwnProperty(c) && "function" != typeof a[c] && b.push(a[c]);
+  }
+  return b;
+};
+axs.utils.namedValues = function(a) {
+  var b = {}, c;
+  for (c in a) {
+    a.hasOwnProperty(c) && "function" != typeof a[c] && (b[c] = a[c]);
+  }
+  return b;
+};
+function escapeId(a) {
+  return a.replace(/[^a-zA-Z0-9_-]/g, function(a) {
+    return "\\" + a;
+  });
+}
+axs.utils.getQuerySelectorText = function(a) {
+  if (null == a || "HTML" == a.tagName) {
+    return "html";
+  }
+  if ("BODY" == a.tagName) {
+    return "body";
+  }
+  if (a.hasAttribute) {
+    if (a.id) {
+      return "#" + escapeId(a.id);
+    }
+    if (a.className) {
+      for (var b = "", c = 0;c < a.classList.length;c++) {
+        b += "." + a.classList[c];
+      }
+      var d = 0;
+      if (a.parentNode) {
+        for (c = 0;c < a.parentNode.children.length;c++) {
+          var e = a.parentNode.children[c];
+          axs.browserUtils.matchSelector(e, b) && d++;
+          if (e === a) {
+            break;
+          }
+        }
+      } else {
+        d = 1;
+      }
+      if (1 == d) {
+        return axs.utils.getQuerySelectorText(a.parentNode) + " > " + b;
+      }
+    }
+    if (a.parentNode) {
+      b = a.parentNode.children;
+      d = 1;
+      for (c = 0;b[c] !== a;) {
+        b[c].tagName == a.tagName && d++, c++;
+      }
+      c = "";
+      "BODY" != a.parentNode.tagName && (c = axs.utils.getQuerySelectorText(a.parentNode) + " > ");
+      return 1 == d ? c + a.tagName : c + a.tagName + ":nth-of-type(" + d + ")";
+    }
+  } else {
+    if (a.selectorText) {
+      return a.selectorText;
+    }
+  }
+  return "";
+};
+axs.utils.getAriaIdReferrers = function(a, b) {
+  var c = function(a) {
+    var b = axs.constants.ARIA_PROPERTIES[a];
+    if (b) {
+      if ("idref" === b.valueType) {
+        return "[aria-" + a + "='" + d + "']";
+      }
+      if ("idref_list" === b.valueType) {
+        return "[aria-" + a + "~='" + d + "']";
+      }
+    }
+    return "";
+  };
+  if (!a) {
+    return null;
+  }
+  var d = a.id;
+  if (!d) {
+    return null;
+  }
+  d = d.replace(/'/g, "\\'");
+  if (b) {
+    var e = b.replace(/^aria-/, ""), f = c(e);
+    if (f) {
+      return a.ownerDocument.querySelectorAll(f);
+    }
+  } else {
+    var g = [];
+    for (e in axs.constants.ARIA_PROPERTIES) {
+      (f = c(e)) && g.push(f);
+    }
+    return a.ownerDocument.querySelectorAll(g.join(","));
+  }
+  return null;
+};
+axs.utils.getHtmlIdReferrers = function(a) {
+  if (!a) {
+    return null;
+  }
+  var b = a.id;
+  if (!b) {
+    return null;
+  }
+  var b = b.replace(/'/g, "\\'"), c = "[contextmenu='{id}'] [itemref~='{id}'] button[form='{id}'] button[menu='{id}'] fieldset[form='{id}'] input[form='{id}'] input[list='{id}'] keygen[form='{id}'] label[for='{id}'] label[form='{id}'] menuitem[command='{id}'] object[form='{id}'] output[for~='{id}'] output[form='{id}'] select[form='{id}'] td[headers~='{id}'] textarea[form='{id}'] tr[headers~='{id}']".split(" ").map(function(a) {
+    return a.replace("{id}", b);
+  });
+  return a.ownerDocument.querySelectorAll(c.join(","));
+};
+axs.utils.getReferencedIds = function(a) {
+  for (var b = [], c = function(a) {
+    a && (0 < a.indexOf(" ") ? b = b.concat(f.value.split(" ")) : b.push(a));
+  }, d = 0;d < a.attributes.length;d++) {
+    var e = a.tagName.toLowerCase(), f = a.attributes[d];
+    if (f.specified) {
+      var g = f.name, h = g.match(/aria-(.+)/);
+      if (h) {
+        e = axs.constants.ARIA_PROPERTIES[h[1]], !e || "idref" !== e.valueType && "idref_list" !== e.valueType || c(f.value);
+      } else {
+        switch(g) {
+          case "contextmenu":
+          ;
+          case "itemref":
+            c(f.value);
+            break;
+          case "form":
+            "button" != e && "fieldset" != e && "input" != e && "keygen" != e && "label" != e && "object" != e && "output" != e && "select" != e && "textarea" != e || c(f.value);
+            break;
+          case "for":
+            "label" != e && "output" != e || c(f.value);
+            break;
+          case "menu":
+            "button" == e && c(f.value);
+            break;
+          case "list":
+            "input" == e && c(f.value);
+            break;
+          case "command":
+            "menuitem" == e && c(f.value);
+            break;
+          case "headers":
+            "td" != e && "tr" != e || c(f.value);
+        }
+      }
+    }
+  }
+  return b;
+};
+axs.utils.getIdReferrers = function(a) {
+  var b = [], c = axs.utils.getHtmlIdReferrers(a);
+  c && (b = b.concat(Array.prototype.slice.call(c)));
+  (c = axs.utils.getAriaIdReferrers(a)) && (b = b.concat(Array.prototype.slice.call(c)));
+  return b;
+};
+axs.utils.getIdReferents = function(a, b) {
+  var c = [], d = a.replace(/^aria-/, ""), d = axs.constants.ARIA_PROPERTIES[d];
+  if (!d || !b.hasAttribute(a)) {
+    return c;
+  }
+  d = d.valueType;
+  if ("idref_list" === d || "idref" === d) {
+    for (var d = b.ownerDocument, e = b.getAttribute(a), e = e.split(/\s+/), f = 0, g = e.length;f < g;f++) {
+      var h = d.getElementById(e[f]);
+      h && (c[c.length] = h);
+    }
+  }
+  return c;
+};
+axs.utils.getAriaPropertiesByValueType = function(a) {
+  var b = {}, c;
+  for (c in axs.constants.ARIA_PROPERTIES) {
+    var d = axs.constants.ARIA_PROPERTIES[c];
+    d && 0 <= a.indexOf(d.valueType) && (b[c] = d);
+  }
+  return b;
+};
+axs.utils.getSelectorForAriaProperties = function(a) {
+  a = Object.keys(a).map(function(a) {
+    return "[aria-" + a + "]";
+  });
+  a.sort();
+  return a.join(",");
+};
+axs.utils.findDescendantsWithRole = function(a, b) {
+  if (!a || !b) {
+    return [];
+  }
+  var c = axs.properties.getSelectorForRole(b);
+  if (c && (c = a.querySelectorAll(c))) {
+    c = Array.prototype.map.call(c, function(a) {
+      return a;
+    });
+  } else {
+    return [];
+  }
+  return c;
+};
+axs.properties = {};
+axs.properties.TEXT_CONTENT_XPATH = './/text()[normalize-space(.)!=""]/parent::*[name()!="script"]';
+axs.properties.getFocusProperties = function(a) {
+  var b = {}, c = a.getAttribute("tabindex");
+  void 0 != c ? b.tabindex = {value:c, valid:!0} : axs.utils.isElementImplicitlyFocusable(a) && (b.implicitlyFocusable = {value:!0, valid:!0});
+  if (0 == Object.keys(b).length) {
+    return null;
+  }
+  var d = axs.utils.elementIsTransparent(a), e = axs.utils.elementHasZeroArea(a), f = axs.utils.elementIsOutsideScrollArea(a), g = axs.utils.overlappingElements(a);
+  if (d || e || f || 0 < g.length) {
+    var c = axs.utils.isElementOrAncestorHidden(a), h = {value:!1, valid:c};
+    d && (h.transparent = !0);
+    e && (h.zeroArea = !0);
+    f && (h.outsideScrollArea = !0);
+    g && 0 < g.length && (h.overlappingElements = g);
+    d = {value:c, valid:c};
+    c && (d.reason = axs.properties.getHiddenReason(a));
+    h.hidden = d;
+    b.visible = h;
+  } else {
+    b.visible = {value:!0, valid:!0};
+  }
+  return b;
+};
+axs.properties.getHiddenReason = function(a) {
+  if (!(a && a instanceof a.ownerDocument.defaultView.HTMLElement)) {
+    return null;
+  }
+  if (a.hasAttribute("chromevoxignoreariahidden")) {
+    var b = !0
+  }
+  var c = window.getComputedStyle(a, null);
+  return "none" == c.display ? {property:"display: none", on:a} : "hidden" == c.visibility ? {property:"visibility: hidden", on:a} : a.hasAttribute("aria-hidden") && "true" == a.getAttribute("aria-hidden").toLowerCase() && !b ? {property:"aria-hidden", on:a} : axs.properties.getHiddenReason(axs.dom.parentElement(a));
+};
+axs.properties.getColorProperties = function(a) {
+  var b = {};
+  (a = axs.properties.getContrastRatioProperties(a)) && (b.contrastRatio = a);
+  return 0 == Object.keys(b).length ? null : b;
+};
+axs.properties.hasDirectTextDescendant = function(a) {
+  function b() {
+    for (var b = c.evaluate(axs.properties.TEXT_CONTENT_XPATH, a, null, XPathResult.ANY_TYPE, null), e = b.iterateNext();null != e;e = b.iterateNext()) {
+      if (e === a) {
+        return !0;
+      }
+    }
+    return !1;
+  }
+  var c;
+  c = a.nodeType == Node.DOCUMENT_NODE ? a : a.ownerDocument;
+  return c.evaluate ? b() : function() {
+    for (var b = c.createTreeWalker(a, NodeFilter.SHOW_TEXT, null, !1);b.nextNode();) {
+      var e = b.currentNode, f = e.parentNode.tagName.toLowerCase();
+      if (e.nodeValue.trim() && "script" !== f && a !== e) {
+        return !0;
+      }
+    }
+    return !1;
+  }();
+};
+axs.properties.getContrastRatioProperties = function(a) {
+  if (!axs.properties.hasDirectTextDescendant(a)) {
+    return null;
+  }
+  var b = {}, c = window.getComputedStyle(a, null), d = axs.utils.getBgColor(c, a);
+  if (!d) {
+    return null;
+  }
+  b.backgroundColor = axs.color.colorToString(d);
+  var e = axs.utils.getFgColor(c, a, d);
+  b.foregroundColor = axs.color.colorToString(e);
+  a = axs.utils.getContrastRatioForElementWithComputedStyle(c, a);
+  if (!a) {
+    return null;
+  }
+  b.value = a.toFixed(2);
+  axs.utils.isLowContrast(a, c) && (b.alert = !0);
+  var f = axs.utils.isLargeFont(c) ? 3 : 4.5, c = axs.utils.isLargeFont(c) ? 4.5 : 7, g = {};
+  f > a && (g.AA = f);
+  c > a && (g.AAA = c);
+  if (!Object.keys(g).length) {
+    return b;
+  }
+  (d = axs.color.suggestColors(d, e, g)) && Object.keys(d).length && (b.suggestedColors = d);
+  return b;
+};
+axs.properties.findTextAlternatives = function(a, b, c, d) {
+  var e = c || !1;
+  c = axs.dom.asElement(a);
+  if (!c || !d && axs.utils.isElementOrAncestorHidden(c)) {
+    return null;
+  }
+  if (a.nodeType == Node.TEXT_NODE) {
+    return c = {type:"text"}, c.text = a.textContent, c.lastWord = axs.properties.getLastWord(c.text), b.content = c, a.textContent;
+  }
+  a = null;
+  e || (a = axs.properties.getTextFromAriaLabelledby(c, b));
+  if (c.hasAttribute("aria-label")) {
+    var f = {type:"text"};
+    f.text = c.getAttribute("aria-label");
+    f.lastWord = axs.properties.getLastWord(f.text);
+    a ? f.unused = !0 : e && axs.utils.elementIsHtmlControl(c) || (a = f.text);
+    b.ariaLabel = f;
+  }
+  c.hasAttribute("role") && "presentation" == c.getAttribute("role") || (a = axs.properties.getTextFromHostLanguageAttributes(c, b, a, e));
+  e && axs.utils.elementIsHtmlControl(c) && (f = c.ownerDocument.defaultView, c instanceof f.HTMLInputElement && ("text" == c.type && c.value && 0 < c.value.length && (b.controlValue = {text:c.value}), "range" == c.type && (b.controlValue = {text:c.value})), c instanceof f.HTMLSelectElement && (b.controlValue = {text:c.value}), b.controlValue && (f = b.controlValue, a ? f.unused = !0 : a = f.text));
+  if (e && axs.utils.elementIsAriaWidget(c)) {
+    e = c.getAttribute("role");
+    "textbox" == e && c.textContent && 0 < c.textContent.length && (b.controlValue = {text:c.textContent});
+    if ("slider" == e || "spinbutton" == e) {
+      c.hasAttribute("aria-valuetext") ? b.controlValue = {text:c.getAttribute("aria-valuetext")} : c.hasAttribute("aria-valuenow") && (b.controlValue = {value:c.getAttribute("aria-valuenow"), text:"" + c.getAttribute("aria-valuenow")});
+    }
+    if ("menu" == e) {
+      for (var g = c.querySelectorAll("[role=menuitemcheckbox], [role=menuitemradio]"), f = [], h = 0;h < g.length;h++) {
+        "true" == g[h].getAttribute("aria-checked") && f.push(g[h]);
+      }
+      if (0 < f.length) {
+        g = "";
+        for (h = 0;h < f.length;h++) {
+          g += axs.properties.findTextAlternatives(f[h], {}, !0), h < f.length - 1 && (g += ", ");
+        }
+        b.controlValue = {text:g};
+      }
+    }
+    if ("combobox" == e || "select" == e) {
+      b.controlValue = {text:"TODO"};
+    }
+    b.controlValue && (f = b.controlValue, a ? f.unused = !0 : a = f.text);
+  }
+  f = !0;
+  c.hasAttribute("role") && (e = c.getAttribute("role"), (e = axs.constants.ARIA_ROLES[e]) && (!e.namefrom || 0 > e.namefrom.indexOf("contents")) && (f = !1));
+  (d = axs.properties.getTextFromDescendantContent(c, d)) && f && (e = {type:"text"}, e.text = d, e.lastWord = axs.properties.getLastWord(e.text), a ? e.unused = !0 : a = d, b.content = e);
+  c.hasAttribute("title") && (d = {type:"string", valid:!0}, d.text = c.getAttribute("title"), d.lastWord = axs.properties.getLastWord(d.lastWord), a ? d.unused = !0 : a = d.text, b.title = d);
+  return 0 == Object.keys(b).length && null == a ? null : a;
+};
+axs.properties.getTextFromDescendantContent = function(a, b) {
+  for (var c = a.childNodes, d = [], e = 0;e < c.length;e++) {
+    var f = axs.properties.findTextAlternatives(c[e], {}, !0, b);
+    f && d.push(f.trim());
+  }
+  if (d.length) {
+    c = "";
+    for (e = 0;e < d.length;e++) {
+      c = [c, d[e]].join(" ").trim();
+    }
+    return c;
+  }
+  return null;
+};
+axs.properties.getTextFromAriaLabelledby = function(a, b) {
+  var c = null;
+  if (!a.hasAttribute("aria-labelledby")) {
+    return c;
+  }
+  for (var d = a.getAttribute("aria-labelledby").split(/\s+/), e = {valid:!0}, f = [], g = [], h = 0;h < d.length;h++) {
+    var k = {type:"element"}, m = d[h];
+    k.value = m;
+    var l = document.getElementById(m);
+    l ? (k.valid = !0, k.text = axs.properties.findTextAlternatives(l, {}, !0, !0), k.lastWord = axs.properties.getLastWord(k.text), f.push(k.text), k.element = l) : (k.valid = !1, e.valid = !1, k.errorMessage = {messageKey:"noElementWithId", args:[m]});
+    g.push(k);
+  }
+  0 < g.length && (g[g.length - 1].last = !0, e.values = g, e.text = f.join(" "), e.lastWord = axs.properties.getLastWord(e.text), c = e.text, b.ariaLabelledby = e);
+  return c;
+};
+axs.properties.getTextFromHostLanguageAttributes = function(a, b, c, d) {
+  if (axs.browserUtils.matchSelector(a, "img") && a.hasAttribute("alt")) {
+    var e = {type:"string", valid:!0};
+    e.text = a.getAttribute("alt");
+    c ? e.unused = !0 : c = e.text;
+    b.alt = e;
+  }
+  if (axs.browserUtils.matchSelector(a, 'input:not([type="hidden"]):not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), video:not([disabled])') && !d) {
+    if (a.hasAttribute("id")) {
+      d = document.querySelectorAll('label[for="' + a.id + '"]');
+      for (var e = {}, f = [], g = [], h = 0;h < d.length;h++) {
+        var k = {type:"element"}, m = d[h], l = axs.properties.findTextAlternatives(m, {}, !0);
+        l && 0 < l.trim().length && (k.text = l.trim(), g.push(l.trim()));
+        k.element = m;
+        f.push(k);
+      }
+      0 < f.length && (f[f.length - 1].last = !0, e.values = f, e.text = g.join(" "), e.lastWord = axs.properties.getLastWord(e.text), c ? e.unused = !0 : c = e.text, b.labelFor = e);
+    }
+    d = axs.dom.parentElement(a);
+    for (e = {};d;) {
+      if ("label" == d.tagName.toLowerCase() && (f = d, f.control == a)) {
+        e.type = "element";
+        e.text = axs.properties.findTextAlternatives(f, {}, !0);
+        e.lastWord = axs.properties.getLastWord(e.text);
+        e.element = f;
+        break;
+      }
+      d = axs.dom.parentElement(d);
+    }
+    e.text && (c ? e.unused = !0 : c = e.text, b.labelWrapped = e);
+    axs.browserUtils.matchSelector(a, 'input[type="image"]') && a.hasAttribute("alt") && (e = {type:"string", valid:!0}, e.text = a.getAttribute("alt"), c ? e.unused = !0 : c = e.text, b.alt = e);
+    Object.keys(b).length || (b.noLabel = !0);
+  }
+  return c;
+};
+axs.properties.getLastWord = function(a) {
+  if (!a) {
+    return null;
+  }
+  var b = a.lastIndexOf(" ") + 1, c = a.length - 10;
+  return a.substring(b > c ? b : c);
+};
+axs.properties.getTextProperties = function(a) {
+  var b = {}, c = axs.properties.findTextAlternatives(a, b, !1, !0);
+  if (0 == Object.keys(b).length && ((a = axs.dom.asElement(a)) && axs.browserUtils.matchSelector(a, "img") && (b.alt = {valid:!1, errorMessage:"No alt value provided"}, a = a.src, "string" == typeof a && (c = a.split("/").pop(), b.filename = {text:c})), !c)) {
+    return null;
+  }
+  b.hasProperties = !!Object.keys(b).length;
+  b.computedText = c;
+  b.lastWord = axs.properties.getLastWord(c);
+  return b;
+};
+axs.properties.getAriaProperties = function(a) {
+  var b = {}, c = axs.properties.getGlobalAriaProperties(a), d;
+  for (d in axs.constants.ARIA_PROPERTIES) {
+    var e = "aria-" + d;
+    if (a.hasAttribute(e)) {
+      var f = a.getAttribute(e);
+      c[e] = axs.utils.getAriaPropertyValue(e, f, a);
+    }
+  }
+  0 < Object.keys(c).length && (b.properties = axs.utils.values(c));
+  f = axs.utils.getRoles(a);
+  if (!f) {
+    return Object.keys(b).length ? b : null;
+  }
+  b.roles = f;
+  if (!f.valid || !f.roles) {
+    return b;
+  }
+  for (var e = f.roles, g = 0;g < e.length;g++) {
+    var h = e[g];
+    if (h.details && h.details.propertiesSet) {
+      for (d in h.details.propertiesSet) {
+        d in c || (a.hasAttribute(d) ? (f = a.getAttribute(d), c[d] = axs.utils.getAriaPropertyValue(d, f, a), "values" in c[d] && (f = c[d].values, f[f.length - 1].isLast = !0)) : h.details.requiredPropertiesSet[d] && (c[d] = {name:d, valid:!1, reason:"Required property not set"}));
+      }
+    }
+  }
+  0 < Object.keys(c).length && (b.properties = axs.utils.values(c));
+  return 0 < Object.keys(b).length ? b : null;
+};
+axs.properties.getGlobalAriaProperties = function(a) {
+  var b = {}, c;
+  for (c in axs.constants.GLOBAL_PROPERTIES) {
+    if (a.hasAttribute(c)) {
+      var d = a.getAttribute(c);
+      b[c] = axs.utils.getAriaPropertyValue(c, d, a);
+    }
+  }
+  return b;
+};
+axs.properties.getVideoProperties = function(a) {
+  if (!axs.browserUtils.matchSelector(a, "video")) {
+    return null;
+  }
+  var b = {};
+  b.captionTracks = axs.properties.getTrackElements(a, "captions");
+  b.descriptionTracks = axs.properties.getTrackElements(a, "descriptions");
+  b.chapterTracks = axs.properties.getTrackElements(a, "chapters");
+  return b;
+};
+axs.properties.getTrackElements = function(a, b) {
+  var c = a.querySelectorAll("track[kind=" + b + "]"), d = {};
+  if (!c.length) {
+    return d.valid = !1, d.reason = {messageKey:"noTracksProvided", args:[[b]]}, d;
+  }
+  d.valid = !0;
+  for (var e = [], f = 0;f < c.length;f++) {
+    var g = {}, h = c[f].getAttribute("src"), k = c[f].getAttribute("srcLang"), m = c[f].getAttribute("label");
+    h ? (g.valid = !0, g.src = h) : (g.valid = !1, g.reason = {messageKey:"noSrcProvided"});
+    h = "";
+    m && (h += m, k && (h += " "));
+    k && (h += "(" + k + ")");
+    "" == h && (h = "[[object Object]]");
+    g.name = h;
+    e.push(g);
+  }
+  d.values = e;
+  return d;
+};
+axs.properties.getAllProperties = function(a) {
+  var b = axs.dom.asElement(a);
+  if (!b) {
+    return {};
+  }
+  var c = {};
+  c.ariaProperties = axs.properties.getAriaProperties(b);
+  c.colorProperties = axs.properties.getColorProperties(b);
+  c.focusProperties = axs.properties.getFocusProperties(b);
+  c.textProperties = axs.properties.getTextProperties(a);
+  c.videoProperties = axs.properties.getVideoProperties(b);
+  return c;
+};
+(function() {
+  function a(a) {
+    if (!a) {
+      return null;
+    }
+    var c = a.tagName;
+    if (!c) {
+      return null;
+    }
+    c = c.toUpperCase();
+    c = axs.constants.TAG_TO_IMPLICIT_SEMANTIC_INFO[c];
+    if (!c || !c.length) {
+      return null;
+    }
+    for (var d = null, e = 0, f = c.length;e < f;e++) {
+      var g = c[e];
+      if (g.selector) {
+        if (axs.browserUtils.matchSelector(a, g.selector)) {
+          return g;
+        }
+      } else {
+        d = g;
+      }
+    }
+    return d;
+  }
+  axs.properties.getImplicitRole = function(b) {
+    return (b = a(b)) ? b.role : "";
+  };
+  axs.properties.canTakeAriaAttributes = function(b) {
+    return (b = a(b)) ? !b.reserved : !0;
+  };
+})();
+axs.properties.getNativelySupportedAttributes = function(a) {
+  var b = [];
+  if (!a) {
+    return b;
+  }
+  a = a.cloneNode(!1);
+  for (var c = Object.keys(axs.constants.ARIA_TO_HTML_ATTRIBUTE), d = 0;d < c.length;d++) {
+    var e = c[d];
+    axs.constants.ARIA_TO_HTML_ATTRIBUTE[e] in a && (b[b.length] = e);
+  }
+  return b;
+};
+(function() {
+  var a = {};
+  axs.properties.getSelectorForRole = function(b) {
+    if (!b) {
+      return "";
+    }
+    if (a[b] && a.hasOwnProperty(b)) {
+      return a[b];
+    }
+    var c = ['[role="' + b + '"]'];
+    Object.keys(axs.constants.TAG_TO_IMPLICIT_SEMANTIC_INFO).forEach(function(a) {
+      var e = axs.constants.TAG_TO_IMPLICIT_SEMANTIC_INFO[a];
+      if (e && e.length) {
+        for (var f = 0;f < e.length;f++) {
+          var g = e[f];
+          if (g.role === b) {
+            if (g.selector) {
+              c[c.length] = g.selector;
+            } else {
+              c[c.length] = a;
+              break;
+            }
+          }
+        }
+      }
+    });
+    return a[b] = c.join(",");
+  };
+})();
+axs.AuditRule = function(a) {
+  for (var b = a.opt_requires || {}, c = !0, d = [], e = 0;e < axs.AuditRule.requiredFields.length;e++) {
+    var f = axs.AuditRule.requiredFields[e];
+    f in a || (c = !1, d.push(f));
+  }
+  if (!c) {
+    throw "Invalid spec; the following fields were not specified: " + d.join(", ") + "\n" + JSON.stringify(a);
+  }
+  this.name = a.name;
+  this.severity = a.severity;
+  this.relevantElementMatcher_ = a.relevantElementMatcher;
+  this.isRelevant_ = a.isRelevant || function(a, b) {
+    return !0;
+  };
+  this.test_ = a.test;
+  this.code = a.code;
+  this.heading = a.heading || "";
+  this.url = a.url || "";
+  this.requiresConsoleAPI = !!b.consoleAPI;
+  this.relevantElements = [];
+  this.relatedElements = [];
+  this.collectIdRefs = b.idRefs || !1;
+};
+axs.AuditRule.requiredFields = "name severity relevantElementMatcher test code heading".split(" ");
+axs.AuditRule.NOT_APPLICABLE = {result:axs.constants.AuditResult.NA};
+axs.AuditRule.prototype.addElement = function(a, b) {
+  a.push(b);
+};
+axs.AuditRule.prototype.collectMatchingElement = function(a, b) {
+  return this.relevantElementMatcher_(a, b) && b.inScope ? (this.relevantElements.push({element:a, flags:b}), !0) : !1;
+};
+axs.AuditRule.prototype.canRun = function(a) {
+  return this.disabled || !a.withConsoleApi && this.requiresConsoleAPI ? !1 : !0;
+};
+axs.AuditRule.Result = function(a, b) {
+  var c = axs.utils.namedValues(b);
+  c.severity = a.getSeverity(b.name) || c.severity;
+  this.rule = c;
+  this.maxResults = a.maxResults;
+  this.update(axs.constants.AuditResult.NA);
+};
+axs.AuditRule.Result.prototype.update = function(a, b) {
+  if (a === axs.constants.AuditResult.FAIL) {
+    var c = this.elements || (this.elements = []);
+    this.result = a;
+    this.maxResults && this.elements.length >= this.maxResults ? this.resultsTruncated = !0 : b && c.push(b);
+  } else {
+    a === axs.constants.AuditResult.PASS ? (this.elements || (this.elements = []), this.result !== axs.constants.AuditResult.FAIL && (this.result = a)) : this.result || (this.result = a);
+  }
+};
+axs.AuditRule.prototype.run = function(a) {
+  try {
+    for (var b = this._options || {}, c = new axs.AuditRule.Result(a, this), d;d = this.relevantElements.shift();) {
+      var e = d.element, f = d.flags;
+      this.isRelevant_(e, f) && (this.test_(e, f, b.config) ? c.update(axs.constants.AuditResult.FAIL, e) : c.update(axs.constants.AuditResult.PASS, e));
+    }
+    return c;
+  } finally {
+    this.relatedElements.length = 0;
+  }
+};
+axs.AuditRules = {};
+(function() {
+  var a = {}, b = {};
+  axs.AuditRules.specs = {};
+  axs.AuditRules.addRule = function(c) {
+    var d = new axs.AuditRule(c);
+    if (d.code in b) {
+      throw Error('Can not add audit rule with same code: "' + d.code + '"');
+    }
+    if (d.name in a) {
+      throw Error('Can not add audit rule with same name: "' + d.name + '"');
+    }
+    a[d.name] = b[d.code] = d;
+    axs.AuditRules.specs[c.name] = c;
+  };
+  axs.AuditRules.getRule = function(c) {
+    return a[c] || b[c] || null;
+  };
+  axs.AuditRules.getRules = function(b) {
+    var d = Object.keys(a);
+    return b ? d : d.map(function(a) {
+      return this.getRule(a);
+    }, axs.AuditRules);
+  };
+  axs.AuditRules.getActiveRules = function(a) {
+    var b;
+    b = a.auditRulesToRun && 0 < a.auditRulesToRun.length ? a.auditRulesToRun : axs.AuditRules.getRules(!0);
+    if (a.auditRulesToIgnore) {
+      for (var e = 0;e < a.auditRulesToIgnore.length;e++) {
+        var f = a.auditRulesToIgnore[e];
+        0 > b.indexOf(f) || b.splice(b.indexOf(f), 1);
+      }
+    }
+    return b.map(axs.AuditRules.getRule);
+  };
+})();
+axs.AuditResults = function() {
+  this.errors_ = [];
+  this.warnings_ = [];
+};
+goog.exportSymbol("axs.AuditResults", axs.AuditResults);
+axs.AuditResults.prototype.addError = function(a) {
+  "" != a && this.errors_.push(a);
+};
+goog.exportProperty(axs.AuditResults.prototype, "addError", axs.AuditResults.prototype.addError);
+axs.AuditResults.prototype.addWarning = function(a) {
+  "" != a && this.warnings_.push(a);
+};
+goog.exportProperty(axs.AuditResults.prototype, "addWarning", axs.AuditResults.prototype.addWarning);
+axs.AuditResults.prototype.numErrors = function() {
+  return this.errors_.length;
+};
+goog.exportProperty(axs.AuditResults.prototype, "numErrors", axs.AuditResults.prototype.numErrors);
+axs.AuditResults.prototype.numWarnings = function() {
+  return this.warnings_.length;
+};
+goog.exportProperty(axs.AuditResults.prototype, "numWarnings", axs.AuditResults.prototype.numWarnings);
+axs.AuditResults.prototype.getErrors = function() {
+  return this.errors_;
+};
+goog.exportProperty(axs.AuditResults.prototype, "getErrors", axs.AuditResults.prototype.getErrors);
+axs.AuditResults.prototype.getWarnings = function() {
+  return this.warnings_;
+};
+goog.exportProperty(axs.AuditResults.prototype, "getWarnings", axs.AuditResults.prototype.getWarnings);
+axs.AuditResults.prototype.toString = function() {
+  for (var a = "", b = 0;b < this.errors_.length;b++) {
+    0 == b && (a += "\nErrors:\n");
+    var c = this.errors_[b], a = a + (c + "\n\n");
+  }
+  for (b = 0;b < this.warnings_.length;b++) {
+    0 == b && (a += "\nWarnings:\n"), c = this.warnings_[b], a += c + "\n\n";
+  }
+  return a;
+};
+goog.exportProperty(axs.AuditResults.prototype, "toString", axs.AuditResults.prototype.toString);
+axs.Audit = {};
+axs.AuditConfiguration = function(a) {
+  null == a && (a = {});
+  this.rules_ = {};
+  this.maxResults = this.auditRulesToIgnore = this.auditRulesToRun = this.scope = null;
+  this.withConsoleApi = !1;
+  this.showUnsupportedRulesWarning = this.walkDom = !0;
+  for (var b in this) {
+    this.hasOwnProperty(b) && b in a && (this[b] = a[b]);
+  }
+  goog.exportProperty(this, "scope", this.scope);
+  goog.exportProperty(this, "auditRulesToRun", this.auditRulesToRun);
+  goog.exportProperty(this, "auditRulesToIgnore", this.auditRulesToIgnore);
+  goog.exportProperty(this, "withConsoleApi", this.withConsoleApi);
+  goog.exportProperty(this, "walkDom", this.walkDom);
+  goog.exportProperty(this, "showUnsupportedRulesWarning", this.showUnsupportedRulesWarning);
+};
+goog.exportSymbol("axs.AuditConfiguration", axs.AuditConfiguration);
+axs.AuditConfiguration.prototype = {ignoreSelectors:function(a, b) {
+  a in this.rules_ || (this.rules_[a] = {});
+  "ignore" in this.rules_[a] || (this.rules_[a].ignore = []);
+  Array.prototype.push.call(this.rules_[a].ignore, b);
+}, getIgnoreSelectors:function(a) {
+  return a in this.rules_ && "ignore" in this.rules_[a] ? this.rules_[a].ignore : [];
+}, setSeverity:function(a, b) {
+  a in this.rules_ || (this.rules_[a] = {});
+  this.rules_[a].severity = b;
+}, getSeverity:function(a) {
+  return a in this.rules_ && "severity" in this.rules_[a] ? this.rules_[a].severity : null;
+}, setRuleConfig:function(a, b) {
+  a in this.rules_ || (this.rules_[a] = {});
+  this.rules_[a].config = b;
+}, getRuleConfig:function(a) {
+  return a in this.rules_ && "config" in this.rules_[a] ? this.rules_[a].config : null;
+}};
+goog.exportProperty(axs.AuditConfiguration.prototype, "ignoreSelectors", axs.AuditConfiguration.prototype.ignoreSelectors);
+goog.exportProperty(axs.AuditConfiguration.prototype, "getIgnoreSelectors", axs.AuditConfiguration.prototype.getIgnoreSelectors);
+axs.Audit.unsupportedRulesWarningShown = !1;
+axs.Audit.getRulesCannotRun = function(a) {
+  return a.withConsoleApi ? [] : axs.AuditRules.getRules().filter(function(a) {
+    return a.requiresConsoleAPI;
+  }).map(function(a) {
+    return a.code;
+  });
+};
+axs.Audit.run = function(a) {
+  a = a || new axs.AuditConfiguration;
+  if (!axs.Audit.unsupportedRulesWarningShown && a.showUnsupportedRulesWarning) {
+    var b = axs.Audit.getRulesCannotRun(a);
+    0 < b.length && (console.warn("Some rules cannot be checked using the axs.Audit.run() method call. Use the Chrome plugin to check these rules: " + b.join(", ")), console.warn("To remove this message, pass an AuditConfiguration object to axs.Audit.run() and set configuration.showUnsupportedRulesWarning = false."));
+    axs.Audit.unsupportedRulesWarningShown = !0;
+  }
+  b = axs.AuditRules.getActiveRules(a);
+  a.collectIdRefs = b.some(function(a) {
+    return a.collectIdRefs;
+  });
+  a.scope || (a.scope = document.documentElement);
+  axs.Audit.collectMatchingElements(a, b);
+  for (var c = [], d = 0;d < b.length;d++) {
+    var e = b[d];
+    e.canRun(a) && c.push(e.run(a));
+  }
+  return c;
+};
+goog.exportSymbol("axs.Audit.run", axs.Audit.run);
+(function() {
+  function a(a, c) {
+    var d = a.getIgnoreSelectors(c.name);
+    if (0 < d.length || a.scope) {
+      this.ignoreSelectors = d;
+    }
+    if (d = a.getRuleConfig(c.name)) {
+      this.config = d;
+    }
+  }
+  axs.Audit.collectMatchingElements = function(b, c) {
+    axs.dom.composedTreeSearch(b.walkDom ? document.documentElement : b.scope, null, {preorder:function(d, e) {
+      e.inScope || (e.inScope = d === b.scope);
+      for (var f = 0;f < c.length;f++) {
+        var g = c[f];
+        g.canRun(b) && (g._options = new a(b, g), e.ignoring[g.name] || (e.ignoring[g.name] = g._options.shouldIgnore(d)) || g.collectMatchingElement(d, e));
+      }
+      return !0;
+    }}, {walkDom:b.walkDom, collectIdRefs:b.collectIdRefs, level:0, ignoring:{}, disabled:!1, hidden:!1});
+  };
+  a.prototype.shouldIgnore = function(a) {
+    var c = this.ignoreSelectors;
+    if (c) {
+      for (var d = 0;d < c.length;d++) {
+        if (axs.browserUtils.matchSelector(a, c[d])) {
+          return !0;
+        }
+      }
+    }
+    return !1;
+  };
+})();
+axs.Audit.auditResults = function(a) {
+  for (var b = new axs.AuditResults, c = 0;c < a.length;c++) {
+    var d = a[c];
+    d.result == axs.constants.AuditResult.FAIL && (d.rule.severity == axs.constants.Severity.SEVERE ? b.addError(axs.Audit.accessibilityErrorMessage(d)) : b.addWarning(axs.Audit.accessibilityErrorMessage(d)));
+  }
+  return b;
+};
+goog.exportSymbol("axs.Audit.auditResults", axs.Audit.auditResults);
+axs.Audit.createReport = function(a, b) {
+  var c;
+  c = "*** Begin accessibility audit results ***\nAn accessibility audit found " + axs.Audit.auditResults(a).toString();
+  b && (c = c + "\nFor more information, please see " + b);
+  return c + "\n*** End accessibility audit results ***";
+};
+goog.exportSymbol("axs.Audit.createReport", axs.Audit.createReport);
+axs.Audit.accessibilityErrorMessage = function(a) {
+  for (var b = a.rule.severity == axs.constants.Severity.SEVERE ? "Error: " : "Warning: ", b = b + (a.rule.code + " (" + a.rule.heading + ") failed on the following " + (1 == a.elements.length ? "element" : "elements")), b = 1 == a.elements.length ? b + ":" : b + (" (1 - " + Math.min(5, a.elements.length) + " of " + a.elements.length + "):"), c = Math.min(a.elements.length, 5), d = 0;d < c;d++) {
+    var e = a.elements[d], b = b + "\n";
+    try {
+      b += axs.utils.getQuerySelectorText(e);
+    } catch (f) {
+      b += " tagName:" + e.tagName, b += " id:" + e.id;
+    }
+  }
+  "" != a.rule.url && (b += "\nSee " + a.rule.url + " for more information.");
+  return b;
+};
+goog.exportSymbol("axs.Audit.accessibilityErrorMessage", axs.Audit.accessibilityErrorMessage);
+axs.AuditRules.addRule({name:"ariaOnReservedElement", heading:"This element does not support ARIA roles, states and properties", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_12", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return !axs.properties.canTakeAriaAttributes(a);
+}, test:function(a) {
+  return null !== axs.properties.getAriaProperties(a);
+}, code:"AX_ARIA_12"});
+axs.AuditRules.addRule({name:"ariaOwnsDescendant", heading:"aria-owns should not be used if ownership is implicit in the DOM", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_06", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "[aria-owns]");
+}, test:function(a) {
+  return axs.utils.getIdReferents("aria-owns", a).some(function(b) {
+    return a.compareDocumentPosition(b) & Node.DOCUMENT_POSITION_CONTAINED_BY;
+  });
+}, code:"AX_ARIA_06"});
+axs.AuditRules.addRule({name:"ariaRoleNotScoped", heading:"Elements with ARIA roles must be in the correct scope", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_09", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "[role]");
+}, test:function(a) {
+  var b = axs.utils.getRoles(a);
+  if (!b || !b.applied) {
+    return !1;
+  }
+  b = b.applied.details.scope;
+  if (!b || 0 === b.length) {
+    return !1;
+  }
+  for (var c = a;c = axs.dom.parentElement(c);) {
+    var d = axs.utils.getRoles(c, !0);
+    if (d && d.applied && 0 <= b.indexOf(d.applied.name)) {
+      return !1;
+    }
+  }
+  if (a = axs.utils.getAriaIdReferrers(a, "aria-owns")) {
+    for (c = 0;c < a.length;c++) {
+      if ((d = axs.utils.getRoles(a[c], !0)) && d.applied && 0 <= b.indexOf(d.applied.name)) {
+        return !1;
+      }
+    }
+  }
+  return !0;
+}, code:"AX_ARIA_09"});
+axs.AuditRules.addRule({name:"audioWithoutControls", heading:"Audio elements should have controls", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_audio_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "audio[autoplay]");
+}, test:function(a) {
+  return !a.querySelectorAll("[controls]").length && 3 < a.duration;
+}, code:"AX_AUDIO_01"});
+(function() {
+  var a = /^aria\-/;
+  axs.AuditRules.addRule({name:"badAriaAttribute", heading:"This element has an invalid ARIA attribute", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_11", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(b) {
+    b = b.attributes;
+    for (var c = 0, d = b.length;c < d;c++) {
+      if (a.test(b[c].name)) {
+        return !0;
+      }
+    }
+    return !1;
+  }, test:function(b) {
+    b = b.attributes;
+    for (var c = 0, d = b.length;c < d;c++) {
+      var e = b[c].name;
+      if (a.test(e) && (e = e.replace(a, ""), !axs.constants.ARIA_PROPERTIES.hasOwnProperty(e))) {
+        return !0;
+      }
+    }
+    return !1;
+  }, code:"AX_ARIA_11"});
+})();
+axs.AuditRules.addRule({name:"badAriaAttributeValue", heading:"ARIA state and property values must be valid", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_04", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+  var b = axs.utils.getSelectorForAriaProperties(axs.constants.ARIA_PROPERTIES);
+  return axs.browserUtils.matchSelector(a, b);
+}, test:function(a) {
+  for (var b in axs.constants.ARIA_PROPERTIES) {
+    var c = "aria-" + b;
+    if (a.hasAttribute(c)) {
+      var d = a.getAttribute(c);
+      if (!axs.utils.getAriaPropertyValue(c, d, a).valid) {
+        return !0;
+      }
+    }
+  }
+  return !1;
+}, code:"AX_ARIA_04"});
+axs.AuditRules.addRule({name:"badAriaRole", heading:"Elements with ARIA roles must use a valid, non-abstract ARIA role", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_01", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "[role]");
+}, test:function(a) {
+  return !axs.utils.getRoles(a).valid;
+}, code:"AX_ARIA_01"});
+axs.AuditRules.addRule({name:"controlsWithoutLabel", heading:"Controls and media elements should have labels", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_01", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+  if (!axs.browserUtils.matchSelector(a, 'input:not([type="hidden"]):not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), video:not([disabled])') || "presentation" == a.getAttribute("role")) {
+    return !1;
+  }
+  if (0 <= a.tabIndex) {
+    return !0;
+  }
+  for (a = axs.dom.parentElement(a);null != a;a = axs.dom.parentElement(a)) {
+    if (axs.utils.elementIsAriaWidget(a)) {
+      return !1;
+    }
+  }
+  return !0;
+}, test:function(a, b) {
+  if (b.hidden || "input" == a.tagName.toLowerCase() && "button" == a.type && a.value.length || "button" == a.tagName.toLowerCase() && a.textContent.replace(/^\s+|\s+$/g, "").length || axs.utils.hasLabel(a)) {
+    return !1;
+  }
+  var c = axs.properties.findTextAlternatives(a, {});
+  return null === c || "" === c.trim() ? !0 : !1;
+}, code:"AX_TEXT_01", ruleName:"Controls and media elements should have labels"});
+axs.AuditRules.addRule({name:"duplicateId", heading:"Any ID referred to via an IDREF must be unique in the DOM", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_html_02", severity:axs.constants.Severity.SEVERE, opt_requires:{idRefs:!0}, relevantElementMatcher:function(a, b) {
+  b.idrefs.length && !b.hidden && this.relatedElements.push({element:a, flags:b});
+  return a.hasAttribute("id") ? !0 : !1;
+}, isRelevant:function(a, b) {
+  var c = a.id, d = b.level;
+  return this.relatedElements.some(function(a) {
+    var b = a.flags.idrefs;
+    return a.flags.level === d && 0 <= b.indexOf(c);
+  });
+}, test:function(a) {
+  var b = "[id='" + a.id.replace(/'/g, "\\'") + "']";
+  return 1 < a.ownerDocument.querySelectorAll(b).length;
+}, code:"AX_HTML_02"});
+axs.AuditRules.addRule({name:"focusableElementNotVisibleAndNotAriaHidden", heading:"These elements are focusable but either invisible or obscured by another element", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_focus_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  if (!axs.browserUtils.matchSelector(a, axs.utils.FOCUSABLE_ELEMENTS_SELECTOR)) {
+    return !1;
+  }
+  if (0 <= a.tabIndex) {
+    return !0;
+  }
+  for (var b = axs.dom.parentElement(a);null != b;b = axs.dom.parentElement(b)) {
+    if (axs.utils.elementIsAriaWidget(b)) {
+      return !1;
+    }
+  }
+  a = axs.properties.findTextAlternatives(a, {});
+  return null === a || "" === a.trim() ? !1 : !0;
+}, test:function(a, b) {
+  if (b.hidden) {
+    return !1;
+  }
+  a.focus();
+  return !axs.utils.elementIsVisible(a);
+}, code:"AX_FOCUS_01"});
+axs.AuditRules.addRule({name:"humanLangMissing", heading:"The web page should have the content's human language indicated in the markup", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_html_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return a instanceof a.ownerDocument.defaultView.HTMLHtmlElement;
+}, test:function(a) {
+  return a.lang ? !1 : !0;
+}, code:"AX_HTML_01"});
+axs.AuditRules.addRule({name:"imagesWithoutAltText", heading:"Images should have a text alternative or presentational role", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_02", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a, b) {
+  return axs.browserUtils.matchSelector(a, "img") && !b.hidden;
+}, test:function(a) {
+  if (a.hasAttribute("alt") && "" == a.alt || "presentation" == a.getAttribute("role")) {
+    return !1;
+  }
+  var b = {};
+  axs.properties.findTextAlternatives(a, b);
+  return 0 == Object.keys(b).length ? !0 : !1;
+}, code:"AX_TEXT_02"});
+axs.AuditRules.addRule({name:"linkWithUnclearPurpose", heading:"The purpose of each link should be clear from the link text", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_04", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a, b) {
+  return axs.browserUtils.matchSelector(a, "a[href]") && !b.hidden;
+}, test:function(a, b, c) {
+  c = c || {};
+  var d = c.blacklistPhrases || [], e = /\s+/;
+  for (b = 0;b < d.length;b++) {
+    var f = "^\\s*" + d[b].trim().replace(e, "\\s*") + "s*[^a-z]$";
+    if ((new RegExp(f, "i")).test(a.textContent)) {
+      return !0;
+    }
+  }
+  c = c.stopwords || "click tap go here learn more this page link about".split(" ");
+  a = axs.properties.findTextAlternatives(a, {});
+  if (null === a || "" === a.trim()) {
+    return !0;
+  }
+  a = a.replace(/[^a-zA-Z ]/g, "");
+  for (b = 0;b < c.length;b++) {
+    if (a = a.replace(new RegExp("\\b" + c[b] + "\\b", "ig"), ""), "" == a.trim()) {
+      return !0;
+    }
+  }
+  return !1;
+}, code:"AX_TEXT_04"});
+axs.AuditRules.addRule({name:"lowContrastElements", heading:"Text elements should have a reasonable contrast ratio", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_color_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a, b) {
+  return !b.disabled && axs.properties.hasDirectTextDescendant(a);
+}, test:function(a) {
+  var b = window.getComputedStyle(a, null);
+  return (a = axs.utils.getContrastRatioForElementWithComputedStyle(b, a)) && axs.utils.isLowContrast(a, b);
+}, code:"AX_COLOR_01"});
+axs.AuditRules.addRule({name:"mainRoleOnInappropriateElement", heading:"role=main should only appear on significant elements", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_05", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "[role~=main]");
+}, test:function(a) {
+  if (axs.utils.isInlineElement(a)) {
+    return !0;
+  }
+  a = axs.properties.getTextFromDescendantContent(a);
+  return !a || 50 > a.length ? !0 : !1;
+}, code:"AX_ARIA_05"});
+axs.AuditRules.addRule({name:"elementsWithMeaningfulBackgroundImage", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a, b) {
+  return !b.hidden;
+}, heading:"Meaningful images should not be used in element backgrounds", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_image_01", test:function(a) {
+  if (a.textContent && 0 < a.textContent.length) {
+    return !1;
+  }
+  a = window.getComputedStyle(a, null);
+  var b = a.backgroundImage;
+  if (!b || "undefined" === b || "none" === b || 0 != b.indexOf("url")) {
+    return !1;
+  }
+  b = parseInt(a.width, 10);
+  a = parseInt(a.height, 10);
+  return 150 > b && 150 > a;
+}, code:"AX_IMAGE_01"});
+axs.AuditRules.addRule({name:"multipleAriaOwners", heading:"An element's ID must not be present in more that one aria-owns attribute at any time", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_07", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "[aria-owns]");
+}, test:function(a) {
+  return axs.utils.getIdReferents("aria-owns", a).some(function(a) {
+    return 1 < axs.utils.getAriaIdReferrers(a, "aria-owns").length;
+  });
+}, code:"AX_ARIA_07"});
+axs.AuditRules.addRule({name:"multipleLabelableElementsPerLabel", heading:"A label element may not have labelable descendants other than its labeled control.", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#-ax_text_03--labels-should-only-contain-one-labelable-element", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "label");
+}, test:function(a) {
+  if (1 < a.querySelectorAll(axs.utils.LABELABLE_ELEMENTS_SELECTOR).length) {
+    return !0;
+  }
+}, code:"AX_TEXT_03"});
+axs.AuditRules.addRule({name:"nonExistentRelatedElement", heading:"Attributes which refer to other elements by ID should refer to elements which exist in the DOM", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_html_03", severity:axs.constants.Severity.SEVERE, opt_requires:{idRefs:!0}, relevantElementMatcher:function(a, b) {
+  return 0 < b.idrefs.length;
+}, test:function(a, b) {
+  return b.idrefs.some(function(a) {
+    return !document.getElementById(a);
+  });
+}, code:"AX_HTML_03"});
+axs.AuditRules.addRule({name:"pageWithoutTitle", heading:"The web page should have a title that describes topic or purpose", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_title_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return "html" == a.tagName.toLowerCase();
+}, test:function(a) {
+  a = a.querySelector("head");
+  return a ? (a = a.querySelector("title")) ? !a.textContent : !0 : !0;
+}, code:"AX_TITLE_01"});
+axs.AuditRules.addRule({name:"requiredAriaAttributeMissing", heading:"Elements with ARIA roles must have all required attributes for that role", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_03", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "[role]");
+}, test:function(a) {
+  var b = axs.utils.getRoles(a);
+  if (!b.valid) {
+    return !1;
+  }
+  for (var c = 0;c < b.roles.length;c++) {
+    var d = b.roles[c].details.requiredPropertiesSet, e;
+    for (e in d) {
+      if (d = e.replace(/^aria-/, ""), !("defaultValue" in axs.constants.ARIA_PROPERTIES[d] || a.hasAttribute(e)) && 0 > axs.properties.getNativelySupportedAttributes(a).indexOf(e)) {
+        return !0;
+      }
+    }
+  }
+}, code:"AX_ARIA_03"});
+(function() {
+  function a(a) {
+    a = axs.utils.getRoles(a);
+    if (!a || !a.applied) {
+      return [];
+    }
+    a = a.applied;
+    return a.valid ? a.details.mustcontain || [] : [];
+  }
+  axs.AuditRules.addRule({name:"requiredOwnedAriaRoleMissing", heading:"Elements with ARIA roles must ensure required owned elements are present", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_08", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(b) {
+    return axs.browserUtils.matchSelector(b, "[role]") ? 0 < a(b).length : !1;
+  }, test:function(b) {
+    if ("true" === b.getAttribute("aria-busy")) {
+      return !1;
+    }
+    for (var c = a(b), d = c.length - 1;0 <= d;d--) {
+      var e = axs.utils.findDescendantsWithRole(b, c[d]);
+      if (e && e.length) {
+        return !1;
+      }
+    }
+    b = axs.utils.getIdReferents("aria-owns", b);
+    for (d = b.length - 1;0 <= d;d--) {
+      if ((e = axs.utils.getRoles(b[d], !0)) && e.applied) {
+        for (var e = e.applied, f = c.length - 1;0 <= f;f--) {
+          if (e.name === c[f]) {
+            return !1;
+          }
+        }
+      }
+    }
+    return !0;
+  }, code:"AX_ARIA_08"});
+})();
+axs.AuditRules.addRule({name:"roleTooltipRequiresDescribedby", heading:"Elements with role=tooltip should have a corresponding element with aria-describedby", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_02", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a, b) {
+  return axs.browserUtils.matchSelector(a, "[role=tooltip]") && !b.hidden;
+}, test:function(a) {
+  a = axs.utils.getAriaIdReferrers(a, "aria-describedby");
+  return !a || 0 === a.length;
+}, code:"AX_TOOLTIP_01"});
+axs.AuditRules.addRule({name:"tabIndexGreaterThanZero", heading:"Avoid positive integer values for tabIndex", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_focus_03", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "[tabindex]");
+}, test:function(a) {
+  if (0 < a.tabIndex) {
+    return !0;
+  }
+}, code:"AX_FOCUS_03"});
+(function() {
+  function a(a) {
+    if (0 == a.childElementCount) {
+      return !0;
+    }
+    if (a.hasAttribute("role") && "presentation" != a.getAttribute("role")) {
+      return !1;
+    }
+    if ("presentation" == a.getAttribute("role")) {
+      a = a.querySelectorAll("*");
+      for (var c = 0;c < a.length;c++) {
+        if ("TR" != a[c].tagName && "TD" != a[c].tagName) {
+          return !1;
+        }
+      }
+      return !0;
+    }
+    return !1;
+  }
+  axs.AuditRules.addRule({name:"tableHasAppropriateHeaders", heading:"Tables should have appropriate headers", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_table_01", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(b) {
+    return axs.browserUtils.matchSelector(b, "table") && !a(b) && 0 < b.querySelectorAll("tr").length;
+  }, test:function(a) {
+    a = a.querySelectorAll("tr");
+    var c;
+    a: {
+      c = a[0].children;
+      for (var d = 0;d < c.length;d++) {
+        if ("TH" != c[d].tagName) {
+          c = !0;
+          break a;
+        }
+      }
+      c = !1;
+    }
+    if (c) {
+      a: {
+        for (c = 0;c < a.length;c++) {
+          if ("TH" != a[c].children[0].tagName) {
+            c = !0;
+            break a;
+          }
+        }
+        c = !1;
+      }
+    }
+    if (c) {
+      a: {
+        c = a[0].children;
+        for (d = 1;d < c.length;d++) {
+          if ("TH" != c[d].tagName) {
+            c = !0;
+            break a;
+          }
+        }
+        for (d = 1;d < a.length;d++) {
+          if ("TH" != a[d].children[0].tagName) {
+            c = !0;
+            break a;
+          }
+        }
+        c = !1;
+      }
+    }
+    return c;
+  }, code:"AX_TABLE_01"});
+})();
+(function() {
+  axs.AuditRules.addRule({name:"uncontrolledTabpanel", heading:"A tabpanel should be related to a tab via aria-controls or aria-labelledby", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_13", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+    return axs.browserUtils.matchSelector(a, '[role="tabpanel"]');
+  }, test:function(a) {
+    var b;
+    b = document.querySelectorAll('[role="tab"][aria-controls="' + a.id + '"]');
+    (b = a.id && 1 === b.length) || (a.hasAttribute("aria-labelledby") ? (a = document.querySelectorAll("#" + a.getAttribute("aria-labelledby")), b = 1 === a.length && "tab" === a[0].getAttribute("role")) : b = !1);
+    return !b;
+  }, code:"AX_ARIA_13"});
+})();
+axs.AuditRules.addRule({name:"unfocusableElementsWithOnClick", heading:"Elements with onclick handlers must be focusable", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_focus_02", severity:axs.constants.Severity.WARNING, opt_requires:{consoleAPI:!0}, relevantElementMatcher:function(a, b) {
+  return a instanceof a.ownerDocument.defaultView.HTMLBodyElement || b.hidden ? !1 : "click" in getEventListeners(a) ? !0 : !1;
+}, test:function(a) {
+  return !a.hasAttribute("tabindex") && !axs.utils.isElementImplicitlyFocusable(a) && !a.disabled;
+}, code:"AX_FOCUS_02"});
+(function() {
+  var a = /^aria\-/, b = axs.utils.getSelectorForAriaProperties(axs.constants.ARIA_PROPERTIES);
+  axs.AuditRules.addRule({name:"unsupportedAriaAttribute", heading:"This element has an unsupported ARIA attribute", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_10", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+    return axs.browserUtils.matchSelector(a, b);
+  }, test:function(b) {
+    var d = axs.utils.getRoles(b, !0), d = d && d.applied ? d.applied.details.propertiesSet : axs.constants.GLOBAL_PROPERTIES;
+    b = b.attributes;
+    for (var e = 0, f = b.length;e < f;e++) {
+      var g = b[e].name;
+      if (a.test(g)) {
+        var h = g.replace(a, "");
+        if (axs.constants.ARIA_PROPERTIES.hasOwnProperty(h) && !(g in d)) {
+          return !0;
+        }
+      }
+    }
+    return !1;
+  }, code:"AX_ARIA_10"});
+})();
+axs.AuditRules.addRule({name:"videoWithoutCaptions", heading:"Video elements should use <track> elements to provide captions", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_video_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "video");
+}, test:function(a) {
+  return !a.querySelectorAll("track[kind=captions]").length;
+}, code:"AX_VIDEO_01"});
+
+  return axs;
+});
+
+// Define AMD module if possible, export globals otherwise.
+if (typeof define !== 'undefined' && define.amd) {
+  define([], fn);
+} else {
+  var axs = fn.call(this);
+}
+
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
new file mode 100644
index 000000000..4aa792510
--- /dev/null
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -0,0 +1,2188 @@
+"use strict";
+
+window._qutebrowser.caret = (function() {
+    const funcs = {};
+
+    var Cursor = function(node, index, text) {
+        this.node = node;
+        this.index = index;
+        this.text = text;
+    };
+
+    /**
+     * @return {Cursor} A new cursor pointing to the same location.
+     */
+    Cursor.prototype.clone = function() {
+        return new Cursor(this.node, this.index, this.text);
+    };
+
+    /**
+     * Modify this cursor to point to the location that another cursor points to.
+     * @param {Cursor} otherCursor The cursor to copy from.
+     */
+    Cursor.prototype.copyFrom = function(otherCursor) {
+        this.node = otherCursor.node;
+        this.index = otherCursor.index;
+        this.text = otherCursor.text;
+    };
+
+    var TraverseUtil = function() {};
+
+    TraverseUtil.getNodeText = function(node) {
+        if (node.constructor == Text) {
+            return node.data;
+        } else {
+            return '';
+        }
+    };
+
+    /**
+     * Return true if a node should be treated as a leaf node, because
+     * its children are properties of the object that shouldn't be traversed.
+     *
+     * TODO(dmazzoni): replace this with a predicate that detects nodes with
+     * ARIA roles and other objects that have their own description.
+     * For now we just detect a couple of common cases.
+     *
+     * @param {Node} node A DOM node.
+     * @return {boolean} True if the node should be treated as a leaf node.
+     */
+    TraverseUtil.treatAsLeafNode = function(node) {
+        return node.childNodes.length == 0 ||
+            node.nodeName == 'SELECT' ||
+            node.nodeName == 'OBJECT';
+    };
+
+    /**
+     * Return true only if a single character is whitespace.
+     * From https://developer.mozilla.org/en/Whitespace_in_the_DOM,
+     * whitespace is defined as one of the characters
+     *  "\t" TAB \u0009
+     *  "\n" LF  \u000A
+     *  "\r" CR  \u000D
+     *  " "  SPC \u0020.
+     *
+     * @param {string} c A string containing a single character.
+     * @return {boolean} True if the character is whitespace, otherwise false.
+     */
+    TraverseUtil.isWhitespace = function(c) {
+        return (c == ' ' || c == '\n' || c == '\r' || c == '\t');
+    };
+
+    /**
+     * Set the selection to the range between the given start and end cursors.
+     * @param {Cursor} start The desired start of the selection.
+     * @param {Cursor} end The desired end of the selection.
+     * @return {Selection} the selection object.
+     */
+    TraverseUtil.setSelection = function(start, end) {
+        var sel = window.getSelection();
+        sel.removeAllRanges();
+        var range = document.createRange();
+        range.setStart(start.node, start.index);
+        range.setEnd(end.node, end.index);
+        sel.addRange(range);
+
+        return sel;
+    };
+
+    /**
+     * Use the computed CSS style to figure out if this DOM node is currently
+     * visible.
+     * @param {Node} node A HTML DOM node.
+     * @return {boolean} Whether or not the html node is visible.
+     */
+    TraverseUtil.isVisible = function(node) {
+        if (!node.style)
+            return true;
+        var style = window.getComputedStyle(/** @type {Element} */(node), null);
+        return (!!style && style.display != 'none' && style.visibility != 'hidden');
+    };
+
+    /**
+     * Use the class name to figure out if this DOM node should be traversed.
+     * @param {Node} node A HTML DOM node.
+     * @return {boolean} Whether or not the html node should be traversed.
+     */
+    TraverseUtil.isSkipped = function(node) {
+        if (node.constructor == Text)
+            node = node.parentElement;
+        if (node.className == 'CaretBrowsing_Caret' ||
+            node.className == 'CaretBrowsing_AnimateCaret') {
+            return true;
+        }
+        return false;
+    };
+
+    /**
+     * Moves the cursor forwards until it has crossed exactly one character.
+     * @param {Cursor} cursor The cursor location where the search should start.
+     *     On exit, the cursor will be immediately to the right of the
+     *     character returned.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @return {?string} The character found, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.forwardsChar = function(cursor, nodesCrossed) {
+        while (true) {
+            // Move down until we get to a leaf node.
+            var childNode = null;
+            if (!TraverseUtil.treatAsLeafNode(cursor.node)) {
+                for (var i = cursor.index; i < cursor.node.childNodes.length; i++) {
+                    var node = cursor.node.childNodes[i];
+                    if (TraverseUtil.isSkipped(node)) {
+                        nodesCrossed.push(node);
+                        continue;
+                    }
+                    if (TraverseUtil.isVisible(node)) {
+                        childNode = node;
+                        break;
+                    }
+                }
+            }
+            if (childNode) {
+                cursor.node = childNode;
+                cursor.index = 0;
+                cursor.text = TraverseUtil.getNodeText(cursor.node);
+                if (cursor.node.constructor != Text) {
+                    nodesCrossed.push(cursor.node);
+                }
+                continue;
+            }
+
+            // Return the next character from this leaf node.
+            if (cursor.index < cursor.text.length)
+                return cursor.text[cursor.index++];
+
+            // Move to the next sibling, going up the tree as necessary.
+            while (cursor.node != null) {
+                // Try to move to the next sibling.
+                var siblingNode = null;
+                for (var node = cursor.node.nextSibling;
+                    node != null;
+                    node = node.nextSibling) {
+                    if (TraverseUtil.isSkipped(node)) {
+                        nodesCrossed.push(node);
+                        continue;
+                    }
+                    if (TraverseUtil.isVisible(node)) {
+                        siblingNode = node;
+                        break;
+                    }
+                }
+                if (siblingNode) {
+                    cursor.node = siblingNode;
+                    cursor.text = TraverseUtil.getNodeText(siblingNode);
+                    cursor.index = 0;
+
+                    if (cursor.node.constructor != Text) {
+                        nodesCrossed.push(cursor.node);
+                    }
+
+                    break;
+                }
+
+                // Otherwise, move to the parent.
+                if (cursor.node.parentNode &&
+                    cursor.node.parentNode.constructor != HTMLBodyElement) {
+                    cursor.node = cursor.node.parentNode;
+                    cursor.text = null;
+                    cursor.index = 0;
+                } else {
+                    return null;
+                }
+            }
+        }
+    };
+
+    /**
+     * Moves the cursor backwards until it has crossed exactly one character.
+     * @param {Cursor} cursor The cursor location where the search should start.
+     *     On exit, the cursor will be immediately to the left of the
+     *     character returned.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @return {?string} The previous character, or null if the top of the
+     *     document has been reached.
+     */
+    TraverseUtil.backwardsChar = function(cursor, nodesCrossed) {
+        while (true) {
+            // Move down until we get to a leaf node.
+            var childNode = null;
+            if (!TraverseUtil.treatAsLeafNode(cursor.node)) {
+                for (var i = cursor.index - 1; i >= 0; i--) {
+                    var node = cursor.node.childNodes[i];
+                    if (TraverseUtil.isSkipped(node)) {
+                        nodesCrossed.push(node);
+                        continue;
+                    }
+                    if (TraverseUtil.isVisible(node)) {
+                        childNode = node;
+                        break;
+                    }
+                }
+            }
+            if (childNode) {
+                cursor.node = childNode;
+                cursor.text = TraverseUtil.getNodeText(cursor.node);
+                if (cursor.text.length)
+                    cursor.index = cursor.text.length;
+                else
+                    cursor.index = cursor.node.childNodes.length;
+                if (cursor.node.constructor != Text)
+                    nodesCrossed.push(cursor.node);
+                continue;
+            }
+
+            // Return the previous character from this leaf node.
+            if (cursor.text.length > 0 && cursor.index > 0) {
+                return cursor.text[--cursor.index];
+            }
+
+            // Move to the previous sibling, going up the tree as necessary.
+            while (true) {
+                // Try to move to the previous sibling.
+                var siblingNode = null;
+                for (var node = cursor.node.previousSibling;
+                    node != null;
+                    node = node.previousSibling) {
+                    if (TraverseUtil.isSkipped(node)) {
+                        nodesCrossed.push(node);
+                        continue;
+                    }
+                    if (TraverseUtil.isVisible(node)) {
+                        siblingNode = node;
+                        break;
+                    }
+                }
+                if (siblingNode) {
+                    cursor.node = siblingNode;
+                    cursor.text = TraverseUtil.getNodeText(siblingNode);
+                    if (cursor.text.length)
+                        cursor.index = cursor.text.length;
+                    else
+                        cursor.index = cursor.node.childNodes.length;
+                    if (cursor.node.constructor != Text)
+                        nodesCrossed.push(cursor.node);
+                    break;
+                }
+
+                // Otherwise, move to the parent.
+                if (cursor.node.parentNode &&
+                    cursor.node.parentNode.constructor != HTMLBodyElement) {
+                    cursor.node = cursor.node.parentNode;
+                    cursor.text = null;
+                    cursor.index = 0;
+                } else {
+                    return null;
+                }
+            }
+        }
+    };
+
+    /**
+     * Finds the next character, starting from endCursor.  Upon exit, startCursor
+     * and endCursor will surround the next character. If skipWhitespace is
+     * true, will skip until a real character is found. Otherwise, it will
+     * attempt to select all of the whitespace between the initial position
+     * of endCursor and the next non-whitespace character.
+     * @param {Cursor} startCursor On exit, points to the position before
+     *     the char.
+     * @param {Cursor} endCursor The position to start searching for the next
+     *     char.  On exit, will point to the position past the char.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @param {boolean} skipWhitespace If true, will keep scanning until a
+     *     non-whitespace character is found.
+     * @return {?string} The next char, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.getNextChar = function(
+        startCursor, endCursor, nodesCrossed, skipWhitespace) {
+
+        // Save the starting position and get the first character.
+        startCursor.copyFrom(endCursor);
+        var c = TraverseUtil.forwardsChar(endCursor, nodesCrossed);
+        if (c == null)
+        return null;
+
+        // Keep track of whether the first character was whitespace.
+        var initialWhitespace = TraverseUtil.isWhitespace(c);
+
+        // Keep scanning until we find a non-whitespace or non-skipped character.
+        while ((TraverseUtil.isWhitespace(c)) ||
+            (TraverseUtil.isSkipped(endCursor.node))) {
+            c = TraverseUtil.forwardsChar(endCursor, nodesCrossed);
+            if (c == null)
+            return null;
+        }
+        if (skipWhitespace || !initialWhitespace) {
+            // If skipWhitepace is true, or if the first character we encountered
+            // was not whitespace, return that non-whitespace character.
+            startCursor.copyFrom(endCursor);
+            startCursor.index--;
+            return c;
+        }
+        else {
+            for (var i = 0; i < nodesCrossed.length; i++) {
+                if (TraverseUtil.isSkipped(nodesCrossed[i])) {
+                    // We need to make sure that startCursor and endCursor aren't
+                    // surrounding a skippable node.
+                    endCursor.index--;
+                    startCursor.copyFrom(endCursor);
+                    startCursor.index--;
+                    return ' ';
+                }
+            }
+            // Otherwise, return all of the whitespace before that last character.
+            endCursor.index--;
+            return ' ';
+        }
+    };
+
+    /**
+     * Finds the previous character, starting from startCursor.  Upon exit,
+     * startCursor and endCursor will surround the previous character.
+     * If skipWhitespace is true, will skip until a real character is found.
+     * Otherwise, it will attempt to select all of the whitespace between
+     * the initial position of endCursor and the next non-whitespace character.
+     * @param {Cursor} startCursor The position to start searching for the
+     *     char. On exit, will point to the position before the char.
+     * @param {Cursor} endCursor The position to start searching for the next
+     *     char. On exit, will point to the position past the char.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @param {boolean} skipWhitespace If true, will keep scanning until a
+     *     non-whitespace character is found.
+     * @return {?string} The previous char, or null if the top of the
+     *     document has been reached.
+     */
+    TraverseUtil.getPreviousChar = function(
+        startCursor, endCursor, nodesCrossed, skipWhitespace) {
+
+        // Save the starting position and get the first character.
+        endCursor.copyFrom(startCursor);
+        var c = TraverseUtil.backwardsChar(startCursor, nodesCrossed);
+        if (c == null)
+        return null;
+
+        // Keep track of whether the first character was whitespace.
+        var initialWhitespace = TraverseUtil.isWhitespace(c);
+
+        // Keep scanning until we find a non-whitespace or non-skipped character.
+        while ((TraverseUtil.isWhitespace(c)) ||
+            (TraverseUtil.isSkipped(startCursor.node))) {
+            c = TraverseUtil.backwardsChar(startCursor, nodesCrossed);
+            if (c == null)
+            return null;
+        }
+        if (skipWhitespace || !initialWhitespace) {
+            // If skipWhitepace is true, or if the first character we encountered
+            // was not whitespace, return that non-whitespace character.
+            endCursor.copyFrom(startCursor);
+            endCursor.index++;
+            return c;
+        } else {
+            for (var i = 0; i < nodesCrossed.length; i++) {
+                if (TraverseUtil.isSkipped(nodesCrossed[i])) {
+                    startCursor.index++;
+                    endCursor.copyFrom(startCursor);
+                    endCursor.index++;
+                    return ' ';
+                }
+            }
+            // Otherwise, return all of the whitespace before that last character.
+            startCursor.index++;
+            return ' ';
+        }
+    };
+
+    /**
+     * Finds the next word, starting from endCursor.  Upon exit, startCursor
+     * and endCursor will surround the next word.  A word is defined to be
+     * a string of 1 or more non-whitespace characters in the same DOM node.
+     * @param {Cursor} startCursor On exit, will point to the beginning of the
+     *     word returned.
+     * @param {Cursor} endCursor The position to start searching for the next
+     *     word.  On exit, will point to the end of the word returned.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @return {?string} The next word, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.getNextWord = function(startCursor, endCursor,
+        nodesCrossed) {
+
+        // Find the first non-whitespace or non-skipped character.
+        var cursor = endCursor.clone();
+        var c = TraverseUtil.forwardsChar(cursor, nodesCrossed);
+        if (c == null)
+        return null;
+        while ((TraverseUtil.isWhitespace(c)) ||
+            (TraverseUtil.isSkipped(cursor.node))) {
+            c = TraverseUtil.forwardsChar(cursor, nodesCrossed);
+            if (c == null)
+            return null;
+        }
+
+        // Set startCursor to the position immediately before the first
+        // character in our word. It's safe to decrement |index| because
+        // forwardsChar guarantees that the cursor will be immediately to the
+        // right of the returned character on exit.
+        startCursor.copyFrom(cursor);
+        startCursor.index--;
+
+        // Keep building up our word until we reach a whitespace character or
+        // would cross a tag.  Don't actually return any tags crossed, because this
+        // word goes up until the tag boundary but not past it.
+        endCursor.copyFrom(cursor);
+        var word = c;
+        var newNodesCrossed = [];
+        c = TraverseUtil.forwardsChar(cursor, newNodesCrossed);
+        if (c == null) {
+            return word;
+        }
+        while (!TraverseUtil.isWhitespace(c) &&
+            newNodesCrossed.length == 0) {
+            word += c;
+            endCursor.copyFrom(cursor);
+            c = TraverseUtil.forwardsChar(cursor, newNodesCrossed);
+            if (c == null) {
+                return word;
+            }
+        }
+        return word;
+    };
+
+    /**
+     * Finds the previous word, starting from startCursor.  Upon exit, startCursor
+     * and endCursor will surround the previous word.  A word is defined to be
+     * a string of 1 or more non-whitespace characters in the same DOM node.
+     * @param {Cursor} startCursor The position to start searching for the
+     *     previous word.  On exit, will point to the beginning of the
+     *     word returned.
+     * @param {Cursor} endCursor On exit, will point to the end of the
+     *     word returned.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @return {?string} The previous word, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.getPreviousWord = function(startCursor, endCursor,
+        nodesCrossed) {
+        // Find the first non-whitespace or non-skipped character.
+        var cursor = startCursor.clone();
+        var c = TraverseUtil.backwardsChar(cursor, nodesCrossed);
+        if (c == null)
+        return null;
+        while ((TraverseUtil.isWhitespace(c) ||
+            (TraverseUtil.isSkipped(cursor.node)))) {
+            c = TraverseUtil.backwardsChar(cursor, nodesCrossed);
+            if (c == null)
+            return null;
+        }
+
+        // Set endCursor to the position immediately after the first
+        // character we've found (the last character of the word, since we're
+        // searching backwards).
+        endCursor.copyFrom(cursor);
+        endCursor.index++;
+
+        // Keep building up our word until we reach a whitespace character or
+        // would cross a tag.  Don't actually return any tags crossed, because this
+        // word goes up until the tag boundary but not past it.
+        startCursor.copyFrom(cursor);
+        var word = c;
+        var newNodesCrossed = [];
+        c = TraverseUtil.backwardsChar(cursor, newNodesCrossed);
+        if (c == null)
+        return word;
+        while (!TraverseUtil.isWhitespace(c) &&
+            newNodesCrossed.length == 0) {
+            word = c + word;
+            startCursor.copyFrom(cursor);
+            c = TraverseUtil.backwardsChar(cursor, newNodesCrossed);
+            if (c == null)
+            return word;
+        }
+
+        return word;
+    };
+
+    /**
+     * Finds the next sentence, starting from endCursor.  Upon exit,
+     * startCursor and endCursor will surround the next sentence.
+     *
+     * @param {Cursor} startCursor On exit, marks the beginning of the sentence.
+     * @param {Cursor} endCursor The position to start searching for the next
+     *     sentence.  On exit, will point to the end of the returned string.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @param {Object} breakTags Associative array of tags that should break
+     *     the sentence.
+     * @return {?string} The next sentence, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.getNextSentence = function(
+        startCursor, endCursor, nodesCrossed, breakTags) {
+        return TraverseUtil.getNextString(
+            startCursor, endCursor, nodesCrossed,
+            function(str, word, nodes) {
+                if (str.substr(-1) == '.')
+                    return true;
+                for (var i = 0; i < nodes.length; i++) {
+                    if (TraverseUtil.isSkipped(nodes[i])) {
+                        return true;
+                    }
+                    var style = window.getComputedStyle(nodes[i], null);
+                    if (style && (style.display != 'inline' ||
+                        breakTags[nodes[i].tagName])) {
+                        return true;
+                    }
+                }
+                return false;
+            });
+    };
+
+    /**
+     * Finds the previous sentence, starting from startCursor.  Upon exit,
+     * startCursor and endCursor will surround the previous sentence.
+     *
+     * @param {Cursor} startCursor The position to start searching for the next
+     *     sentence.  On exit, will point to the start of the returned string.
+     * @param {Cursor} endCursor On exit, the end of the returned string.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @param {Object} breakTags Associative array of tags that should break
+     *     the sentence.
+     * @return {?string} The previous sentence, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.getPreviousSentence = function(
+        startCursor, endCursor, nodesCrossed, breakTags) {
+        return TraverseUtil.getPreviousString(
+            startCursor, endCursor, nodesCrossed,
+            function(str, word, nodes) {
+                if (word.substr(-1) == '.')
+                    return true;
+                for (var i = 0; i < nodes.length; i++) {
+                    if (TraverseUtil.isSkipped(nodes[i])) {
+                        return true;
+                    }
+                    var style = window.getComputedStyle(nodes[i], null);
+                    if (style && (style.display != 'inline' ||
+                        breakTags[nodes[i].tagName])) {
+                        return true;
+                    }
+                }
+                return false;
+            });
+    };
+
+    /**
+     * Finds the next line, starting from endCursor.  Upon exit,
+     * startCursor and endCursor will surround the next line.
+     *
+     * @param {Cursor} startCursor On exit, marks the beginning of the line.
+     * @param {Cursor} endCursor The position to start searching for the next
+     *     line.  On exit, will point to the end of the returned string.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @param {number} lineLength The maximum number of characters in a line.
+     * @param {Object} breakTags Associative array of tags that should break
+     *     the line.
+     * @return {?string} The next line, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.getNextLine = function(
+        startCursor, endCursor, nodesCrossed, lineLength, breakTags) {
+        return TraverseUtil.getNextString(
+            startCursor, endCursor, nodesCrossed,
+            function(str, word, nodes) {
+                if (str.length + word.length + 1 > lineLength)
+                    return true;
+                for (var i = 0; i < nodes.length; i++) {
+                    if (TraverseUtil.isSkipped(nodes[i])) {
+                        return true;
+                    }
+                    var style = window.getComputedStyle(nodes[i], null);
+                    if (style && (style.display != 'inline' ||
+                        breakTags[nodes[i].tagName])) {
+                        return true;
+                    }
+                }
+                return false;
+            });
+    };
+
+    /**
+     * Finds the previous line, starting from startCursor.  Upon exit,
+     * startCursor and endCursor will surround the previous line.
+     *
+     * @param {Cursor} startCursor The position to start searching for the next
+     *     line.  On exit, will point to the start of the returned string.
+     * @param {Cursor} endCursor On exit, the end of the returned string.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @param {number} lineLength The maximum number of characters in a line.
+     * @param {Object} breakTags Associative array of tags that should break
+     *     the sentence.
+     *  @return {?string} The previous line, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.getPreviousLine = function(
+        startCursor, endCursor, nodesCrossed, lineLength, breakTags) {
+        return TraverseUtil.getPreviousString(
+            startCursor, endCursor, nodesCrossed,
+            function(str, word, nodes) {
+                if (str.length + word.length + 1 > lineLength)
+                    return true;
+                for (var i = 0; i < nodes.length; i++) {
+                    if (TraverseUtil.isSkipped(nodes[i])) {
+                        return true;
+                    }
+                    var style = window.getComputedStyle(nodes[i], null);
+                    if (style && (style.display != 'inline' ||
+                        breakTags[nodes[i].tagName])) {
+                        return true;
+                    }
+                }
+                return false;
+            });
+    };
+
+    /**
+     * Finds the next paragraph, starting from endCursor.  Upon exit,
+     * startCursor and endCursor will surround the next paragraph.
+     *
+     * @param {Cursor} startCursor On exit, marks the beginning of the paragraph.
+     * @param {Cursor} endCursor The position to start searching for the next
+     *     paragraph.  On exit, will point to the end of the returned string.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @return {?string} The next paragraph, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.getNextParagraph = function(startCursor, endCursor,
+        nodesCrossed) {
+        return TraverseUtil.getNextString(
+            startCursor, endCursor, nodesCrossed,
+            function(str, word, nodes) {
+                for (var i = 0; i < nodes.length; i++) {
+                    if (TraverseUtil.isSkipped(nodes[i])) {
+                        return true;
+                    }
+                    var style = window.getComputedStyle(nodes[i], null);
+                    if (style && style.display != 'inline') {
+                        return true;
+                    }
+                }
+                return false;
+            });
+    };
+
+    /**
+     * Finds the previous paragraph, starting from startCursor.  Upon exit,
+     * startCursor and endCursor will surround the previous paragraph.
+     *
+     * @param {Cursor} startCursor The position to start searching for the next
+     *     paragraph.  On exit, will point to the start of the returned string.
+     * @param {Cursor} endCursor On exit, the end of the returned string.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @return {?string} The previous paragraph, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.getPreviousParagraph = function(
+        startCursor, endCursor, nodesCrossed) {
+        return TraverseUtil.getPreviousString(
+            startCursor, endCursor, nodesCrossed,
+            function(str, word, nodes) {
+                for (var i = 0; i < nodes.length; i++) {
+                    if (TraverseUtil.isSkipped(nodes[i])) {
+                        return true;
+                    }
+                    var style = window.getComputedStyle(nodes[i], null);
+                    if (style && style.display != 'inline') {
+                        return true;
+                    }
+                }
+                return false;
+            });
+    };
+
+    /**
+     * Customizable function to return the next string of words in the DOM, based
+     * on provided functions to decide when to break one string and start
+     * the next. This can be used to get the next sentence, line, paragraph,
+     * or potentially other granularities.
+     *
+     * Finds the next contiguous string, starting from endCursor.  Upon exit,
+     * startCursor and endCursor will surround the next string.
+     *
+     * The breakBefore function takes three parameters, and
+     * should return true if the string should be broken before the proposed
+     * next word:
+     *   str The string so far.
+     *   word The next word to be added.
+     *   nodesCrossed The nodes crossed in reaching this next word.
+     *
+     * @param {Cursor} startCursor On exit, will point to the beginning of the
+     *     next string.
+     * @param {Cursor} endCursor The position to start searching for the next
+     *     string.  On exit, will point to the end of the returned string.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @param {function(string, string, Array<string>)} breakBefore
+     *     Function that takes the string so far, next word to be added, and
+     *     nodes crossed, and returns true if the string should be ended before
+     *     adding this word.
+     * @return {?string} The next string, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.getNextString = function(
+        startCursor, endCursor, nodesCrossed, breakBefore) {
+        // Get the first word and set the start cursor to the start of the
+        // first word.
+        var wordStartCursor = endCursor.clone();
+        var wordEndCursor = endCursor.clone();
+        var newNodesCrossed = [];
+        var str = '';
+        var word = TraverseUtil.getNextWord(
+            wordStartCursor, wordEndCursor, newNodesCrossed);
+        if (word == null)
+        return null;
+        startCursor.copyFrom(wordStartCursor);
+
+        // Always add the first word when the string is empty, and then keep
+        // adding more words as long as breakBefore returns false
+        while (!str || !breakBefore(str, word, newNodesCrossed)) {
+            // Append this word, set the end cursor to the end of this word, and
+            // update the returned list of nodes crossed to include ones we crossed
+            // in reaching this word.
+            if (str)
+                str += ' ';
+            str += word;
+            nodesCrossed = nodesCrossed.concat(newNodesCrossed);
+            endCursor.copyFrom(wordEndCursor);
+
+            // Get the next word and go back to the top of the loop.
+            newNodesCrossed = [];
+            word = TraverseUtil.getNextWord(
+                wordStartCursor, wordEndCursor, newNodesCrossed);
+            if (word == null)
+                return str;
+        }
+
+        return str;
+    };
+
+    /**
+     * Customizable function to return the previous string of words in the DOM,
+     * based on provided functions to decide when to break one string and start
+     * the next. See getNextString, above, for more details.
+     *
+     * Finds the previous contiguous string, starting from startCursor.  Upon exit,
+     * startCursor and endCursor will surround the next string.
+     *
+     * @param {Cursor} startCursor The position to start searching for the
+     *     previous string.  On exit, will point to the beginning of the
+     *     string returned.
+     * @param {Cursor} endCursor On exit, will point to the end of the
+     *     string returned.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @param {function(string, string, Array<string>)} breakBefore
+     *     Function that takes the string so far, the word to be added, and
+     *     nodes crossed, and returns true if the string should be ended before
+     *     adding this word.
+     * @return {?string} The next string, or null if the top of the
+     *     document has been reached.
+     */
+    TraverseUtil.getPreviousString = function(
+        startCursor, endCursor, nodesCrossed, breakBefore) {
+        // Get the first word and set the end cursor to the end of the
+        // first word.
+        var wordStartCursor = startCursor.clone();
+        var wordEndCursor = startCursor.clone();
+        var newNodesCrossed = [];
+        var str = '';
+        var word = TraverseUtil.getPreviousWord(
+            wordStartCursor, wordEndCursor, newNodesCrossed);
+        if (word == null)
+        return null;
+        endCursor.copyFrom(wordEndCursor);
+
+        // Always add the first word when the string is empty, and then keep
+        // adding more words as long as breakBefore returns false
+        while (!str || !breakBefore(str, word, newNodesCrossed)) {
+            // Prepend this word, set the start cursor to the start of this word, and
+            // update the returned list of nodes crossed to include ones we crossed
+            // in reaching this word.
+            if (str)
+                str = ' ' + str;
+            str = word + str;
+            nodesCrossed = nodesCrossed.concat(newNodesCrossed);
+            startCursor.copyFrom(wordStartCursor);
+            v
+            // Get the previous word and go back to the top of the loop.
+            newNodesCrossed = [];
+            word = TraverseUtil.getPreviousWord(
+                wordStartCursor, wordEndCursor, newNodesCrossed);
+            if (word == null)
+                return str;
+        }
+
+        return str;
+    };
+
+
+    function isFocusable(targetNode) {
+        if (!targetNode || typeof(targetNode.tabIndex) != 'number') {
+            return false;
+        }
+
+        if (targetNode.tabIndex >= 0) {
+            return true;
+        }
+
+        if (targetNode.hasAttribute &&
+            targetNode.hasAttribute('tabindex') &&
+            targetNode.getAttribute('tabindex') == '-1') {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Determines whether or not a node is or is the descendant of another node.
+     *
+     * @param {Object} node The node to be checked.
+     * @param {Object} ancestor The node to see if it's a descendant of.
+     * @return {boolean} True if the node is ancestor or is a descendant of it.
+     */
+    function isDescendantOfNode(node, ancestor) {
+        while (node && ancestor) {
+            if (node.isSameNode(ancestor)) {
+                return true;
+            }
+            node = node.parentNode;
+        }
+        return false;
+    }
+
+
+    var CaretBrowsing = function() {};
+
+    /**
+     * Is caret browsing enabled?
+     * @type {boolean}
+     */
+    CaretBrowsing.isEnabled = false;
+
+    /**
+     * Keep it enabled even when flipped off (for the options page)?
+     * @type {boolean}
+     */
+    CaretBrowsing.forceEnabled = false;
+
+    /**
+     * What to do when the caret appears?
+     * @type {string}
+     */
+    CaretBrowsing.onEnable;
+
+    /**
+     * What to do when the caret jumps?
+     * @type {string}
+     */
+    CaretBrowsing.onJump;
+
+    /**
+     * Is this window / iframe focused? We won't show the caret if not,
+     * especially so that carets aren't shown in two iframes of the same
+     * tab.
+     * @type {boolean}
+     */
+    CaretBrowsing.isWindowFocused = false;
+
+    /**
+     * Is the caret actually visible? This is true only if isEnabled and
+     * isWindowFocused are both true.
+     * @type {boolean}
+     */
+    CaretBrowsing.isCaretVisible = false;
+
+    /**
+     * The actual caret element, an absolute-positioned flashing line.
+     * @type {Element}
+     */
+    CaretBrowsing.caretElement;
+
+    /**
+     * The x-position of the caret, in absolute pixels.
+     * @type {number}
+     */
+    CaretBrowsing.caretX = 0;
+
+    /**
+     * The y-position of the caret, in absolute pixels.
+     * @type {number}
+     */
+    CaretBrowsing.caretY = 0;
+
+    /**
+     * The width of the caret in pixels.
+     * @type {number}
+     */
+    CaretBrowsing.caretWidth = 0;
+
+    /**
+     * The height of the caret in pixels.
+     * @type {number}
+     */
+    CaretBrowsing.caretHeight = 0;
+
+    /**
+     * The foregroundc color.
+     * @type {string}
+     */
+    CaretBrowsing.caretForeground = '#000';
+
+    /**
+     * The backgroundc color.
+     * @type {string}
+     */
+    CaretBrowsing.caretBackground = '#fff';
+
+    /**
+     * Is the selection collapsed, i.e. are the start and end locations
+     * the same? If so, our blinking caret image is shown; otherwise
+     * the Chrome selection is shown.
+     * @type {boolean}
+     */
+    CaretBrowsing.isSelectionCollapsed = false;
+
+    /**
+     * The id returned by window.setInterval for our blink function, so
+     * we can cancel it when caret browsing is disabled.
+     * @type {number?}
+     */
+    CaretBrowsing.blinkFunctionId = null;
+
+    /**
+     * The desired x-coordinate to match when moving the caret up and down.
+     * To match the behavior as documented in Mozilla's caret browsing spec
+     * (http://www.mozilla.org/access/keyboard/proposal), we keep track of the
+     * initial x position when the user starts moving the caret up and down,
+     * so that the x position doesn't drift as you move throughout lines, but
+     * stays as close as possible to the initial position. This is reset when
+     * moving left or right or clicking.
+     * @type {number?}
+     */
+    CaretBrowsing.targetX = null;
+
+    /**
+     * A flag that flips on or off as the caret blinks.
+     * @type {boolean}
+     */
+    CaretBrowsing.blinkFlag = true;
+
+    /**
+     * Whether or not we're on a Mac - affects modifier keys.
+     * @type {boolean}
+     */
+    CaretBrowsing.isMac = (navigator.appVersion.indexOf("Mac") != -1);
+
+    /**
+     * Check if a node is a control that normally allows the user to interact
+     * with it using arrow keys. We won't override the arrow keys when such a
+     * control has focus, the user must press Escape to do caret browsing outside
+     * that control.
+     * @param {Node} node A node to check.
+     * @return {boolean} True if this node is a control that the user can
+     *     interact with using arrow keys.
+     */
+    CaretBrowsing.isControlThatNeedsArrowKeys = function(node) {
+        if (!node) {
+            return false;
+        }
+
+        if (node == document.body || node != document.activeElement) {
+            return false;
+        }
+
+        if (node.constructor == HTMLSelectElement) {
+            return true;
+        }
+
+        if (node.constructor == HTMLInputElement) {
+            switch (node.type) {
+                case 'email':
+                case 'number':
+                case 'password':
+                case 'search':
+                case 'text':
+                case 'tel':
+                case 'url':
+                case '':
+                    return true;  // All of these are text boxes.
+                case 'datetime':
+                case 'datetime-local':
+                case 'date':
+                case 'month':
+                case 'radio':
+                case 'range':
+                case 'week':
+                    return true;  // These are other input elements that use arrows.
+            }
+        }
+
+        // Handle focusable ARIA controls.
+        if (node.getAttribute && isFocusable(node)) {
+            var role = node.getAttribute('role');
+            switch (role) {
+                case 'combobox':
+                case 'grid':
+                case 'gridcell':
+                case 'listbox':
+                case 'menu':
+                case 'menubar':
+                case 'menuitem':
+                case 'menuitemcheckbox':
+                case 'menuitemradio':
+                case 'option':
+                case 'radiogroup':
+                case 'scrollbar':
+                case 'slider':
+                case 'spinbutton':
+                case 'tab':
+                case 'tablist':
+                case 'textbox':
+                case 'tree':
+                case 'treegrid':
+                case 'treeitem':
+                    return true;
+            }
+        }
+
+        return false;
+    };
+
+    /**
+     * If there's no initial selection, set the cursor just before the
+     * first text character in the document.
+     */
+    funcs.setInitialCursor = () => {
+        CaretBrowsing.setInitialCursor();
+    }
+
+    CaretBrowsing.setInitialCursor = function() {
+        var sel = window.getSelection();
+        if (sel.rangeCount > 0) {
+            return;
+        }
+
+        var start = new Cursor(document.body, 0, '');
+        var end = new Cursor(document.body, 0, '');
+        var nodesCrossed = [];
+        var result = TraverseUtil.getNextChar(start, end, nodesCrossed, true);
+        if (result == null) {
+            return;
+        }
+        CaretBrowsing.setAndValidateSelection(start, start);
+        CaretBrowsing.toggle();
+    };
+
+    /**
+     * Try to set the window's selection to be between the given start and end
+     * cursors, and return whether or not it was successful.
+     * @param {Cursor} start The start position.
+     * @param {Cursor} end The end position.
+     * @return {boolean} True if the selection was successfully set.
+     */
+    CaretBrowsing.setAndValidateSelection = function(start, end) {
+        var sel = window.getSelection();
+        sel.setBaseAndExtent(start.node, start.index, end.node, end.index);
+
+        if (sel.rangeCount != 1) {
+            return false;
+        }
+
+        return (sel.anchorNode == start.node &&
+            sel.anchorOffset == start.index &&
+            sel.focusNode == end.node &&
+            sel.focusOffset == end.index);
+    };
+
+
+    CaretBrowsing.setFocusToNode = function(node) {
+        while (node && node != document.body) {
+            if (isFocusable(node) && node.constructor != HTMLIFrameElement) {
+                node.focus();
+                if (node.constructor == HTMLInputElement && node.select) {
+                    node.select();
+                }
+                return true;
+            }
+            node = node.parentNode;
+        }
+
+        return false;
+    };
+
+    /**
+     * Set focus to the first focusable node in the given list.
+     * select the text, otherwise it doesn't appear focused to the user.
+     * Every other control behaves normally if you just call focus() on it.
+     * @param {Array<Node>} nodeList An array of nodes to focus.
+     * @return {boolean} True if the node was focused.
+     */
+    CaretBrowsing.setFocusToFirstFocusable = function(nodeList) {
+        for (var i = 0; i < nodeList.length; i++) {
+            if (CaretBrowsing.setFocusToNode(nodeList[i])) {
+                return true;
+            }
+        }
+        return false;
+    };
+
+    /**
+     * Set the caret element's normal style, i.e. not when animating.
+     */
+    CaretBrowsing.setCaretElementNormalStyle = function() {
+        var element = CaretBrowsing.caretElement;
+        element.className = 'CaretBrowsing_Caret';
+        element.style.opacity = CaretBrowsing.isSelectionCollapsed ? '1.0' : '0.0';
+        element.style.left = CaretBrowsing.caretX + 'px';
+        element.style.top = CaretBrowsing.caretY + 'px';
+        element.style.width = CaretBrowsing.caretWidth + 'px';
+        element.style.height = CaretBrowsing.caretHeight + 'px';
+        element.style.color = CaretBrowsing.caretForeground;
+    };
+
+    /**
+     * Animate the caret element into the normal style.
+     */
+    CaretBrowsing.animateCaretElement = function() {
+        var element = CaretBrowsing.caretElement;
+        element.style.left = (CaretBrowsing.caretX - 50) + 'px';
+        element.style.top = (CaretBrowsing.caretY - 100) + 'px';
+        element.style.width = (CaretBrowsing.caretWidth + 100) + 'px';
+        element.style.height = (CaretBrowsing.caretHeight + 200) + 'px';
+        element.className = 'CaretBrowsing_AnimateCaret';
+
+        // Start the animation. The setTimeout is so that the old values will get
+        // applied first, so we can animate to the new values.
+        window.setTimeout(function() {
+            if (!CaretBrowsing.caretElement) {
+                return;
+            }
+            CaretBrowsing.setCaretElementNormalStyle();
+            element.style['transition'] = 'all 0.8s ease-in';
+            function listener() {
+                element.removeEventListener(
+                    'transitionend', listener, false);
+                element.style['transition'] = 'none';
+            }
+            element.addEventListener(
+                'transitionend', listener, false);
+        }, 0);
+    };
+
+    /**
+     * Quick flash and then show the normal caret style.
+     */
+    CaretBrowsing.flashCaretElement = function() {
+        var x = CaretBrowsing.caretX;
+        var y = CaretBrowsing.caretY;
+        var height = CaretBrowsing.caretHeight;
+
+        var vert = document.createElement('div');
+        vert.className = 'CaretBrowsing_FlashVert';
+        vert.style.left = (x - 6) + 'px';
+        vert.style.top = (y - 100) + 'px';
+        vert.style.width = '11px';
+        vert.style.height = (200) + 'px';
+        document.body.appendChild(vert);
+
+        window.setTimeout(function() {
+            document.body.removeChild(vert);
+            if (CaretBrowsing.caretElement) {
+                CaretBrowsing.setCaretElementNormalStyle();
+            }
+        }, 250);
+    };
+
+    /**
+     * Create the caret element. This assumes that caretX, caretY,
+     * caretWidth, and caretHeight have all been set. The caret is
+     * animated in so the user can find it when it first appears.
+     */
+    CaretBrowsing.createCaretElement = function() {
+        var element = document.createElement('div');
+        element.className = 'CaretBrowsing_Caret';
+        document.body.appendChild(element);
+        CaretBrowsing.caretElement = element;
+
+        if (CaretBrowsing.onEnable == 'anim') {
+            CaretBrowsing.animateCaretElement();
+        } else if (CaretBrowsing.onEnable == 'flash') {
+            CaretBrowsing.flashCaretElement();
+        } else {
+            CaretBrowsing.setCaretElementNormalStyle();
+        }
+    };
+
+    /**
+     * Recreate the caret element, triggering any intro animation.
+     */
+    CaretBrowsing.recreateCaretElement = function() {
+        if (CaretBrowsing.caretElement) {
+            window.clearInterval(CaretBrowsing.blinkFunctionId);
+            CaretBrowsing.caretElement.parentElement.removeChild(
+                CaretBrowsing.caretElement);
+            CaretBrowsing.caretElement = null;
+            CaretBrowsing.updateIsCaretVisible();
+        }
+    };
+
+    /**
+     * Get the rectangle for a cursor position. This is tricky because
+     * you can't get the bounding rectangle of an empty range, so this function
+     * computes the rect by trying a range including one character earlier or
+     * later than the cursor position.
+     * @param {Cursor} cursor A single cursor position.
+     * @return {{left: number, top: number, width: number, height: number}}
+     *     The bounding rectangle of the cursor.
+     */
+    CaretBrowsing.getCursorRect = function(cursor) {
+        var node = cursor.node;
+        var index = cursor.index;
+        var rect = {
+            left: 0,
+            top: 0,
+            width: 1,
+            height: 0
+        };
+        if (node.constructor == Text) {
+            var left = index;
+            var right = index;
+            var max = node.data.length;
+            var newRange = document.createRange();
+            while (left > 0 || right < max) {
+                if (left > 0) {
+                    left--;
+                    newRange.setStart(node, left);
+                    newRange.setEnd(node, index);
+                    var rangeRect = newRange.getBoundingClientRect();
+                    if (rangeRect && rangeRect.width && rangeRect.height) {
+                        rect.left = rangeRect.right;
+                        rect.top = rangeRect.top;
+                        rect.height = rangeRect.height;
+                        break;
+                    }
+                }
+                if (right < max) {
+                    right++;
+                    newRange.setStart(node, index);
+                    newRange.setEnd(node, right);
+                    var rangeRect = newRange.getBoundingClientRect();
+                    if (rangeRect && rangeRect.width && rangeRect.height) {
+                        rect.left = rangeRect.left;
+                        rect.top = rangeRect.top;
+                        rect.height = rangeRect.height;
+                        break;
+                    }
+                }
+            }
+        } else {
+            rect.height = node.offsetHeight;
+            while (node !== null) {
+                rect.left += node.offsetLeft;
+                rect.top += node.offsetTop;
+                node = node.offsetParent;
+            }
+        }
+        rect.left += window.pageXOffset;
+        rect.top += window.pageYOffset;
+        return rect;
+    };
+
+    /**
+     * Compute the new location of the caret or selection and update
+     * the element as needed.
+     * @param {boolean} scrollToSelection If true, will also scroll the page
+     *     to the caret / selection location.
+     */
+    CaretBrowsing.updateCaretOrSelection = function(scrollToSelection) {
+        var previousX = CaretBrowsing.caretX;
+        var previousY = CaretBrowsing.caretY;
+
+        var sel = window.getSelection();
+        if (sel.rangeCount == 0) {
+            if (CaretBrowsing.caretElement) {
+                CaretBrowsing.isSelectionCollapsed = false;
+                CaretBrowsing.caretElement.style.opacity = '0.0';
+            }
+            return;
+        }
+
+        var range = sel.getRangeAt(0);
+        if (!range) {
+            if (CaretBrowsing.caretElement) {
+                CaretBrowsing.isSelectionCollapsed = false;
+                CaretBrowsing.caretElement.style.opacity = '0.0';
+            }
+            return;
+        }
+
+        if (CaretBrowsing.isControlThatNeedsArrowKeys(document.activeElement)) {
+            var node = document.activeElement;
+            CaretBrowsing.caretWidth = node.offsetWidth;
+            CaretBrowsing.caretHeight = node.offsetHeight;
+            CaretBrowsing.caretX = 0;
+            CaretBrowsing.caretY = 0;
+            while (node.offsetParent) {
+                CaretBrowsing.caretX += node.offsetLeft;
+                CaretBrowsing.caretY += node.offsetTop;
+                node = node.offsetParent;
+            }
+            CaretBrowsing.isSelectionCollapsed = false;
+        } else if (range.startOffset != range.endOffset ||
+            range.startContainer != range.endContainer) {
+            var rect = range.getBoundingClientRect();
+            if (!rect) {
+                return;
+            }
+            CaretBrowsing.caretX = rect.left + window.pageXOffset;
+            CaretBrowsing.caretY = rect.top + window.pageYOffset;
+            CaretBrowsing.caretWidth = rect.width;
+            CaretBrowsing.caretHeight = rect.height;
+            CaretBrowsing.isSelectionCollapsed = false;
+        } else {
+            var rect = CaretBrowsing.getCursorRect(
+                new Cursor(range.startContainer,
+                    range.startOffset,
+                    TraverseUtil.getNodeText(range.startContainer)));
+            CaretBrowsing.caretX = rect.left;
+            CaretBrowsing.caretY = rect.top;
+            CaretBrowsing.caretWidth = rect.width;
+            CaretBrowsing.caretHeight = rect.height;
+            CaretBrowsing.isSelectionCollapsed = true;
+        }
+
+        if (!CaretBrowsing.caretElement) {
+            CaretBrowsing.createCaretElement();
+        } else {
+            var element = CaretBrowsing.caretElement;
+            if (CaretBrowsing.isSelectionCollapsed) {
+                element.style.opacity = '1.0';
+                element.style.left = CaretBrowsing.caretX + 'px';
+                element.style.top = CaretBrowsing.caretY + 'px';
+                element.style.width = CaretBrowsing.caretWidth + 'px';
+                element.style.height = CaretBrowsing.caretHeight + 'px';
+            } else {
+                element.style.opacity = '0.0';
+            }
+        }
+
+        var elem = range.startContainer;
+        if (elem.constructor == Text)
+            elem = elem.parentElement;
+        var style = window.getComputedStyle(elem);
+        var bg = axs.utils.getBgColor(style, elem);
+        var fg = axs.utils.getFgColor(style, elem, bg);
+        CaretBrowsing.caretBackground = axs.color.colorToString(bg);
+        CaretBrowsing.caretForeground = axs.color.colorToString(fg);
+
+        if (scrollToSelection) {
+            // Scroll just to the "focus" position of the selection,
+            // the part the user is manipulating.
+            var rect = CaretBrowsing.getCursorRect(
+                new Cursor(sel.focusNode, sel.focusOffset,
+                    TraverseUtil.getNodeText(sel.focusNode)));
+
+            var yscroll = window.pageYOffset;
+            var pageHeight = window.innerHeight;
+            var caretY = rect.top;
+            var caretHeight = Math.min(rect.height, 30);
+            if (yscroll + pageHeight < caretY + caretHeight) {
+                window.scroll(0, (caretY + caretHeight - pageHeight + 100));
+            } else if (caretY < yscroll) {
+                window.scroll(0, (caretY - 100));
+            }
+        }
+
+        if (Math.abs(previousX - CaretBrowsing.caretX) > 500 ||
+            Math.abs(previousY - CaretBrowsing.caretY) > 100) {
+            if (CaretBrowsing.onJump == 'anim') {
+                CaretBrowsing.animateCaretElement();
+            } else if (CaretBrowsing.onJump == 'flash') {
+                CaretBrowsing.flashCaretElement();
+            }
+        }
+    };
+
+    /**
+     * Return true if the selection directionality is ambiguous, which happens
+     * if, for example, the user double-clicks in the middle of a word to select
+     * it. In that case, the selection should extend by the right edge if the
+     * user presses right, and by the left edge if the user presses left.
+     * @param {Selection} sel The selection.
+     * @return {boolean} True if the selection directionality is ambiguous.
+     */
+    CaretBrowsing.isAmbiguous = function(sel) {
+        return (sel.anchorNode != sel.baseNode ||
+            sel.anchorOffset != sel.baseOffset ||
+            sel.focusNode != sel.extentNode ||
+            sel.focusOffset != sel.extentOffset);
+    };
+
+    /**
+     * Create a Cursor from the anchor position of the selection, the
+     * part that doesn't normally move.
+     * @param {Selection} sel The selection.
+     * @return {Cursor} A cursor pointing to the selection's anchor location.
+     */
+    CaretBrowsing.makeAnchorCursor = function(sel) {
+        return new Cursor(sel.anchorNode, sel.anchorOffset,
+            TraverseUtil.getNodeText(sel.anchorNode));
+    };
+
+    /**
+     * Create a Cursor from the focus position of the selection.
+     * @param {Selection} sel The selection.
+     * @return {Cursor} A cursor pointing to the selection's focus location.
+     */
+    CaretBrowsing.makeFocusCursor = function(sel) {
+        return new Cursor(sel.focusNode, sel.focusOffset,
+            TraverseUtil.getNodeText(sel.focusNode));
+    };
+
+    /**
+     * Create a Cursor from the left boundary of the selection - the boundary
+     * closer to the start of the document.
+     * @param {Selection} sel The selection.
+     * @return {Cursor} A cursor pointing to the selection's left boundary.
+     */
+    CaretBrowsing.makeLeftCursor = function(sel) {
+        var range = sel.rangeCount == 1 ? sel.getRangeAt(0) : null;
+        if (range &&
+            range.endContainer == sel.anchorNode &&
+            range.endOffset == sel.anchorOffset) {
+            return CaretBrowsing.makeFocusCursor(sel);
+        } else {
+            return CaretBrowsing.makeAnchorCursor(sel);
+        }
+    };
+
+    /**
+     * Create a Cursor from the right boundary of the selection - the boundary
+     * closer to the end of the document.
+     * @param {Selection} sel The selection.
+     * @return {Cursor} A cursor pointing to the selection's right boundary.
+     */
+    CaretBrowsing.makeRightCursor = function(sel) {
+        var range = sel.rangeCount == 1 ? sel.getRangeAt(0) : null;
+        if (range &&
+            range.endContainer == sel.anchorNode &&
+            range.endOffset == sel.anchorOffset) {
+            return CaretBrowsing.makeAnchorCursor(sel);
+        } else {
+            return CaretBrowsing.makeFocusCursor(sel);
+        }
+    };
+
+    /**
+     * Try to set the window's selection to be between the given start and end
+     * cursors, and return whether or not it was successful.
+     * @param {Cursor} start The start position.
+     * @param {Cursor} end The end position.
+     * @return {boolean} True if the selection was successfully set.
+     */
+    CaretBrowsing.setAndValidateSelection = function(start, end) {
+        var sel = window.getSelection();
+        sel.setBaseAndExtent(start.node, start.index, end.node, end.index);
+
+        if (sel.rangeCount != 1) {
+            return false;
+        }
+
+        return (sel.anchorNode == start.node &&
+            sel.anchorOffset == start.index &&
+            sel.focusNode == end.node &&
+            sel.focusOffset == end.index);
+    };
+
+    /**
+     * Note: the built-in function by the same name is unreliable.
+     * @param {Selection} sel The selection.
+     * @return {boolean} True if the start and end positions are the same.
+     */
+    CaretBrowsing.isCollapsed = function(sel) {
+        return (sel.anchorOffset == sel.focusOffset &&
+            sel.anchorNode == sel.focusNode);
+    };
+
+    /**
+     * Determines if the modifier key is held down that should cause
+     * the cursor to move by word rather than by character.
+     * @param {Event} evt A keyboard event.
+     * @return {boolean} True if the cursor should move by word.
+     */
+    CaretBrowsing.isMoveByWordEvent = function(evt) {
+        if (CaretBrowsing.isMac) {
+            return evt.altKey;
+        } else {
+            return evt.ctrlKey;
+        }
+    };
+
+    /**
+     * Moves the cursor forwards to the next valid position.
+     * @param {Cursor} cursor The current cursor location.
+     *     On exit, the cursor will be at the next position.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @return {?string} The character reached, or null if the bottom of the
+     *     document has been reached.
+     */
+    CaretBrowsing.forwards = function(cursor, nodesCrossed) {
+        var previousCursor = cursor.clone();
+        var result = TraverseUtil.forwardsChar(cursor, nodesCrossed);
+
+        // Work around the fact that TraverseUtil.forwardsChar returns once per
+        // char in a block of text, rather than once per possible selection
+        // position in a block of text.
+        if (result && cursor.node != previousCursor.node && cursor.index > 0) {
+            cursor.index = 0;
+        }
+
+        return result;
+    };
+
+    /**
+     * Moves the cursor backwards to the previous valid position.
+     * @param {Cursor} cursor The current cursor location.
+     *     On exit, the cursor will be at the previous position.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @return {?string} The character reached, or null if the top of the
+     *     document has been reached.
+     */
+    CaretBrowsing.backwards = function(cursor, nodesCrossed) {
+        var previousCursor = cursor.clone();
+        var result = TraverseUtil.backwardsChar(cursor, nodesCrossed);
+
+        // Work around the fact that TraverseUtil.backwardsChar returns once per
+        // char in a block of text, rather than once per possible selection
+        // position in a block of text.
+        if (result &&
+            cursor.node != previousCursor.node &&
+            cursor.index < cursor.text.length) {
+            cursor.index = cursor.text.length;
+        }
+
+        return result;
+    };
+
+    /**
+     * Called when the user presses the right arrow. If there's a selection,
+     * moves the cursor to the end of the selection range. If it's a cursor,
+     * moves past one character.
+     * @param {Event} evt The DOM event.
+     * @return {boolean} True if the default action should be performed.
+     */
+    CaretBrowsing.moveRight = function(evt) {
+        CaretBrowsing.targetX = null;
+
+        var sel = window.getSelection();
+        if (!evt.shiftKey && !CaretBrowsing.isCollapsed(sel)) {
+            var right = CaretBrowsing.makeRightCursor(sel);
+            CaretBrowsing.setAndValidateSelection(right, right);
+            return false;
+        }
+
+        var start = CaretBrowsing.isAmbiguous(sel) ?
+            CaretBrowsing.makeLeftCursor(sel) :
+            CaretBrowsing.makeAnchorCursor(sel);
+        var end = CaretBrowsing.isAmbiguous(sel) ?
+            CaretBrowsing.makeRightCursor(sel) :
+            CaretBrowsing.makeFocusCursor(sel);
+        var previousEnd = end.clone();
+        var nodesCrossed = [];
+        while (true) {
+            var result;
+            if (CaretBrowsing.isMoveByWordEvent(evt)) {
+                result = TraverseUtil.getNextWord(previousEnd, end, nodesCrossed);
+            } else {
+                previousEnd = end.clone();
+                result = CaretBrowsing.forwards(end, nodesCrossed);
+            }
+
+            if (result === null) {
+                return CaretBrowsing.moveLeft(evt);
+            }
+
+            if (CaretBrowsing.setAndValidateSelection(
+                evt.shiftKey ? start : end, end)) {
+                break;
+            }
+        }
+
+        if (!evt.shiftKey) {
+            nodesCrossed.push(end.node);
+            CaretBrowsing.setFocusToFirstFocusable(nodesCrossed);
+        }
+
+        return false;
+    };
+
+    /**
+     * Called when the user presses the left arrow. If there's a selection,
+     * moves the cursor to the start of the selection range. If it's a cursor,
+     * moves backwards past one character.
+     * @param {Event} evt The DOM event.
+     * @return {boolean} True if the default action should be performed.
+     */
+    CaretBrowsing.moveLeft = function(evt) {
+        CaretBrowsing.targetX = null;
+
+        var sel = window.getSelection();
+        if (!evt.shiftKey && !CaretBrowsing.isCollapsed(sel)) {
+            var left = CaretBrowsing.makeLeftCursor(sel);
+            CaretBrowsing.setAndValidateSelection(left, left);
+            return false;
+        }
+
+        var start = CaretBrowsing.isAmbiguous(sel) ?
+            CaretBrowsing.makeLeftCursor(sel) :
+            CaretBrowsing.makeFocusCursor(sel);
+        var end = CaretBrowsing.isAmbiguous(sel) ?
+            CaretBrowsing.makeRightCursor(sel) :
+            CaretBrowsing.makeAnchorCursor(sel);
+        var previousStart = start.clone();
+        var nodesCrossed = [];
+        while (true) {
+            var result;
+            if (CaretBrowsing.isMoveByWordEvent(evt)) {
+                result = TraverseUtil.getPreviousWord(
+                    start, previousStart, nodesCrossed);
+            } else {
+                previousStart = start.clone();
+                result = CaretBrowsing.backwards(start, nodesCrossed);
+            }
+
+            if (result === null) {
+                break;
+            }
+
+            if (CaretBrowsing.setAndValidateSelection(
+                evt.shiftKey ? end : start, start)) {
+                break;
+            }
+        }
+
+        if (!evt.shiftKey) {
+            nodesCrossed.push(start.node);
+            CaretBrowsing.setFocusToFirstFocusable(nodesCrossed);
+        }
+
+        return false;
+    };
+
+
+    /**
+     * Called when the user presses the down arrow. If there's a selection,
+     * moves the cursor to the end of the selection range. If it's a cursor,
+     * attempts to move to the equivalent horizontal pixel position in the
+     * subsequent line of text. If this is impossible, go to the first character
+     * of the next line.
+     * @param {Event} evt The DOM event.
+     * @return {boolean} True if the default action should be performed.
+     */
+    CaretBrowsing.moveDown = function(evt) {
+        var sel = window.getSelection();
+        if (!evt.shiftKey && !CaretBrowsing.isCollapsed(sel)) {
+            var right = CaretBrowsing.makeRightCursor(sel);
+            CaretBrowsing.setAndValidateSelection(right, right);
+            return false;
+        }
+
+        var start = CaretBrowsing.isAmbiguous(sel) ?
+            CaretBrowsing.makeLeftCursor(sel) :
+            CaretBrowsing.makeAnchorCursor(sel);
+        var end = CaretBrowsing.isAmbiguous(sel) ?
+            CaretBrowsing.makeRightCursor(sel) :
+            CaretBrowsing.makeFocusCursor(sel);
+        var endRect = CaretBrowsing.getCursorRect(end);
+        if (CaretBrowsing.targetX === null) {
+            CaretBrowsing.targetX = endRect.left;
+        }
+        var previousEnd = end.clone();
+        var leftPos = end.clone();
+        var rightPos = end.clone();
+        var bestPos = null;
+        var bestY = null;
+        var bestDelta = null;
+        var bestHeight = null;
+        var nodesCrossed = [];
+        var y = -1;
+        while (true) {
+            if (null === CaretBrowsing.forwards(rightPos, nodesCrossed)) {
+                if (CaretBrowsing.setAndValidateSelection(
+                    evt.shiftKey ? start : leftPos, leftPos)) {
+                    break;
+                } else {
+                    return CaretBrowsing.moveLeft(evt);
+                }
+                break;
+            }
+            var range = document.createRange();
+            range.setStart(leftPos.node, leftPos.index);
+            range.setEnd(rightPos.node, rightPos.index);
+            var rect = range.getBoundingClientRect();
+            if (rect && rect.width < rect.height) {
+                y = rect.top + window.pageYOffset;
+
+                // Return the best match so far if we get half a line past the best.
+                if (bestY != null && y > bestY + bestHeight / 2) {
+                    if (CaretBrowsing.setAndValidateSelection(
+                        evt.shiftKey ? start : bestPos, bestPos)) {
+                        break;
+                    } else {
+                        bestY = null;
+                    }
+                }
+
+                // Stop here if we're an entire line the wrong direction
+                // (for example, we reached the top of the next column).
+                if (y < endRect.top - endRect.height) {
+                    if (CaretBrowsing.setAndValidateSelection(
+                        evt.shiftKey ? start : leftPos, leftPos)) {
+                        break;
+                    }
+                }
+
+                // Otherwise look to see if this current position is on the
+                // next line and better than the previous best match, if any.
+                if (y >= endRect.top + endRect.height) {
+                    var deltaLeft = Math.abs(CaretBrowsing.targetX - rect.left);
+                    if ((bestDelta == null || deltaLeft < bestDelta) &&
+                        (leftPos.node != end.node || leftPos.index != end.index)) {
+                        bestPos = leftPos.clone();
+                        bestY = y;
+                        bestDelta = deltaLeft;
+                        bestHeight = rect.height;
+                    }
+                    var deltaRight = Math.abs(CaretBrowsing.targetX - rect.right);
+                    if (bestDelta == null || deltaRight < bestDelta) {
+                        bestPos = rightPos.clone();
+                        bestY = y;
+                        bestDelta = deltaRight;
+                        bestHeight = rect.height;
+                    }
+
+                    // Return the best match so far if the deltas are getting worse,
+                    // not better.
+                    if (bestDelta != null &&
+                        deltaLeft > bestDelta &&
+                        deltaRight > bestDelta) {
+                        if (CaretBrowsing.setAndValidateSelection(
+                            evt.shiftKey ? start : bestPos, bestPos)) {
+                            break;
+                        } else {
+                            bestY = null;
+                        }
+                    }
+                }
+            }
+            leftPos = rightPos.clone();
+        }
+
+        if (!evt.shiftKey) {
+            CaretBrowsing.setFocusToNode(leftPos.node);
+        }
+
+        return false;
+    };
+
+    /**
+     * Called when the user presses the up arrow. If there's a selection,
+     * moves the cursor to the start of the selection range. If it's a cursor,
+     * attempts to move to the equivalent horizontal pixel position in the
+     * previous line of text. If this is impossible, go to the last character
+     * of the previous line.
+     * @param {Event} evt The DOM event.
+     * @return {boolean} True if the default action should be performed.
+     */
+    CaretBrowsing.moveUp = function(evt) {
+        var sel = window.getSelection();
+        if (!evt.shiftKey && !CaretBrowsing.isCollapsed(sel)) {
+            var left = CaretBrowsing.makeLeftCursor(sel);
+            CaretBrowsing.setAndValidateSelection(left, left);
+            return false;
+        }
+
+        var start = CaretBrowsing.isAmbiguous(sel) ?
+            CaretBrowsing.makeLeftCursor(sel) :
+            CaretBrowsing.makeFocusCursor(sel);
+        var end = CaretBrowsing.isAmbiguous(sel) ?
+            CaretBrowsing.makeRightCursor(sel) :
+            CaretBrowsing.makeAnchorCursor(sel);
+        var startRect = CaretBrowsing.getCursorRect(start);
+        if (CaretBrowsing.targetX === null) {
+            CaretBrowsing.targetX = startRect.left;
+        }
+        var previousStart = start.clone();
+        var leftPos = start.clone();
+        var rightPos = start.clone();
+        var bestPos = null;
+        var bestY = null;
+        var bestDelta = null;
+        var bestHeight = null;
+        var nodesCrossed = [];
+        var y = 999999;
+        while (true) {
+            if (null === CaretBrowsing.backwards(leftPos, nodesCrossed)) {
+                CaretBrowsing.setAndValidateSelection(
+                    evt.shiftKey ? end : rightPos, rightPos);
+                break;
+            }
+            var range = document.createRange();
+            range.setStart(leftPos.node, leftPos.index);
+            range.setEnd(rightPos.node, rightPos.index);
+            var rect = range.getBoundingClientRect();
+            if (rect && rect.width < rect.height) {
+                y = rect.top + window.pageYOffset;
+
+                // Return the best match so far if we get half a line past the best.
+                if (bestY != null && y < bestY - bestHeight / 2) {
+                    if (CaretBrowsing.setAndValidateSelection(
+                        evt.shiftKey ? end : bestPos, bestPos)) {
+                        break;
+                    } else {
+                        bestY = null;
+                    }
+                }
+
+                // Exit if we're an entire line the wrong direction
+                // (for example, we reached the bottom of the previous column.)
+                if (y > startRect.top + startRect.height) {
+                    if (CaretBrowsing.setAndValidateSelection(
+                        evt.shiftKey ? end : rightPos, rightPos)) {
+                        break;
+                    }
+                }
+
+                // Otherwise look to see if this current position is on the
+                // next line and better than the previous best match, if any.
+                if (y <= startRect.top - startRect.height) {
+                    var deltaLeft = Math.abs(CaretBrowsing.targetX - rect.left);
+                    if (bestDelta == null || deltaLeft < bestDelta) {
+                        bestPos = leftPos.clone();
+                        bestY = y;
+                        bestDelta = deltaLeft;
+                        bestHeight = rect.height;
+                    }
+                    var deltaRight = Math.abs(CaretBrowsing.targetX - rect.right);
+                    if ((bestDelta == null || deltaRight < bestDelta) &&
+                        (rightPos.node != start.node || rightPos.index != start.index)) {
+                        bestPos = rightPos.clone();
+                        bestY = y;
+                        bestDelta = deltaRight;
+                        bestHeight = rect.height;
+                    }
+
+                    // Return the best match so far if the deltas are getting worse,
+                    // not better.
+                    if (bestDelta != null &&
+                        deltaLeft > bestDelta &&
+                        deltaRight > bestDelta) {
+                        if (CaretBrowsing.setAndValidateSelection(
+                            evt.shiftKey ? end : bestPos, bestPos)) {
+                            break;
+                        } else {
+                            bestY = null;
+                        }
+                    }
+                }
+            }
+            rightPos = leftPos.clone();
+        }
+
+        if (!evt.shiftKey) {
+            CaretBrowsing.setFocusToNode(rightPos.node);
+        }
+
+        return false;
+    };
+
+    /**
+     * Set the document's selection to surround a control, so that the next
+     * arrow key they press will allow them to explore the content before
+     * or after a given control.
+     * @param {Node} control The control to escape from.
+     */
+    CaretBrowsing.escapeFromControl = function(control) {
+        control.blur();
+
+        var start = new Cursor(control, 0, '');
+        var previousStart = start.clone();
+        var end = new Cursor(control, 0, '');
+        var previousEnd = end.clone();
+
+        var nodesCrossed = [];
+        while (true) {
+            if (null === CaretBrowsing.backwards(start, nodesCrossed)) {
+                break;
+            }
+
+            var r = document.createRange();
+            r.setStart(start.node, start.index);
+            r.setEnd(previousStart.node, previousStart.index);
+            if (r.getBoundingClientRect()) {
+                break;
+            }
+            previousStart = start.clone();
+        }
+        while (true) {
+            if (null === CaretBrowsing.forwards(end, nodesCrossed)) {
+                break;
+            }
+            if (isDescendantOfNode(end.node, control)) {
+                previousEnd = end.clone();
+                continue;
+            }
+
+            var r = document.createRange();
+            r.setStart(previousEnd.node, previousEnd.index);
+            r.setEnd(end.node, end.index);
+            if (r.getBoundingClientRect()) {
+                break;
+            }
+        }
+
+        if (!isDescendantOfNode(previousStart.node, control)) {
+            start = previousStart.clone();
+        }
+
+        if (!isDescendantOfNode(previousEnd.node, control)) {
+            end = previousEnd.clone();
+        }
+
+        CaretBrowsing.setAndValidateSelection(start, end);
+
+        window.setTimeout(function() {
+            CaretBrowsing.updateCaretOrSelection(true);
+        }, 0);
+    };
+
+    /**
+     * Toggle whether caret browsing is enabled or not.
+     */
+    CaretBrowsing.toggle = function() {
+        if (CaretBrowsing.forceEnabled) {
+            CaretBrowsing.recreateCaretElement();
+            return;
+        }
+
+        CaretBrowsing.isEnabled = !CaretBrowsing.isEnabled;
+        var obj = {};
+        obj['enabled'] = CaretBrowsing.isEnabled;
+        CaretBrowsing.updateIsCaretVisible();
+    };
+
+    /**
+     * Event handler, called when a key is pressed.
+     * @param {Event} evt The DOM event.
+     * @return {boolean} True if the default action should be performed.
+     */
+    CaretBrowsing.onKeyDown = function(evt) {
+        if (evt.defaultPrevented) {
+            return;
+        }
+
+        if (evt.keyCode == 118) {  // F7
+            CaretBrowsing.toggle();
+        }
+
+        if (!CaretBrowsing.isEnabled) {
+            return true;
+        }
+
+        if (evt.target && CaretBrowsing.isControlThatNeedsArrowKeys(
+            /** @type (Node) */(evt.target))) {
+            if (evt.keyCode == 27) {
+                CaretBrowsing.escapeFromControl(/** @type {Node} */(evt.target));
+                evt.preventDefault();
+                evt.stopPropagation();
+                return false;
+            } else {
+                return true;
+            }
+        }
+
+        // If the current selection doesn't have a range, try to escape out of
+        // the current control. If that fails, return so we don't fail whe
+        // trying to move the cursor or selection.
+        var sel = window.getSelection();
+        if (sel.rangeCount == 0) {
+            if (document.activeElement) {
+                CaretBrowsing.escapeFromControl(document.activeElement);
+                sel = window.getSelection();
+            }
+
+            if (sel.rangeCount == 0) {
+                return true;
+            }
+        }
+
+        if (CaretBrowsing.caretElement) {
+            CaretBrowsing.caretElement.style.visibility = 'visible';
+            CaretBrowsing.blinkFlag = true;
+        }
+
+        var result = true;
+        switch (evt.keyCode) {
+            case 37:
+                result = CaretBrowsing.moveLeft(evt);
+                break;
+            case 38:
+                result = CaretBrowsing.moveUp(evt);
+                break;
+            case 39:
+                result = CaretBrowsing.moveRight(evt);
+                break;
+            case 40:
+                result = CaretBrowsing.moveDown(evt);
+                break;
+        }
+
+        if (result == false) {
+            evt.preventDefault();
+            evt.stopPropagation();
+        }
+
+        window.setTimeout(function() {
+            CaretBrowsing.updateCaretOrSelection(result == false);
+        }, 0);
+
+        return result;
+    };
+
+    /**
+     * Event handler, called when the mouse is clicked. Chrome already
+     * sets the selection when the mouse is clicked, all we need to do is
+     * update our cursor.
+     * @param {Event} evt The DOM event.
+     * @return {boolean} True if the default action should be performed.
+     */
+    CaretBrowsing.onClick = function(evt) {
+        if (!CaretBrowsing.isEnabled) {
+            return true;
+        }
+        window.setTimeout(function() {
+            CaretBrowsing.targetX = null;
+            CaretBrowsing.updateCaretOrSelection(false);
+        }, 0);
+        return true;
+    };
+
+    /**
+     * Called at a regular interval. Blink the cursor by changing its visibility.
+     */
+    CaretBrowsing.caretBlinkFunction = function() {
+        if (CaretBrowsing.caretElement) {
+            if (CaretBrowsing.blinkFlag) {
+                CaretBrowsing.caretElement.style.backgroundColor =
+                    CaretBrowsing.caretForeground;
+                CaretBrowsing.blinkFlag = false;
+            } else {
+                CaretBrowsing.caretElement.style.backgroundColor =
+                    CaretBrowsing.caretBackground;
+                CaretBrowsing.blinkFlag = true;
+            }
+        }
+    };
+
+    /**
+     * Update whether or not the caret is visible, based on whether caret browsing
+     * is enabled and whether this window / iframe has focus.
+     */
+    CaretBrowsing.updateIsCaretVisible = function() {
+        CaretBrowsing.isCaretVisible =
+            (CaretBrowsing.isEnabled && CaretBrowsing.isWindowFocused);
+        if (CaretBrowsing.isCaretVisible && !CaretBrowsing.caretElement) {
+            CaretBrowsing.setInitialCursor();
+            CaretBrowsing.updateCaretOrSelection(true);
+            if (CaretBrowsing.caretElement) {
+                CaretBrowsing.blinkFunctionId = window.setInterval(
+                    CaretBrowsing.caretBlinkFunction, 500);
+            }
+        } else if (!CaretBrowsing.isCaretVisible &&
+            CaretBrowsing.caretElement) {
+            window.clearInterval(CaretBrowsing.blinkFunctionId);
+            if (CaretBrowsing.caretElement) {
+                CaretBrowsing.isSelectionCollapsed = false;
+                CaretBrowsing.caretElement.parentElement.removeChild(
+                    CaretBrowsing.caretElement);
+                CaretBrowsing.caretElement = null;
+            }
+        }
+    };
+
+    /**
+     * Called when the prefs get updated.
+     */
+    /**
+     * Called when this window / iframe gains focus.
+     */
+    CaretBrowsing.onWindowFocus = function() {
+        CaretBrowsing.isWindowFocused = true;
+        CaretBrowsing.updateIsCaretVisible();
+    };
+
+    /**
+     * Called when this window / iframe loses focus.
+     */
+    CaretBrowsing.onWindowBlur = function() {
+        CaretBrowsing.isWindowFocused = false;
+        CaretBrowsing.updateIsCaretVisible();
+    };
+
+    /**
+     * Initializes caret browsing by adding event listeners and extension
+     * message listeners.
+     */
+    CaretBrowsing.init = function() {
+        CaretBrowsing.isWindowFocused = document.hasFocus();
+
+        document.addEventListener('keydown', CaretBrowsing.onKeyDown, false);
+        document.addEventListener('click', CaretBrowsing.onClick, false);
+        window.addEventListener('focus', CaretBrowsing.onWindowFocus, false);
+        window.addEventListener('blur', CaretBrowsing.onWindowBlur, false);
+    };
+
+    window.setTimeout(function() {
+
+        // Make sure the script only loads once.
+        if (!window['caretBrowsingLoaded']) {
+            window['caretBrowsingLoaded'] = true;
+            CaretBrowsing.init();
+
+            if (document.body.getAttribute('caretbrowsing') == 'on') {
+                CaretBrowsing.forceEnabled = true;
+                CaretBrowsing.isEnabled = true;
+                CaretBrowsing.updateIsCaretVisible();
+            }
+
+        }
+
+    }, 0);
+
+    return funcs;
+})();
diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py
index cd35913ad..9207ec79c 100644
--- a/qutebrowser/keyinput/modeman.py
+++ b/qutebrowser/keyinput/modeman.py
@@ -267,10 +267,6 @@ class ModeManager(QObject):
                  usertypes.KeyMode.yesno, usertypes.KeyMode.prompt]:
             raise cmdexc.CommandError(
                 "Mode {} can't be entered manually!".format(mode))
-        elif (m == usertypes.KeyMode.caret and
-              objects.backend == usertypes.Backend.QtWebEngine):
-            raise cmdexc.CommandError("Caret mode is not supported with "
-                                      "QtWebEngine yet.")
 
         self.enter(m, 'command')
 

From 82b1bd10ecf9c4b3d2b6d36cc143efbac6225ec2 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Mon, 20 Nov 2017 17:49:42 +0600
Subject: [PATCH 002/574] Add some movement caret actions

---
 qutebrowser/browser/webengine/webenginetab.py |  45 +++++---
 qutebrowser/javascript/webengine_caret.js     | 105 ++++++++++++++----
 2 files changed, 114 insertions(+), 36 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 3a779f480..fd23bca0b 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -179,39 +179,56 @@ class WebEngineCaret(browsertab.AbstractCaret):
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_entered(self, mode):
-        js_code = javascript.assemble('caret', 'setInitialCursor')
-        self._tab.run_js_async(js_code)
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'setInitialCursor'))
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_left(self):
-        pass
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'toggle'))
 
     def move_to_next_line(self, count=1):
-        log.stub()
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveDown'))
 
     def move_to_prev_line(self, count=1):
-        log.stub()
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveUp'))
 
     def move_to_next_char(self, count=1):
-        log.stub()
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveRight'))
 
     def move_to_prev_char(self, count=1):
-        log.stub()
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveLeft'))
 
     def move_to_end_of_word(self, count=1):
-        log.stub()
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveToEndOfWord'))
 
     def move_to_next_word(self, count=1):
-        log.stub()
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveToNextWord'))
 
     def move_to_prev_word(self, count=1):
-        log.stub()
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveToPreviousWord'))
 
     def move_to_start_of_line(self):
-        log.stub()
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'moveToStartOfLine'))
 
     def move_to_end_of_line(self):
-        log.stub()
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'moveToEndOfLine'))
 
     def move_to_start_of_next_block(self, count=1):
         log.stub()
@@ -232,7 +249,8 @@ class WebEngineCaret(browsertab.AbstractCaret):
         log.stub()
 
     def toggle_selection(self):
-        log.stub()
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'toggleSelection'))
 
     def drop_selection(self):
         log.stub()
@@ -287,7 +305,6 @@ class WebEngineCaret(browsertab.AbstractCaret):
             self._tab.run_js_async(js_code, lambda jsret:
                                    self._follow_selected_cb(jsret, tab))
 
-
 class WebEngineScroller(browsertab.AbstractScroller):
 
     """QtWebEngine implementations related to scrolling."""
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 4aa792510..1796e73c5 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1076,7 +1076,15 @@ window._qutebrowser.caret = (function() {
      * first text character in the document.
      */
     funcs.setInitialCursor = () => {
-        CaretBrowsing.setInitialCursor();
+        if (!CaretBrowsing.initiated) {
+            CaretBrowsing.setInitialCursor();
+        } else {
+            CaretBrowsing.toggle();
+        }
+    }
+
+    funcs.toggle = () => {
+        CaretBrowsing.toggle();
     }
 
     CaretBrowsing.setInitialCursor = function() {
@@ -1094,6 +1102,8 @@ window._qutebrowser.caret = (function() {
         }
         CaretBrowsing.setAndValidateSelection(start, start);
         CaretBrowsing.toggle();
+        CaretBrowsing.initiated = true;
+        CaretBrowsing.selectionEnabled = false;
     };
 
     /**
@@ -1534,11 +1544,7 @@ window._qutebrowser.caret = (function() {
      * @return {boolean} True if the cursor should move by word.
      */
     CaretBrowsing.isMoveByWordEvent = function(evt) {
-        if (CaretBrowsing.isMac) {
-            return evt.altKey;
-        } else {
-            return evt.ctrlKey;
-        }
+        return evt.ctrlKey;
     };
 
     /**
@@ -1589,6 +1595,75 @@ window._qutebrowser.caret = (function() {
         return result;
     };
 
+    funcs.moveRight = () => {
+        var evt = Object.assign({}, document.activeElement);
+        evt.keyCode = 39;
+        CaretBrowsing.onKeyDown(evt);
+    }
+
+    funcs.moveLeft = () => {
+        var evt = Object.assign({}, document.activeElement);
+        evt.keyCode = 37;
+        CaretBrowsing.onKeyDown(evt);
+    }
+
+    funcs.moveDown = () => {
+        var evt = Object.assign({}, document.activeElement);
+        evt.keyCode = 40;
+        CaretBrowsing.onKeyDown(evt);
+    }
+
+    funcs.moveUp = () => {
+        var evt = Object.assign({}, document.activeElement);
+        evt.keyCode = 38;
+        CaretBrowsing.onKeyDown(evt);
+    }
+
+    funcs.moveToEndOfWord = () => {
+        funcs.moveToNextWord();
+        funcs.moveLeft();
+    }
+
+    funcs.moveToNextWord = () => {
+        var evt = Object.assign({}, document.activeElement);
+        evt.keyCode = 39;
+        evt.ctrlKey = true;
+        CaretBrowsing.onKeyDown(evt);
+        funcs.moveRight();
+    }
+
+    funcs.moveToPreviousWord = () => {
+        var evt = Object.assign({}, document.activeElement);
+        evt.keyCode = 37;
+        evt.ctrlKey = true;
+        CaretBrowsing.onKeyDown(evt);
+    }
+
+    funcs.moveToStartOfLine = () => {
+        CaretBrowsing.moveToLineBoundary('left');
+    }
+
+    funcs.moveToEndOfLine = () => {
+        CaretBrowsing.moveToLineBoundary('right');
+    }
+
+    CaretBrowsing.moveToLineBoundary = function(side) {
+        window
+            .getSelection()
+            .modify(
+                CaretBrowsing.selectionEnabled ? 'extend' : 'move', 
+                side, 
+                'lineboundary');
+
+        window.setTimeout(function() {
+            CaretBrowsing.updateCaretOrSelection(true);
+        }, 0);
+    };
+
+    funcs.toggleSelection = () => {
+        CaretBrowsing.selectionEnabled = !CaretBrowsing.selectionEnabled;
+    }
+
     /**
      * Called when the user presses the right arrow. If there's a selection,
      * moves the cursor to the end of the selection range. If it's a cursor,
@@ -2002,24 +2077,15 @@ window._qutebrowser.caret = (function() {
      * @return {boolean} True if the default action should be performed.
      */
     CaretBrowsing.onKeyDown = function(evt) {
-        if (evt.defaultPrevented) {
-            return;
-        }
-
-        if (evt.keyCode == 118) {  // F7
-            CaretBrowsing.toggle();
-        }
-
         if (!CaretBrowsing.isEnabled) {
             return true;
         }
 
+        evt.shiftKey = CaretBrowsing.selectionEnabled;
         if (evt.target && CaretBrowsing.isControlThatNeedsArrowKeys(
             /** @type (Node) */(evt.target))) {
             if (evt.keyCode == 27) {
                 CaretBrowsing.escapeFromControl(/** @type {Node} */(evt.target));
-                evt.preventDefault();
-                evt.stopPropagation();
                 return false;
             } else {
                 return true;
@@ -2062,11 +2128,6 @@ window._qutebrowser.caret = (function() {
                 break;
         }
 
-        if (result == false) {
-            evt.preventDefault();
-            evt.stopPropagation();
-        }
-
         window.setTimeout(function() {
             CaretBrowsing.updateCaretOrSelection(result == false);
         }, 0);
@@ -2161,7 +2222,7 @@ window._qutebrowser.caret = (function() {
     CaretBrowsing.init = function() {
         CaretBrowsing.isWindowFocused = document.hasFocus();
 
-        document.addEventListener('keydown', CaretBrowsing.onKeyDown, false);
+        // document.addEventListener('keydown', CaretBrowsing.onKeyDown, false);
         document.addEventListener('click', CaretBrowsing.onClick, false);
         window.addEventListener('focus', CaretBrowsing.onWindowFocus, false);
         window.addEventListener('blur', CaretBrowsing.onWindowBlur, false);

From 8aca37e5d515bf9d1e5c1a2a310d6ca2745e482e Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Tue, 21 Nov 2017 19:56:00 +0600
Subject: [PATCH 003/574] Implement all caret browsing methods

---
 qutebrowser/browser/webengine/webenginetab.py | 18 ++--
 qutebrowser/javascript/webengine_caret.js     | 98 ++++++++++++-------
 2 files changed, 76 insertions(+), 40 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index fd23bca0b..03cf267ea 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -231,22 +231,28 @@ class WebEngineCaret(browsertab.AbstractCaret):
                 javascript.assemble('caret', 'moveToEndOfLine'))
 
     def move_to_start_of_next_block(self, count=1):
-        log.stub()
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'moveToStartOfNextBlock'))
 
     def move_to_start_of_prev_block(self, count=1):
-        log.stub()
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'moveToStartOfPrevBlock'))
 
     def move_to_end_of_next_block(self, count=1):
-        log.stub()
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'moveToEndOfNextBlock'))
 
     def move_to_end_of_prev_block(self, count=1):
-        log.stub()
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'moveToEndOfPrevBlock'))
 
     def move_to_start_of_document(self):
-        log.stub()
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'moveToStartOfDocument'))
 
     def move_to_end_of_document(self):
-        log.stub()
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'moveToEndOfDocument'))
 
     def toggle_selection(self):
         self._tab.run_js_async(
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 1796e73c5..9074e4e33 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -825,7 +825,6 @@ window._qutebrowser.caret = (function() {
             str = word + str;
             nodesCrossed = nodesCrossed.concat(newNodesCrossed);
             startCursor.copyFrom(wordStartCursor);
-            v
             // Get the previous word and go back to the top of the loop.
             newNodesCrossed = [];
             word = TraverseUtil.getPreviousWord(
@@ -1595,28 +1594,54 @@ window._qutebrowser.caret = (function() {
         return result;
     };
 
+    CaretBrowsing.move = function(direction, granularity) {
+        window
+            .getSelection()
+            .modify(
+                CaretBrowsing.selectionEnabled ? 'extend' : 'move', 
+                direction,
+                granularity);
+
+        window.setTimeout(function() {
+            CaretBrowsing.updateCaretOrSelection(true);
+        }, 0);
+    }
+
+    CaretBrowsing.moveToBlock = function(paragraph, boundary) {
+        window
+            .getSelection()
+            .modify(
+                CaretBrowsing.selectionEnabled ? 'extend' : 'move', 
+                paragraph, 
+                'paragraph');
+
+        window
+            .getSelection()
+            .modify(
+                CaretBrowsing.selectionEnabled ? 'extend' : 'move', 
+                boundary, 
+                'paragraphboundary');
+
+        window.setTimeout(function() {
+            CaretBrowsing.updateCaretOrSelection(true);
+        }, 0);
+
+    }
+
     funcs.moveRight = () => {
-        var evt = Object.assign({}, document.activeElement);
-        evt.keyCode = 39;
-        CaretBrowsing.onKeyDown(evt);
+        CaretBrowsing.move('right', 'character');
     }
 
     funcs.moveLeft = () => {
-        var evt = Object.assign({}, document.activeElement);
-        evt.keyCode = 37;
-        CaretBrowsing.onKeyDown(evt);
+        CaretBrowsing.move('left', 'character');
     }
 
     funcs.moveDown = () => {
-        var evt = Object.assign({}, document.activeElement);
-        evt.keyCode = 40;
-        CaretBrowsing.onKeyDown(evt);
+        CaretBrowsing.move('forward', 'line');
     }
 
     funcs.moveUp = () => {
-        var evt = Object.assign({}, document.activeElement);
-        evt.keyCode = 38;
-        CaretBrowsing.onKeyDown(evt);
+        CaretBrowsing.move('backward', 'line');
     }
 
     funcs.moveToEndOfWord = () => {
@@ -1625,40 +1650,45 @@ window._qutebrowser.caret = (function() {
     }
 
     funcs.moveToNextWord = () => {
-        var evt = Object.assign({}, document.activeElement);
-        evt.keyCode = 39;
-        evt.ctrlKey = true;
-        CaretBrowsing.onKeyDown(evt);
+        CaretBrowsing.move('forward', 'word');
         funcs.moveRight();
     }
 
     funcs.moveToPreviousWord = () => {
-        var evt = Object.assign({}, document.activeElement);
-        evt.keyCode = 37;
-        evt.ctrlKey = true;
-        CaretBrowsing.onKeyDown(evt);
+        CaretBrowsing.move('backward', 'word');
     }
 
     funcs.moveToStartOfLine = () => {
-        CaretBrowsing.moveToLineBoundary('left');
+        CaretBrowsing.move('left', 'lineboundary');
     }
 
     funcs.moveToEndOfLine = () => {
-        CaretBrowsing.moveToLineBoundary('right');
+        CaretBrowsing.move('right', 'lineboundary');
     }
 
-    CaretBrowsing.moveToLineBoundary = function(side) {
-        window
-            .getSelection()
-            .modify(
-                CaretBrowsing.selectionEnabled ? 'extend' : 'move', 
-                side, 
-                'lineboundary');
+    funcs.moveToStartOfNextBlock = () => {
+        CaretBrowsing.moveToBlock('forward', 'backward');
+    }
 
-        window.setTimeout(function() {
-            CaretBrowsing.updateCaretOrSelection(true);
-        }, 0);
-    };
+    funcs.moveToStartOfPrevBlock = () => {
+        CaretBrowsing.moveToBlock('backward', 'backward');
+    }
+
+    funcs.moveToEndOfNextBlock = () => {
+        CaretBrowsing.moveToBlock('forward', 'forward');
+    }
+
+    funcs.moveToEndOfPrevBlock = () => {
+        CaretBrowsing.moveToBlock('backward', 'forward');
+    }
+
+    funcs.moveToStartOfDocument = () => {
+        CaretBrowsing.move('backward', 'documentboundary');
+    }
+
+    funcs.moveToEndOfDocument = () => {
+        CaretBrowsing.move('forward', 'documentboundary');
+    }
 
     funcs.toggleSelection = () => {
         CaretBrowsing.selectionEnabled = !CaretBrowsing.selectionEnabled;

From e7a66d92a8ff405832954306dbd93bcb290e575f Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Wed, 22 Nov 2017 19:56:05 +0600
Subject: [PATCH 004/574] Selection implentation

---
 qutebrowser/browser/browsertab.py             |  2 +-
 qutebrowser/browser/commands.py               | 33 ++++++++++-----
 qutebrowser/browser/webengine/webenginetab.py | 41 +++++++++++++------
 qutebrowser/browser/webkit/webkittab.py       |  6 +--
 qutebrowser/javascript/webengine_caret.js     |  8 ++++
 5 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 547e276db..827d11761 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -392,7 +392,7 @@ class AbstractCaret(QObject):
     def has_selection(self):
         raise NotImplementedError
 
-    def selection(self, html=False):
+    def selection(self, html=False, selection=None):
         raise NotImplementedError
 
     def follow_selected(self, *, tab=False):
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index e007de76d..e92291816 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -838,6 +838,11 @@ class CommandDispatcher:
             sel: Use the primary selection instead of the clipboard.
             keep: Stay in visual mode after yanking the selection.
         """
+        self.yank_object = {
+                'sel': sel,
+                'what': what,
+                'keep': keep
+        }
         if what == 'title':
             s = self._tabbed_browser.page_title(self._current_index())
         elif what == 'domain':
@@ -850,28 +855,36 @@ class CommandDispatcher:
             what = 'URL'  # For printing
         elif what == 'selection':
             caret = self._current_widget().caret
-            s = caret.selection()
-            if not caret.has_selection() or not s:
-                message.info("Nothing to yank")
-                return
+            caret.selection(False, self._yank_callback)
+            return
         else:  # pragma: no cover
             raise ValueError("Invalid value {!r} for `what'.".format(what))
 
-        if sel and utils.supports_selection():
+        self._yank_to_target(s)
+
+    def _yank_callback(self, s):
+        if not self._current_widget().caret.has_selection() or not s:
+            message.info("Nothing to yank")
+            return
+        self._yank_to_target(s)
+
+    def _yank_to_target(self, s):
+        if self.yank_object['sel'] and utils.supports_selection():
             target = "primary selection"
         else:
-            sel = False
+            self.yank_object['sel'] = False
             target = "clipboard"
 
-        utils.set_clipboard(s, selection=sel)
-        if what != 'selection':
-            message.info("Yanked {} to {}: {}".format(what, target, s))
+        utils.set_clipboard(s, selection=self.yank_object['sel'])
+        if self.yank_object['what'] != 'selection':
+            message.info("Yanked {} to {}: {}".format(self.yank_object['what'], target, s))
         else:
             message.info("{} {} yanked to {}".format(
                 len(s), "char" if len(s) == 1 else "chars", target))
-            if not keep:
+            if not self.yank_object['keep']:
                 modeman.leave(self._win_id, KeyMode.caret, "yank selected",
                               maybe=True)
+        self.yank_object = None
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     @cmdutils.argument('count', count=True)
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 03cf267ea..764db3024 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -231,20 +231,24 @@ class WebEngineCaret(browsertab.AbstractCaret):
                 javascript.assemble('caret', 'moveToEndOfLine'))
 
     def move_to_start_of_next_block(self, count=1):
-        self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToStartOfNextBlock'))
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveToStartOfNextBlock'))
 
     def move_to_start_of_prev_block(self, count=1):
-        self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToStartOfPrevBlock'))
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveToStartOfPrevBlock'))
 
     def move_to_end_of_next_block(self, count=1):
-        self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToEndOfNextBlock'))
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveToEndOfNextBlock'))
 
     def move_to_end_of_prev_block(self, count=1):
-        self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToEndOfPrevBlock'))
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveToEndOfPrevBlock'))
 
     def move_to_start_of_document(self):
         self._tab.run_js_async(
@@ -259,15 +263,28 @@ class WebEngineCaret(browsertab.AbstractCaret):
                 javascript.assemble('caret', 'toggleSelection'))
 
     def drop_selection(self):
-        log.stub()
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'dropSelection'))
 
     def has_selection(self):
-        return self._widget.hasSelection()
+        if qtutils.version_check('5.10'):
+            return self._widget.hasSelection()
+        else:
+            # WORKAROUND for
+            # https://bugreports.qt.io/browse/QTBUG-53134
+            return True
 
-    def selection(self, html=False):
+    def selection(self, html=False, callback=None):
         if html:
             raise browsertab.UnsupportedOperationError
-        return self._widget.selectedText()
+        if qtutils.version_check('5.10'):
+            callback(self._widget.selectedText())
+        else:
+            # WORKAROUND for
+            # https://bugreports.qt.io/browse/QTBUG-53134
+            self._tab.run_js_async(
+                    'window.getSelection().toString()', callback)
+            self.drop_selection()
 
     def _follow_selected_cb(self, js_elem, tab=False):
         """Callback for javascript which clicks the selected element.
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 43bec3456..a1aeee698 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -335,10 +335,10 @@ class WebKitCaret(browsertab.AbstractCaret):
     def has_selection(self):
         return self._widget.hasSelection()
 
-    def selection(self, html=False):
+    def selection(self, html=False, callback=False):
         if html:
-            return self._widget.selectedHtml()
-        return self._widget.selectedText()
+            callback(self._widget.selectedHtml())
+        callback(self._widget.selectedText())
 
     def follow_selected(self, *, tab=False):
         if not self.has_selection():
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 9074e4e33..b13cfb171 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1690,6 +1690,14 @@ window._qutebrowser.caret = (function() {
         CaretBrowsing.move('forward', 'documentboundary');
     }
 
+    funcs.dropSelection = () => {
+        window.getSelection().removeAllRanges();
+    }
+
+    funcs.getSelection = () => {
+        return window.getSelection().toString();
+    }
+
     funcs.toggleSelection = () => {
         CaretBrowsing.selectionEnabled = !CaretBrowsing.selectionEnabled;
     }

From 8a64ce19c3dd7b142495e6b8bd0e8310cd91e83b Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 23 Nov 2017 20:18:43 +0600
Subject: [PATCH 005/574] Fetch selection for userscripts

---
 qutebrowser/browser/commands.py | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index e92291816..5a0108b1b 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1217,7 +1217,17 @@ class CommandDispatcher:
             cmd, args, userscript))
         if userscript:
             # ~ expansion is handled by the userscript module.
-            self._run_userscript(cmd, *args, verbose=verbose)
+            # dirty hack for async call because of:
+            # https://bugreports.qt.io/browse/QTBUG-53134
+            # until it fixed or blocked async call implemented:
+            # https://github.com/qutebrowser/qutebrowser/issues/3327
+            self.userscript_object = {
+                    'cmd': cmd,
+                    'args': args,
+                    'verbose': verbose
+            }
+            caret = self._current_widget().caret
+            caret.selection(False, self._selection_callback)
         else:
             cmd = os.path.expanduser(cmd)
             proc = guiprocess.GUIProcess(what='command', verbose=verbose,
@@ -1232,7 +1242,10 @@ class CommandDispatcher:
         """Open main startpage in current tab."""
         self.openurl(config.val.url.start_pages[0])
 
-    def _run_userscript(self, cmd, *args, verbose=False):
+    def _selection_callback(self, s):
+        self._run_userscript(s)
+
+    def _run_userscript(self, selection):
         """Run a userscript given as argument.
 
         Args:
@@ -1250,7 +1263,7 @@ class CommandDispatcher:
 
         tab = self._tabbed_browser.currentWidget()
         if tab is not None and tab.caret.has_selection():
-            env['QUTE_SELECTED_TEXT'] = tab.caret.selection()
+            env['QUTE_SELECTED_TEXT'] = selection
             try:
                 env['QUTE_SELECTED_HTML'] = tab.caret.selection(html=True)
             except browsertab.UnsupportedOperationError:
@@ -1266,10 +1279,13 @@ class CommandDispatcher:
             env['QUTE_URL'] = url.toString(QUrl.FullyEncoded)
 
         try:
-            userscripts.run_async(tab, cmd, *args, win_id=self._win_id,
-                                  env=env, verbose=verbose)
+            userscripts.run_async(tab, self.userscript_object['cmd'], 
+                    *self.userscript_object['args'], win_id=self._win_id, 
+                    env=env, verbose=self.userscript_object['verbose'])
         except userscripts.Error as e:
             raise cmdexc.CommandError(e)
+        finally:
+            self.userscript_object = None
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     def quickmark_save(self):

From 72040a3bbb0e6815b2875b90be3341aee0f86e64 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 24 Nov 2017 17:32:23 +0600
Subject: [PATCH 006/574] Position caret on top element

---
 qutebrowser/javascript/webengine_caret.js | 89 +++++++++++++++++++++--
 1 file changed, 81 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index b13cfb171..5efa81a79 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1078,6 +1078,7 @@ window._qutebrowser.caret = (function() {
         if (!CaretBrowsing.initiated) {
             CaretBrowsing.setInitialCursor();
         } else {
+            positionCaret();
             CaretBrowsing.toggle();
         }
     }
@@ -1092,14 +1093,7 @@ window._qutebrowser.caret = (function() {
             return;
         }
 
-        var start = new Cursor(document.body, 0, '');
-        var end = new Cursor(document.body, 0, '');
-        var nodesCrossed = [];
-        var result = TraverseUtil.getNextChar(start, end, nodesCrossed, true);
-        if (result == null) {
-            return;
-        }
-        CaretBrowsing.setAndValidateSelection(start, start);
+        positionCaret();
         CaretBrowsing.toggle();
         CaretBrowsing.initiated = true;
         CaretBrowsing.selectionEnabled = false;
@@ -2283,5 +2277,84 @@ window._qutebrowser.caret = (function() {
 
     }, 0);
 
+    function isElementInViewport(node) {  // eslint-disable-line complexity
+        let i;
+        let boundingRect = (node.getClientRects()[0] ||
+                            node.getBoundingClientRect());
+
+        if (boundingRect.width <= 1 && boundingRect.height <= 1) {
+            const rects = node.getClientRects();
+            for (i = 0; i < rects.length; i++) {
+                if (rects[i].width > rects[0].height &&
+                        rects[i].height > rects[0].height) {
+                    boundingRect = rects[i];
+                }
+            }
+        }
+        if (boundingRect === undefined) {
+            return null;
+        }
+        if (boundingRect.top > innerHeight || boundingRect.left > innerWidth) {
+            return null;
+        }
+        if (boundingRect.width <= 1 || boundingRect.height <= 1) {
+            const children = node.children;
+            let visibleChildNode = false;
+            for (i = 0; i < children.length; ++i) {
+                boundingRect = (children[i].getClientRects()[0] ||
+                                children[i].getBoundingClientRect());
+                if (boundingRect.width > 1 && boundingRect.height > 1) {
+                    visibleChildNode = true;
+                    break;
+                }
+            }
+            if (visibleChildNode === false) {
+                return null;
+            }
+        }
+        if (boundingRect.top + boundingRect.height < 10 ||
+                boundingRect.left + boundingRect.width < -10) {
+            return null;
+        }
+        const computedStyle = window.getComputedStyle(node, null);
+        if (computedStyle.visibility !== "visible" ||
+                computedStyle.display === "none" ||
+                node.hasAttribute("disabled") ||
+                parseInt(computedStyle.width, 10) === 0 ||
+                parseInt(computedStyle.height, 10) === 0) {
+            return null;
+        }
+        return boundingRect.top >= -20;
+    }
+
+    function positionCaret() {
+        const walker = document.createTreeWalker(document.body, -1);
+        let node;
+        const textNodes = [];
+        let el;
+        while ((node = walker.nextNode())) {
+            if (node.nodeType === 3 && node.nodeValue.trim() !== "") {
+                textNodes.push(node);
+            }
+        }
+        for (let i = 0; i < textNodes.length; i++) {
+            const element = textNodes[i].parentElement;
+            if (isElementInViewport(element)) {
+                el = element;
+                break;
+            }
+        }
+        if (el !== undefined) {
+            var start = new Cursor(el, 0, '');
+            var end = new Cursor(el, 0, '');
+            var nodesCrossed = [];
+            var result = TraverseUtil.getNextChar(start, end, nodesCrossed, true);
+            if (result == null) {
+                return;
+            }
+            CaretBrowsing.setAndValidateSelection(start, start);
+        }
+    }
+
     return funcs;
 })();

From 70b58d1928c9c79c09ad489df6bd17b405ded38b Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Wed, 29 Nov 2017 20:07:24 +0600
Subject: [PATCH 007/574] Inject caret css on mode enter

---
 qutebrowser/javascript/webengine_caret.js | 29 +++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 5efa81a79..03b951686 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1070,12 +1070,41 @@ window._qutebrowser.caret = (function() {
         return false;
     };
 
+    function addCaretStyle() {
+        var style = '.CaretBrowsing_Caret {' +
+            '  position: absolute;' +
+            '  z-index: 2147483647;' +
+            '  min-height: 10px;' +
+            '  background-color: #000;' +
+            '}' +
+            '.CaretBrowsing_AnimateCaret {' +
+            '  position: absolute;' +
+            '  z-index: 2147483647;' +
+            '  min-height: 10px;' +
+            '}' +
+            '.CaretBrowsing_FlashVert {' +
+            '  position: absolute;' +
+            '  z-index: 2147483647;' +
+            '  background: linear-gradient(' +
+            '      270deg,' +
+            '      rgba(128, 128, 255, 0) 0%,' +
+            '      rgba(128, 128, 255, 0.3) 45%,' +
+            '      rgba(128, 128, 255, 0.8) 50%,' +
+            '      rgba(128, 128, 255, 0.3) 65%,' +
+            '      rgba(128, 128, 255, 0) 100%);' +
+            '}';
+        var node = document.createElement('style');
+        node.innerHTML = style;
+        document.body.appendChild(node);
+    }
+
     /**
      * If there's no initial selection, set the cursor just before the
      * first text character in the document.
      */
     funcs.setInitialCursor = () => {
         if (!CaretBrowsing.initiated) {
+            addCaretStyle();
             CaretBrowsing.setInitialCursor();
         } else {
             positionCaret();

From f965c0daec8e0671f5e450e18d8727182d63bad6 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Wed, 29 Nov 2017 21:01:47 +0600
Subject: [PATCH 008/574] Don't position caret if selection exists

---
 qutebrowser/javascript/webengine_caret.js | 65 ++++++++++++-----------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 03b951686..a8cc93b56 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1070,7 +1070,7 @@ window._qutebrowser.caret = (function() {
         return false;
     };
 
-    function addCaretStyle() {
+    function injectCaretStyles() {
         var style = '.CaretBrowsing_Caret {' +
             '  position: absolute;' +
             '  z-index: 2147483647;' +
@@ -1104,10 +1104,12 @@ window._qutebrowser.caret = (function() {
      */
     funcs.setInitialCursor = () => {
         if (!CaretBrowsing.initiated) {
-            addCaretStyle();
+            injectCaretStyles();
             CaretBrowsing.setInitialCursor();
         } else {
-            positionCaret();
+            if (!window.getSelection().toString()) {
+                positionCaret();
+            }
             CaretBrowsing.toggle();
         }
     }
@@ -1116,6 +1118,35 @@ window._qutebrowser.caret = (function() {
         CaretBrowsing.toggle();
     }
 
+    function positionCaret() {
+        const walker = document.createTreeWalker(document.body, -1);
+        let node;
+        const textNodes = [];
+        let el;
+        while ((node = walker.nextNode())) {
+            if (node.nodeType === 3 && node.nodeValue.trim() !== "") {
+                textNodes.push(node);
+            }
+        }
+        for (let i = 0; i < textNodes.length; i++) {
+            const element = textNodes[i].parentElement;
+            if (isElementInViewport(element)) {
+                el = element;
+                break;
+            }
+        }
+        if (el !== undefined) {
+            var start = new Cursor(el, 0, '');
+            var end = new Cursor(el, 0, '');
+            var nodesCrossed = [];
+            var result = TraverseUtil.getNextChar(start, end, nodesCrossed, true);
+            if (result == null) {
+                return;
+            }
+            CaretBrowsing.setAndValidateSelection(start, start);
+        }
+    }
+
     CaretBrowsing.setInitialCursor = function() {
         var sel = window.getSelection();
         if (sel.rangeCount > 0) {
@@ -2356,34 +2387,6 @@ window._qutebrowser.caret = (function() {
         return boundingRect.top >= -20;
     }
 
-    function positionCaret() {
-        const walker = document.createTreeWalker(document.body, -1);
-        let node;
-        const textNodes = [];
-        let el;
-        while ((node = walker.nextNode())) {
-            if (node.nodeType === 3 && node.nodeValue.trim() !== "") {
-                textNodes.push(node);
-            }
-        }
-        for (let i = 0; i < textNodes.length; i++) {
-            const element = textNodes[i].parentElement;
-            if (isElementInViewport(element)) {
-                el = element;
-                break;
-            }
-        }
-        if (el !== undefined) {
-            var start = new Cursor(el, 0, '');
-            var end = new Cursor(el, 0, '');
-            var nodesCrossed = [];
-            var result = TraverseUtil.getNextChar(start, end, nodesCrossed, true);
-            if (result == null) {
-                return;
-            }
-            CaretBrowsing.setAndValidateSelection(start, start);
-        }
-    }
 
     return funcs;
 })();

From c7a5dd6abbb8aec73f711be8a1d159d054719d1c Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 30 Nov 2017 18:02:50 +0600
Subject: [PATCH 009/574] Clean up javascript caret code

---
 qutebrowser/browser/webengine/webenginetab.py |    1 -
 qutebrowser/javascript/axs_testing.js         | 2643 -----------------
 qutebrowser/javascript/webengine_caret.js     | 1681 ++---------
 3 files changed, 276 insertions(+), 4049 deletions(-)
 delete mode 100644 qutebrowser/javascript/axs_testing.js

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 764db3024..243a711e0 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -589,7 +589,6 @@ class WebEngineTab(browsertab.AbstractTab):
             utils.read_file('javascript/scroll.js'),
             utils.read_file('javascript/webelem.js'),
             utils.read_file('javascript/webengine_caret.js'),
-            utils.read_file('javascript/axs_testing.js'),
         ])
         script = QWebEngineScript()
         script.setInjectionPoint(QWebEngineScript.DocumentCreation)
diff --git a/qutebrowser/javascript/axs_testing.js b/qutebrowser/javascript/axs_testing.js
deleted file mode 100644
index e6b1a3755..000000000
--- a/qutebrowser/javascript/axs_testing.js
+++ /dev/null
@@ -1,2643 +0,0 @@
-/*
- * Copyright 2016 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Generated from http://github.com/GoogleChrome/accessibility-developer-tools/tree/7d778f7da58af341a47b3a6f6457c2842b24d4d8
- *
- * See project README for build steps.
- */
-
-// AUTO-GENERATED CONTENT BELOW: DO NOT EDIT! See above for details.
-
-var fn = (function() {
-  var COMPILED = !0, goog = goog || {};
-goog.global = this;
-goog.isDef = function(a) {
-  return void 0 !== a;
-};
-goog.exportPath_ = function(a, b, c) {
-  a = a.split(".");
-  c = c || goog.global;
-  a[0] in c || !c.execScript || c.execScript("var " + a[0]);
-  for (var d;a.length && (d = a.shift());) {
-    !a.length && goog.isDef(b) ? c[d] = b : c = c[d] ? c[d] : c[d] = {};
-  }
-};
-goog.define = function(a, b) {
-  var c = b;
-  COMPILED || (goog.global.CLOSURE_UNCOMPILED_DEFINES && Object.prototype.hasOwnProperty.call(goog.global.CLOSURE_UNCOMPILED_DEFINES, a) ? c = goog.global.CLOSURE_UNCOMPILED_DEFINES[a] : goog.global.CLOSURE_DEFINES && Object.prototype.hasOwnProperty.call(goog.global.CLOSURE_DEFINES, a) && (c = goog.global.CLOSURE_DEFINES[a]));
-  goog.exportPath_(a, c);
-};
-goog.DEBUG = !0;
-goog.LOCALE = "en";
-goog.TRUSTED_SITE = !0;
-goog.STRICT_MODE_COMPATIBLE = !1;
-goog.DISALLOW_TEST_ONLY_CODE = COMPILED && !goog.DEBUG;
-goog.ENABLE_CHROME_APP_SAFE_SCRIPT_LOADING = !1;
-goog.provide = function(a) {
-  if (goog.isInModuleLoader_()) {
-    throw Error("goog.provide can not be used within a goog.module.");
-  }
-  if (!COMPILED && goog.isProvided_(a)) {
-    throw Error('Namespace "' + a + '" already declared.');
-  }
-  goog.constructNamespace_(a);
-};
-goog.constructNamespace_ = function(a, b) {
-  if (!COMPILED) {
-    delete goog.implicitNamespaces_[a];
-    for (var c = a;(c = c.substring(0, c.lastIndexOf("."))) && !goog.getObjectByName(c);) {
-      goog.implicitNamespaces_[c] = !0;
-    }
-  }
-  goog.exportPath_(a, b);
-};
-goog.VALID_MODULE_RE_ = /^[a-zA-Z_$][a-zA-Z0-9._$]*$/;
-goog.module = function(a) {
-  if (!goog.isString(a) || !a || -1 == a.search(goog.VALID_MODULE_RE_)) {
-    throw Error("Invalid module identifier");
-  }
-  if (!goog.isInModuleLoader_()) {
-    throw Error("Module " + a + " has been loaded incorrectly.");
-  }
-  if (goog.moduleLoaderState_.moduleName) {
-    throw Error("goog.module may only be called once per module.");
-  }
-  goog.moduleLoaderState_.moduleName = a;
-  if (!COMPILED) {
-    if (goog.isProvided_(a)) {
-      throw Error('Namespace "' + a + '" already declared.');
-    }
-    delete goog.implicitNamespaces_[a];
-  }
-};
-goog.module.get = function(a) {
-  return goog.module.getInternal_(a);
-};
-goog.module.getInternal_ = function(a) {
-  if (!COMPILED) {
-    return goog.isProvided_(a) ? a in goog.loadedModules_ ? goog.loadedModules_[a] : goog.getObjectByName(a) : null;
-  }
-};
-goog.moduleLoaderState_ = null;
-goog.isInModuleLoader_ = function() {
-  return null != goog.moduleLoaderState_;
-};
-goog.module.declareLegacyNamespace = function() {
-  if (!COMPILED && !goog.isInModuleLoader_()) {
-    throw Error("goog.module.declareLegacyNamespace must be called from within a goog.module");
-  }
-  if (!COMPILED && !goog.moduleLoaderState_.moduleName) {
-    throw Error("goog.module must be called prior to goog.module.declareLegacyNamespace.");
-  }
-  goog.moduleLoaderState_.declareLegacyNamespace = !0;
-};
-goog.setTestOnly = function(a) {
-  if (goog.DISALLOW_TEST_ONLY_CODE) {
-    throw a = a || "", Error("Importing test-only code into non-debug environment" + (a ? ": " + a : "."));
-  }
-};
-goog.forwardDeclare = function(a) {
-};
-COMPILED || (goog.isProvided_ = function(a) {
-  return a in goog.loadedModules_ || !goog.implicitNamespaces_[a] && goog.isDefAndNotNull(goog.getObjectByName(a));
-}, goog.implicitNamespaces_ = {"goog.module":!0});
-goog.getObjectByName = function(a, b) {
-  for (var c = a.split("."), d = b || goog.global, e;e = c.shift();) {
-    if (goog.isDefAndNotNull(d[e])) {
-      d = d[e];
-    } else {
-      return null;
-    }
-  }
-  return d;
-};
-goog.globalize = function(a, b) {
-  var c = b || goog.global, d;
-  for (d in a) {
-    c[d] = a[d];
-  }
-};
-goog.addDependency = function(a, b, c, d) {
-  if (goog.DEPENDENCIES_ENABLED) {
-    var e;
-    a = a.replace(/\\/g, "/");
-    var f = goog.dependencies_;
-    d && "boolean" !== typeof d || (d = d ? {module:"goog"} : {});
-    for (var g = 0;e = b[g];g++) {
-      f.nameToPath[e] = a, f.loadFlags[a] = d;
-    }
-    for (d = 0;b = c[d];d++) {
-      a in f.requires || (f.requires[a] = {}), f.requires[a][b] = !0;
-    }
-  }
-};
-goog.ENABLE_DEBUG_LOADER = !0;
-goog.logToConsole_ = function(a) {
-  goog.global.console && goog.global.console.error(a);
-};
-goog.require = function(a) {
-  if (!COMPILED) {
-    goog.ENABLE_DEBUG_LOADER && goog.IS_OLD_IE_ && goog.maybeProcessDeferredDep_(a);
-    if (goog.isProvided_(a)) {
-      return goog.isInModuleLoader_() ? goog.module.getInternal_(a) : null;
-    }
-    if (goog.ENABLE_DEBUG_LOADER) {
-      var b = goog.getPathFromDeps_(a);
-      if (b) {
-        return goog.writeScripts_(b), null;
-      }
-    }
-    a = "goog.require could not find: " + a;
-    goog.logToConsole_(a);
-    throw Error(a);
-  }
-};
-goog.basePath = "";
-goog.nullFunction = function() {
-};
-goog.abstractMethod = function() {
-  throw Error("unimplemented abstract method");
-};
-goog.addSingletonGetter = function(a) {
-  a.getInstance = function() {
-    if (a.instance_) {
-      return a.instance_;
-    }
-    goog.DEBUG && (goog.instantiatedSingletons_[goog.instantiatedSingletons_.length] = a);
-    return a.instance_ = new a;
-  };
-};
-goog.instantiatedSingletons_ = [];
-goog.LOAD_MODULE_USING_EVAL = !0;
-goog.SEAL_MODULE_EXPORTS = goog.DEBUG;
-goog.loadedModules_ = {};
-goog.DEPENDENCIES_ENABLED = !COMPILED && goog.ENABLE_DEBUG_LOADER;
-goog.ALWAYS_TRANSPILE = !1;
-goog.NEVER_TRANSPILE = !1;
-goog.DEPENDENCIES_ENABLED && (goog.dependencies_ = {loadFlags:{}, nameToPath:{}, requires:{}, visited:{}, written:{}, deferred:{}}, goog.inHtmlDocument_ = function() {
-  var a = goog.global.document;
-  return null != a && "write" in a;
-}, goog.findBasePath_ = function() {
-  if (goog.isDef(goog.global.CLOSURE_BASE_PATH)) {
-    goog.basePath = goog.global.CLOSURE_BASE_PATH;
-  } else {
-    if (goog.inHtmlDocument_()) {
-      for (var a = goog.global.document.getElementsByTagName("SCRIPT"), b = a.length - 1;0 <= b;--b) {
-        var c = a[b].src, d = c.lastIndexOf("?"), d = -1 == d ? c.length : d;
-        if ("base.js" == c.substr(d - 7, 7)) {
-          goog.basePath = c.substr(0, d - 7);
-          break;
-        }
-      }
-    }
-  }
-}, goog.importScript_ = function(a, b) {
-  (goog.global.CLOSURE_IMPORT_SCRIPT || goog.writeScriptTag_)(a, b) && (goog.dependencies_.written[a] = !0);
-}, goog.IS_OLD_IE_ = !(goog.global.atob || !goog.global.document || !goog.global.document.all), goog.importProcessedScript_ = function(a, b, c) {
-  goog.importScript_("", 'goog.retrieveAndExec_("' + a + '", ' + b + ", " + c + ");");
-}, goog.queuedModules_ = [], goog.wrapModule_ = function(a, b) {
-  return goog.LOAD_MODULE_USING_EVAL && goog.isDef(goog.global.JSON) ? "goog.loadModule(" + goog.global.JSON.stringify(b + "\n//# sourceURL=" + a + "\n") + ");" : 'goog.loadModule(function(exports) {"use strict";' + b + "\n;return exports});\n//# sourceURL=" + a + "\n";
-}, goog.loadQueuedModules_ = function() {
-  var a = goog.queuedModules_.length;
-  if (0 < a) {
-    var b = goog.queuedModules_;
-    goog.queuedModules_ = [];
-    for (var c = 0;c < a;c++) {
-      goog.maybeProcessDeferredPath_(b[c]);
-    }
-  }
-}, goog.maybeProcessDeferredDep_ = function(a) {
-  goog.isDeferredModule_(a) && goog.allDepsAreAvailable_(a) && (a = goog.getPathFromDeps_(a), goog.maybeProcessDeferredPath_(goog.basePath + a));
-}, goog.isDeferredModule_ = function(a) {
-  var b = (a = goog.getPathFromDeps_(a)) && goog.dependencies_.loadFlags[a] || {};
-  return a && ("goog" == b.module || goog.needsTranspile_(b.lang)) ? goog.basePath + a in goog.dependencies_.deferred : !1;
-}, goog.allDepsAreAvailable_ = function(a) {
-  if ((a = goog.getPathFromDeps_(a)) && a in goog.dependencies_.requires) {
-    for (var b in goog.dependencies_.requires[a]) {
-      if (!goog.isProvided_(b) && !goog.isDeferredModule_(b)) {
-        return !1;
-      }
-    }
-  }
-  return !0;
-}, goog.maybeProcessDeferredPath_ = function(a) {
-  if (a in goog.dependencies_.deferred) {
-    var b = goog.dependencies_.deferred[a];
-    delete goog.dependencies_.deferred[a];
-    goog.globalEval(b);
-  }
-}, goog.loadModuleFromUrl = function(a) {
-  goog.retrieveAndExec_(a, !0, !1);
-}, goog.loadModule = function(a) {
-  var b = goog.moduleLoaderState_;
-  try {
-    goog.moduleLoaderState_ = {moduleName:void 0, declareLegacyNamespace:!1};
-    var c;
-    if (goog.isFunction(a)) {
-      c = a.call(goog.global, {});
-    } else {
-      if (goog.isString(a)) {
-        c = goog.loadModuleFromSource_.call(goog.global, a);
-      } else {
-        throw Error("Invalid module definition");
-      }
-    }
-    var d = goog.moduleLoaderState_.moduleName;
-    if (!goog.isString(d) || !d) {
-      throw Error('Invalid module name "' + d + '"');
-    }
-    goog.moduleLoaderState_.declareLegacyNamespace ? goog.constructNamespace_(d, c) : goog.SEAL_MODULE_EXPORTS && Object.seal && Object.seal(c);
-    goog.loadedModules_[d] = c;
-  } finally {
-    goog.moduleLoaderState_ = b;
-  }
-}, goog.loadModuleFromSource_ = function(a) {
-  eval(a);
-  return {};
-}, goog.writeScriptSrcNode_ = function(a) {
-  goog.global.document.write('<script type="text/javascript" src="' + a + '">\x3c/script>');
-}, goog.appendScriptSrcNode_ = function(a) {
-  var b = goog.global.document, c = b.createElement("script");
-  c.type = "text/javascript";
-  c.src = a;
-  c.defer = !1;
-  c.async = !1;
-  b.head.appendChild(c);
-}, goog.writeScriptTag_ = function(a, b) {
-  if (goog.inHtmlDocument_()) {
-    var c = goog.global.document;
-    if (!goog.ENABLE_CHROME_APP_SAFE_SCRIPT_LOADING && "complete" == c.readyState) {
-      if (/\bdeps.js$/.test(a)) {
-        return !1;
-      }
-      throw Error('Cannot write "' + a + '" after document load');
-    }
-    if (void 0 === b) {
-      if (goog.IS_OLD_IE_) {
-        var d = " onreadystatechange='goog.onScriptLoad_(this, " + ++goog.lastNonModuleScriptIndex_ + ")' ";
-        c.write('<script type="text/javascript" src="' + a + '"' + d + ">\x3c/script>");
-      } else {
-        goog.ENABLE_CHROME_APP_SAFE_SCRIPT_LOADING ? goog.appendScriptSrcNode_(a) : goog.writeScriptSrcNode_(a);
-      }
-    } else {
-      c.write('<script type="text/javascript">' + b + "\x3c/script>");
-    }
-    return !0;
-  }
-  return !1;
-}, goog.needsTranspile_ = function(a) {
-  if (goog.ALWAYS_TRANSPILE) {
-    return !0;
-  }
-  if (goog.NEVER_TRANSPILE) {
-    return !1;
-  }
-  if (!goog.transpiledLanguages_) {
-    goog.transpiledLanguages_ = {es5:!0, es6:!0, "es6-impl":!0};
-    try {
-      goog.transpiledLanguages_.es5 = eval("[1,].length!=1"), eval('(()=>{"use strict";let a={};const X=class{constructor(){}x(z){return new Map([...arguments]).get(z[0])==3}};return new X().x([a,3])})()') && (goog.transpiledLanguages_["es6-impl"] = !1), eval('(()=>{"use strict";class X{constructor(){if(new.target!=String)throw 1;this.x=42}}let q=Reflect.construct(X,[],String);if(q.x!=42||!(q instanceof String))throw 1;for(const a of[2,3]){if(a==2)continue;function f(z={a}){let a=0;return z.a}{function f(){return 0;}}return f()==3}})()') && 
-      (goog.transpiledLanguages_.es6 = !1);
-    } catch (b) {
-    }
-  }
-  return !!goog.transpiledLanguages_[a];
-}, goog.transpiledLanguages_ = null, goog.lastNonModuleScriptIndex_ = 0, goog.onScriptLoad_ = function(a, b) {
-  "complete" == a.readyState && goog.lastNonModuleScriptIndex_ == b && goog.loadQueuedModules_();
-  return !0;
-}, goog.writeScripts_ = function(a) {
-  function b(a) {
-    if (!(a in e.written || a in e.visited)) {
-      e.visited[a] = !0;
-      if (a in e.requires) {
-        for (var f in e.requires[a]) {
-          if (!goog.isProvided_(f)) {
-            if (f in e.nameToPath) {
-              b(e.nameToPath[f]);
-            } else {
-              throw Error("Undefined nameToPath for " + f);
-            }
-          }
-        }
-      }
-      a in d || (d[a] = !0, c.push(a));
-    }
-  }
-  var c = [], d = {}, e = goog.dependencies_;
-  b(a);
-  for (a = 0;a < c.length;a++) {
-    var f = c[a];
-    goog.dependencies_.written[f] = !0;
-  }
-  var g = goog.moduleLoaderState_;
-  goog.moduleLoaderState_ = null;
-  for (a = 0;a < c.length;a++) {
-    if (f = c[a]) {
-      var h = e.loadFlags[f] || {}, k = goog.needsTranspile_(h.lang);
-      "goog" == h.module || k ? goog.importProcessedScript_(goog.basePath + f, "goog" == h.module, k) : goog.importScript_(goog.basePath + f);
-    } else {
-      throw goog.moduleLoaderState_ = g, Error("Undefined script input");
-    }
-  }
-  goog.moduleLoaderState_ = g;
-}, goog.getPathFromDeps_ = function(a) {
-  return a in goog.dependencies_.nameToPath ? goog.dependencies_.nameToPath[a] : null;
-}, goog.findBasePath_(), goog.global.CLOSURE_NO_DEPS || goog.importScript_(goog.basePath + "deps.js"));
-goog.normalizePath_ = function(a) {
-  a = a.split("/");
-  for (var b = 0;b < a.length;) {
-    "." == a[b] ? a.splice(b, 1) : b && ".." == a[b] && a[b - 1] && ".." != a[b - 1] ? a.splice(--b, 2) : b++;
-  }
-  return a.join("/");
-};
-goog.loadFileSync_ = function(a) {
-  if (goog.global.CLOSURE_LOAD_FILE_SYNC) {
-    return goog.global.CLOSURE_LOAD_FILE_SYNC(a);
-  }
-  try {
-    var b = new goog.global.XMLHttpRequest;
-    b.open("get", a, !1);
-    b.send();
-    return 0 == b.status || 200 == b.status ? b.responseText : null;
-  } catch (c) {
-    return null;
-  }
-};
-goog.retrieveAndExec_ = function(a, b, c) {
-  if (!COMPILED) {
-    var d = a;
-    a = goog.normalizePath_(a);
-    var e = goog.global.CLOSURE_IMPORT_SCRIPT || goog.writeScriptTag_, f = goog.loadFileSync_(a);
-    if (null == f) {
-      throw Error('Load of "' + a + '" failed');
-    }
-    c && (f = goog.transpile_.call(goog.global, f, a));
-    f = b ? goog.wrapModule_(a, f) : f + ("\n//# sourceURL=" + a);
-    goog.IS_OLD_IE_ ? (goog.dependencies_.deferred[d] = f, goog.queuedModules_.push(d)) : e(a, f);
-  }
-};
-goog.transpile_ = function(a, b) {
-  var c = goog.global.$jscomp;
-  c || (goog.global.$jscomp = c = {});
-  var d = c.transpile;
-  if (!d) {
-    var e = goog.basePath + "transpile.js", f = goog.loadFileSync_(e);
-    f && (eval(f + "\n//# sourceURL=" + e), c = goog.global.$jscomp, d = c.transpile);
-  }
-  d || (d = c.transpile = function(a, b) {
-    goog.logToConsole_(b + " requires transpilation but no transpiler was found.");
-    return a;
-  });
-  return d(a, b);
-};
-goog.typeOf = function(a) {
-  var b = typeof a;
-  if ("object" == b) {
-    if (a) {
-      if (a instanceof Array) {
-        return "array";
-      }
-      if (a instanceof Object) {
-        return b;
-      }
-      var c = Object.prototype.toString.call(a);
-      if ("[object Window]" == c) {
-        return "object";
-      }
-      if ("[object Array]" == c || "number" == typeof a.length && "undefined" != typeof a.splice && "undefined" != typeof a.propertyIsEnumerable && !a.propertyIsEnumerable("splice")) {
-        return "array";
-      }
-      if ("[object Function]" == c || "undefined" != typeof a.call && "undefined" != typeof a.propertyIsEnumerable && !a.propertyIsEnumerable("call")) {
-        return "function";
-      }
-    } else {
-      return "null";
-    }
-  } else {
-    if ("function" == b && "undefined" == typeof a.call) {
-      return "object";
-    }
-  }
-  return b;
-};
-goog.isNull = function(a) {
-  return null === a;
-};
-goog.isDefAndNotNull = function(a) {
-  return null != a;
-};
-goog.isArray = function(a) {
-  return "array" == goog.typeOf(a);
-};
-goog.isArrayLike = function(a) {
-  var b = goog.typeOf(a);
-  return "array" == b || "object" == b && "number" == typeof a.length;
-};
-goog.isDateLike = function(a) {
-  return goog.isObject(a) && "function" == typeof a.getFullYear;
-};
-goog.isString = function(a) {
-  return "string" == typeof a;
-};
-goog.isBoolean = function(a) {
-  return "boolean" == typeof a;
-};
-goog.isNumber = function(a) {
-  return "number" == typeof a;
-};
-goog.isFunction = function(a) {
-  return "function" == goog.typeOf(a);
-};
-goog.isObject = function(a) {
-  var b = typeof a;
-  return "object" == b && null != a || "function" == b;
-};
-goog.getUid = function(a) {
-  return a[goog.UID_PROPERTY_] || (a[goog.UID_PROPERTY_] = ++goog.uidCounter_);
-};
-goog.hasUid = function(a) {
-  return !!a[goog.UID_PROPERTY_];
-};
-goog.removeUid = function(a) {
-  null !== a && "removeAttribute" in a && a.removeAttribute(goog.UID_PROPERTY_);
-  try {
-    delete a[goog.UID_PROPERTY_];
-  } catch (b) {
-  }
-};
-goog.UID_PROPERTY_ = "closure_uid_" + (1E9 * Math.random() >>> 0);
-goog.uidCounter_ = 0;
-goog.getHashCode = goog.getUid;
-goog.removeHashCode = goog.removeUid;
-goog.cloneObject = function(a) {
-  var b = goog.typeOf(a);
-  if ("object" == b || "array" == b) {
-    if (a.clone) {
-      return a.clone();
-    }
-    var b = "array" == b ? [] : {}, c;
-    for (c in a) {
-      b[c] = goog.cloneObject(a[c]);
-    }
-    return b;
-  }
-  return a;
-};
-goog.bindNative_ = function(a, b, c) {
-  return a.call.apply(a.bind, arguments);
-};
-goog.bindJs_ = function(a, b, c) {
-  if (!a) {
-    throw Error();
-  }
-  if (2 < arguments.length) {
-    var d = Array.prototype.slice.call(arguments, 2);
-    return function() {
-      var c = Array.prototype.slice.call(arguments);
-      Array.prototype.unshift.apply(c, d);
-      return a.apply(b, c);
-    };
-  }
-  return function() {
-    return a.apply(b, arguments);
-  };
-};
-goog.bind = function(a, b, c) {
-  Function.prototype.bind && -1 != Function.prototype.bind.toString().indexOf("native code") ? goog.bind = goog.bindNative_ : goog.bind = goog.bindJs_;
-  return goog.bind.apply(null, arguments);
-};
-goog.partial = function(a, b) {
-  var c = Array.prototype.slice.call(arguments, 1);
-  return function() {
-    var b = c.slice();
-    b.push.apply(b, arguments);
-    return a.apply(this, b);
-  };
-};
-goog.mixin = function(a, b) {
-  for (var c in b) {
-    a[c] = b[c];
-  }
-};
-goog.now = goog.TRUSTED_SITE && Date.now || function() {
-  return +new Date;
-};
-goog.globalEval = function(a) {
-  if (goog.global.execScript) {
-    goog.global.execScript(a, "JavaScript");
-  } else {
-    if (goog.global.eval) {
-      if (null == goog.evalWorksForGlobals_) {
-        if (goog.global.eval("var _evalTest_ = 1;"), "undefined" != typeof goog.global._evalTest_) {
-          try {
-            delete goog.global._evalTest_;
-          } catch (d) {
-          }
-          goog.evalWorksForGlobals_ = !0;
-        } else {
-          goog.evalWorksForGlobals_ = !1;
-        }
-      }
-      if (goog.evalWorksForGlobals_) {
-        goog.global.eval(a);
-      } else {
-        var b = goog.global.document, c = b.createElement("SCRIPT");
-        c.type = "text/javascript";
-        c.defer = !1;
-        c.appendChild(b.createTextNode(a));
-        b.body.appendChild(c);
-        b.body.removeChild(c);
-      }
-    } else {
-      throw Error("goog.globalEval not available");
-    }
-  }
-};
-goog.evalWorksForGlobals_ = null;
-goog.getCssName = function(a, b) {
-  var c = function(a) {
-    return goog.cssNameMapping_[a] || a;
-  }, d = function(a) {
-    a = a.split("-");
-    for (var b = [], d = 0;d < a.length;d++) {
-      b.push(c(a[d]));
-    }
-    return b.join("-");
-  }, d = goog.cssNameMapping_ ? "BY_WHOLE" == goog.cssNameMappingStyle_ ? c : d : function(a) {
-    return a;
-  };
-  return b ? a + "-" + d(b) : d(a);
-};
-goog.setCssNameMapping = function(a, b) {
-  goog.cssNameMapping_ = a;
-  goog.cssNameMappingStyle_ = b;
-};
-!COMPILED && goog.global.CLOSURE_CSS_NAME_MAPPING && (goog.cssNameMapping_ = goog.global.CLOSURE_CSS_NAME_MAPPING);
-goog.getMsg = function(a, b) {
-  b && (a = a.replace(/\{\$([^}]+)}/g, function(a, d) {
-    return null != b && d in b ? b[d] : a;
-  }));
-  return a;
-};
-goog.getMsgWithFallback = function(a, b) {
-  return a;
-};
-goog.exportSymbol = function(a, b, c) {
-  goog.exportPath_(a, b, c);
-};
-goog.exportProperty = function(a, b, c) {
-  a[b] = c;
-};
-goog.inherits = function(a, b) {
-  function c() {
-  }
-  c.prototype = b.prototype;
-  a.superClass_ = b.prototype;
-  a.prototype = new c;
-  a.prototype.constructor = a;
-  a.base = function(a, c, f) {
-    for (var g = Array(arguments.length - 2), h = 2;h < arguments.length;h++) {
-      g[h - 2] = arguments[h];
-    }
-    return b.prototype[c].apply(a, g);
-  };
-};
-goog.base = function(a, b, c) {
-  var d = arguments.callee.caller;
-  if (goog.STRICT_MODE_COMPATIBLE || goog.DEBUG && !d) {
-    throw Error("arguments.caller not defined.  goog.base() cannot be used with strict mode code. See http://www.ecma-international.org/ecma-262/5.1/#sec-C");
-  }
-  if (d.superClass_) {
-    for (var e = Array(arguments.length - 1), f = 1;f < arguments.length;f++) {
-      e[f - 1] = arguments[f];
-    }
-    return d.superClass_.constructor.apply(a, e);
-  }
-  e = Array(arguments.length - 2);
-  for (f = 2;f < arguments.length;f++) {
-    e[f - 2] = arguments[f];
-  }
-  for (var f = !1, g = a.constructor;g;g = g.superClass_ && g.superClass_.constructor) {
-    if (g.prototype[b] === d) {
-      f = !0;
-    } else {
-      if (f) {
-        return g.prototype[b].apply(a, e);
-      }
-    }
-  }
-  if (a[b] === d) {
-    return a.constructor.prototype[b].apply(a, e);
-  }
-  throw Error("goog.base called from a method of one name to a method of a different name");
-};
-goog.scope = function(a) {
-  if (goog.isInModuleLoader_()) {
-    throw Error("goog.scope is not supported within a goog.module.");
-  }
-  a.call(goog.global);
-};
-COMPILED || (goog.global.COMPILED = COMPILED);
-goog.defineClass = function(a, b) {
-  var c = b.constructor, d = b.statics;
-  c && c != Object.prototype.constructor || (c = function() {
-    throw Error("cannot instantiate an interface (no constructor defined).");
-  });
-  c = goog.defineClass.createSealingConstructor_(c, a);
-  a && goog.inherits(c, a);
-  delete b.constructor;
-  delete b.statics;
-  goog.defineClass.applyProperties_(c.prototype, b);
-  null != d && (d instanceof Function ? d(c) : goog.defineClass.applyProperties_(c, d));
-  return c;
-};
-goog.defineClass.SEAL_CLASS_INSTANCES = goog.DEBUG;
-goog.defineClass.createSealingConstructor_ = function(a, b) {
-  if (!goog.defineClass.SEAL_CLASS_INSTANCES) {
-    return a;
-  }
-  var c = !goog.defineClass.isUnsealable_(b), d = function() {
-    var b = a.apply(this, arguments) || this;
-    b[goog.UID_PROPERTY_] = b[goog.UID_PROPERTY_];
-    this.constructor === d && c && Object.seal instanceof Function && Object.seal(b);
-    return b;
-  };
-  return d;
-};
-goog.defineClass.isUnsealable_ = function(a) {
-  return a && a.prototype && a.prototype[goog.UNSEALABLE_CONSTRUCTOR_PROPERTY_];
-};
-goog.defineClass.OBJECT_PROTOTYPE_FIELDS_ = "constructor hasOwnProperty isPrototypeOf propertyIsEnumerable toLocaleString toString valueOf".split(" ");
-goog.defineClass.applyProperties_ = function(a, b) {
-  for (var c in b) {
-    Object.prototype.hasOwnProperty.call(b, c) && (a[c] = b[c]);
-  }
-  for (var d = 0;d < goog.defineClass.OBJECT_PROTOTYPE_FIELDS_.length;d++) {
-    c = goog.defineClass.OBJECT_PROTOTYPE_FIELDS_[d], Object.prototype.hasOwnProperty.call(b, c) && (a[c] = b[c]);
-  }
-};
-goog.tagUnsealableClass = function(a) {
-  !COMPILED && goog.defineClass.SEAL_CLASS_INSTANCES && (a.prototype[goog.UNSEALABLE_CONSTRUCTOR_PROPERTY_] = !0);
-};
-goog.UNSEALABLE_CONSTRUCTOR_PROPERTY_ = "goog_defineClass_legacy_unsealable";
-var axs = {};
-axs.browserUtils = {};
-axs.browserUtils.matchSelector = function(a, b) {
-  return a.matches ? a.matches(b) : a.webkitMatchesSelector ? a.webkitMatchesSelector(b) : a.mozMatchesSelector ? a.mozMatchesSelector(b) : a.msMatchesSelector ? a.msMatchesSelector(b) : !1;
-};
-axs.constants = {};
-axs.constants.ARIA_ROLES = {alert:{namefrom:["author"], parent:["region"]}, alertdialog:{namefrom:["author"], namerequired:!0, parent:["alert", "dialog"]}, application:{namefrom:["author"], namerequired:!0, parent:["landmark"]}, article:{namefrom:["author"], parent:["document", "region"]}, banner:{namefrom:["author"], parent:["landmark"]}, button:{childpresentational:!0, namefrom:["contents", "author"], namerequired:!0, parent:["command"], properties:["aria-expanded", "aria-pressed"]}, checkbox:{namefrom:["contents", 
-"author"], namerequired:!0, parent:["input"], requiredProperties:["aria-checked"], properties:["aria-checked"]}, columnheader:{namefrom:["contents", "author"], namerequired:!0, parent:["gridcell", "sectionhead", "widget"], properties:["aria-sort"], scope:["row"]}, combobox:{mustcontain:["listbox", "textbox"], namefrom:["author"], namerequired:!0, parent:["select"], requiredProperties:["aria-expanded"], properties:["aria-expanded", "aria-autocomplete", "aria-required"]}, command:{"abstract":!0, namefrom:["author"], 
-parent:["widget"]}, complementary:{namefrom:["author"], parent:["landmark"]}, composite:{"abstract":!0, childpresentational:!1, namefrom:["author"], parent:["widget"], properties:["aria-activedescendant"]}, contentinfo:{namefrom:["author"], parent:["landmark"]}, definition:{namefrom:["author"], parent:["section"]}, dialog:{namefrom:["author"], namerequired:!0, parent:["window"]}, directory:{namefrom:["contents", "author"], parent:["list"]}, document:{namefrom:[" author"], namerequired:!0, parent:["structure"], 
-properties:["aria-expanded"]}, form:{namefrom:["author"], parent:["landmark"]}, grid:{mustcontain:["row", "rowgroup"], namefrom:["author"], namerequired:!0, parent:["composite", "region"], properties:["aria-level", "aria-multiselectable", "aria-readonly"]}, gridcell:{namefrom:["contents", "author"], namerequired:!0, parent:["section", "widget"], properties:["aria-readonly", "aria-required", "aria-selected"], scope:["row"]}, group:{namefrom:[" author"], parent:["section"], properties:["aria-activedescendant"]}, 
-heading:{namerequired:!0, parent:["sectionhead"], properties:["aria-level"]}, img:{childpresentational:!0, namefrom:["author"], namerequired:!0, parent:["section"]}, input:{"abstract":!0, namefrom:["author"], parent:["widget"]}, landmark:{"abstract":!0, namefrom:["contents", "author"], namerequired:!1, parent:["region"]}, link:{namefrom:["contents", "author"], namerequired:!0, parent:["command"], properties:["aria-expanded"]}, list:{mustcontain:["group", "listitem"], namefrom:["author"], parent:["region"]}, 
-listbox:{mustcontain:["option"], namefrom:["author"], namerequired:!0, parent:["list", "select"], properties:["aria-multiselectable", "aria-required"]}, listitem:{namefrom:["contents", "author"], namerequired:!0, parent:["section"], properties:["aria-level", "aria-posinset", "aria-setsize"], scope:["list"]}, log:{namefrom:[" author"], namerequired:!0, parent:["region"]}, main:{namefrom:["author"], parent:["landmark"]}, marquee:{namerequired:!0, parent:["section"]}, math:{childpresentational:!0, namefrom:["author"], 
-parent:["section"]}, menu:{mustcontain:["group", "menuitemradio", "menuitem", "menuitemcheckbox"], namefrom:["author"], namerequired:!0, parent:["list", "select"]}, menubar:{namefrom:["author"], parent:["menu"]}, menuitem:{namefrom:["contents", "author"], namerequired:!0, parent:["command"], scope:["menu", "menubar"]}, menuitemcheckbox:{namefrom:["contents", "author"], namerequired:!0, parent:["checkbox", "menuitem"], scope:["menu", "menubar"]}, menuitemradio:{namefrom:["contents", "author"], namerequired:!0, 
-parent:["menuitemcheckbox", "radio"], scope:["menu", "menubar"]}, navigation:{namefrom:["author"], parent:["landmark"]}, note:{namefrom:["author"], parent:["section"]}, option:{namefrom:["contents", "author"], namerequired:!0, parent:["input"], properties:["aria-checked", "aria-posinset", "aria-selected", "aria-setsize"]}, presentation:{parent:["structure"]}, progressbar:{childpresentational:!0, namefrom:["author"], namerequired:!0, parent:["range"]}, radio:{namefrom:["contents", "author"], namerequired:!0, 
-parent:["checkbox", "option"]}, radiogroup:{mustcontain:["radio"], namefrom:["author"], namerequired:!0, parent:["select"], properties:["aria-required"]}, range:{"abstract":!0, namefrom:["author"], parent:["widget"], properties:["aria-valuemax", "aria-valuemin", "aria-valuenow", "aria-valuetext"]}, region:{namefrom:[" author"], parent:["section"]}, roletype:{"abstract":!0, properties:"aria-atomic aria-busy aria-controls aria-describedby aria-disabled aria-dropeffect aria-flowto aria-grabbed aria-haspopup aria-hidden aria-invalid aria-label aria-labelledby aria-live aria-owns aria-relevant".split(" ")}, 
-row:{mustcontain:["columnheader", "gridcell", "rowheader"], namefrom:["contents", "author"], parent:["group", "widget"], properties:["aria-level", "aria-selected"], scope:["grid", "rowgroup", "treegrid"]}, rowgroup:{mustcontain:["row"], namefrom:["contents", "author"], parent:["group"], scope:["grid"]}, rowheader:{namefrom:["contents", "author"], namerequired:!0, parent:["gridcell", "sectionhead", "widget"], properties:["aria-sort"], scope:["row"]}, search:{namefrom:["author"], parent:["landmark"]}, 
-section:{"abstract":!0, namefrom:["contents", "author"], parent:["structure"], properties:["aria-expanded"]}, sectionhead:{"abstract":!0, namefrom:["contents", "author"], parent:["structure"], properties:["aria-expanded"]}, select:{"abstract":!0, namefrom:["author"], parent:["composite", "group", "input"]}, separator:{childpresentational:!0, namefrom:["author"], parent:["structure"], properties:["aria-expanded", "aria-orientation"]}, scrollbar:{childpresentational:!0, namefrom:["author"], namerequired:!1, 
-parent:["input", "range"], requiredProperties:["aria-controls", "aria-orientation", "aria-valuemax", "aria-valuemin", "aria-valuenow"], properties:["aria-controls", "aria-orientation", "aria-valuemax", "aria-valuemin", "aria-valuenow"]}, slider:{childpresentational:!0, namefrom:["author"], namerequired:!0, parent:["input", "range"], requiredProperties:["aria-valuemax", "aria-valuemin", "aria-valuenow"], properties:["aria-valuemax", "aria-valuemin", "aria-valuenow", "aria-orientation"]}, spinbutton:{namefrom:["author"], 
-namerequired:!0, parent:["input", "range"], requiredProperties:["aria-valuemax", "aria-valuemin", "aria-valuenow"], properties:["aria-valuemax", "aria-valuemin", "aria-valuenow", "aria-required"]}, status:{parent:["region"]}, structure:{"abstract":!0, parent:["roletype"]}, tab:{namefrom:["contents", "author"], parent:["sectionhead", "widget"], properties:["aria-selected"], scope:["tablist"]}, tablist:{mustcontain:["tab"], namefrom:["author"], parent:["composite", "directory"], properties:["aria-level"]}, 
-tabpanel:{namefrom:["author"], namerequired:!0, parent:["region"]}, textbox:{namefrom:["author"], namerequired:!0, parent:["input"], properties:["aria-activedescendant", "aria-autocomplete", "aria-multiline", "aria-readonly", "aria-required"]}, timer:{namefrom:["author"], namerequired:!0, parent:["status"]}, toolbar:{namefrom:["author"], parent:["group"]}, tooltip:{namerequired:!0, parent:["section"]}, tree:{mustcontain:["group", "treeitem"], namefrom:["author"], namerequired:!0, parent:["select"], 
-properties:["aria-multiselectable", "aria-required"]}, treegrid:{mustcontain:["row"], namefrom:["author"], namerequired:!0, parent:["grid", "tree"]}, treeitem:{namefrom:["contents", "author"], namerequired:!0, parent:["listitem", "option"], scope:["group", "tree"]}, widget:{"abstract":!0, parent:["roletype"]}, window:{"abstract":!0, namefrom:[" author"], parent:["roletype"], properties:["aria-expanded"]}};
-axs.constants.WIDGET_ROLES = {};
-axs.constants.addAllParentRolesToSet_ = function(a, b) {
-  if (a.parent) {
-    for (var c = a.parent, d = 0;d < c.length;d++) {
-      var e = c[d];
-      b[e] = !0;
-      axs.constants.addAllParentRolesToSet_(axs.constants.ARIA_ROLES[e], b);
-    }
-  }
-};
-axs.constants.addAllPropertiesToSet_ = function(a, b, c) {
-  var d = a[b];
-  if (d) {
-    for (var e = 0;e < d.length;e++) {
-      c[d[e]] = !0;
-    }
-  }
-  if (a.parent) {
-    for (a = a.parent, d = 0;d < a.length;d++) {
-      axs.constants.addAllPropertiesToSet_(axs.constants.ARIA_ROLES[a[d]], b, c);
-    }
-  }
-};
-for (var roleName in axs.constants.ARIA_ROLES) {
-  var role = axs.constants.ARIA_ROLES[roleName], propertiesSet = {};
-  axs.constants.addAllPropertiesToSet_(role, "properties", propertiesSet);
-  role.propertiesSet = propertiesSet;
-  var requiredPropertiesSet = {};
-  axs.constants.addAllPropertiesToSet_(role, "requiredProperties", requiredPropertiesSet);
-  role.requiredPropertiesSet = requiredPropertiesSet;
-  var parentRolesSet = {};
-  axs.constants.addAllParentRolesToSet_(role, parentRolesSet);
-  role.allParentRolesSet = parentRolesSet;
-  "widget" in parentRolesSet && (axs.constants.WIDGET_ROLES[roleName] = role);
-}
-axs.constants.ARIA_PROPERTIES = {activedescendant:{type:"property", valueType:"idref"}, atomic:{defaultValue:"false", type:"property", valueType:"boolean"}, autocomplete:{defaultValue:"none", type:"property", valueType:"token", values:["inline", "list", "both", "none"]}, busy:{defaultValue:"false", type:"state", valueType:"boolean"}, checked:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", "mixed", "undefined"]}, controls:{type:"property", valueType:"idref_list"}, 
-describedby:{type:"property", valueType:"idref_list"}, disabled:{defaultValue:"false", type:"state", valueType:"boolean"}, dropeffect:{defaultValue:"none", type:"property", valueType:"token_list", values:"copy move link execute popup none".split(" ")}, expanded:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", "undefined"]}, flowto:{type:"property", valueType:"idref_list"}, grabbed:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", 
-"undefined"]}, haspopup:{defaultValue:"false", type:"property", valueType:"boolean"}, hidden:{defaultValue:"false", type:"state", valueType:"boolean"}, invalid:{defaultValue:"false", type:"state", valueType:"token", values:["grammar", "false", "spelling", "true"]}, label:{type:"property", valueType:"string"}, labelledby:{type:"property", valueType:"idref_list"}, level:{type:"property", valueType:"integer"}, live:{defaultValue:"off", type:"property", valueType:"token", values:["off", "polite", "assertive"]}, 
-multiline:{defaultValue:"false", type:"property", valueType:"boolean"}, multiselectable:{defaultValue:"false", type:"property", valueType:"boolean"}, orientation:{defaultValue:"vertical", type:"property", valueType:"token", values:["horizontal", "vertical"]}, owns:{type:"property", valueType:"idref_list"}, posinset:{type:"property", valueType:"integer"}, pressed:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", "mixed", "undefined"]}, readonly:{defaultValue:"false", 
-type:"property", valueType:"boolean"}, relevant:{defaultValue:"additions text", type:"property", valueType:"token_list", values:["additions", "removals", "text", "all"]}, required:{defaultValue:"false", type:"property", valueType:"boolean"}, selected:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", "undefined"]}, setsize:{type:"property", valueType:"integer"}, sort:{defaultValue:"none", type:"property", valueType:"token", values:["ascending", "descending", "none", 
-"other"]}, valuemax:{type:"property", valueType:"decimal"}, valuemin:{type:"property", valueType:"decimal"}, valuenow:{type:"property", valueType:"decimal"}, valuetext:{type:"property", valueType:"string"}};
-(function() {
-  for (var a in axs.constants.ARIA_PROPERTIES) {
-    var b = axs.constants.ARIA_PROPERTIES[a];
-    if (b.values) {
-      for (var c = {}, d = 0;d < b.values.length;d++) {
-        c[b.values[d]] = !0;
-      }
-      b.valuesSet = c;
-    }
-  }
-})();
-axs.constants.GLOBAL_PROPERTIES = axs.constants.ARIA_ROLES.roletype.propertiesSet;
-axs.constants.NO_ROLE_NAME = " ";
-axs.constants.WIDGET_ROLE_TO_NAME = {alert:"aria_role_alert", alertdialog:"aria_role_alertdialog", button:"aria_role_button", checkbox:"aria_role_checkbox", columnheader:"aria_role_columnheader", combobox:"aria_role_combobox", dialog:"aria_role_dialog", grid:"aria_role_grid", gridcell:"aria_role_gridcell", link:"aria_role_link", listbox:"aria_role_listbox", log:"aria_role_log", marquee:"aria_role_marquee", menu:"aria_role_menu", menubar:"aria_role_menubar", menuitem:"aria_role_menuitem", menuitemcheckbox:"aria_role_menuitemcheckbox", 
-menuitemradio:"aria_role_menuitemradio", option:axs.constants.NO_ROLE_NAME, progressbar:"aria_role_progressbar", radio:"aria_role_radio", radiogroup:"aria_role_radiogroup", rowheader:"aria_role_rowheader", scrollbar:"aria_role_scrollbar", slider:"aria_role_slider", spinbutton:"aria_role_spinbutton", status:"aria_role_status", tab:"aria_role_tab", tabpanel:"aria_role_tabpanel", textbox:"aria_role_textbox", timer:"aria_role_timer", toolbar:"aria_role_toolbar", tooltip:"aria_role_tooltip", treeitem:"aria_role_treeitem"};
-axs.constants.STRUCTURE_ROLE_TO_NAME = {article:"aria_role_article", application:"aria_role_application", banner:"aria_role_banner", columnheader:"aria_role_columnheader", complementary:"aria_role_complementary", contentinfo:"aria_role_contentinfo", definition:"aria_role_definition", directory:"aria_role_directory", document:"aria_role_document", form:"aria_role_form", group:"aria_role_group", heading:"aria_role_heading", img:"aria_role_img", list:"aria_role_list", listitem:"aria_role_listitem", 
-main:"aria_role_main", math:"aria_role_math", navigation:"aria_role_navigation", note:"aria_role_note", region:"aria_role_region", rowheader:"aria_role_rowheader", search:"aria_role_search", separator:"aria_role_separator"};
-axs.constants.ATTRIBUTE_VALUE_TO_STATUS = [{name:"aria-autocomplete", values:{inline:"aria_autocomplete_inline", list:"aria_autocomplete_list", both:"aria_autocomplete_both"}}, {name:"aria-checked", values:{"true":"aria_checked_true", "false":"aria_checked_false", mixed:"aria_checked_mixed"}}, {name:"aria-disabled", values:{"true":"aria_disabled_true"}}, {name:"aria-expanded", values:{"true":"aria_expanded_true", "false":"aria_expanded_false"}}, {name:"aria-invalid", values:{"true":"aria_invalid_true", 
-grammar:"aria_invalid_grammar", spelling:"aria_invalid_spelling"}}, {name:"aria-multiline", values:{"true":"aria_multiline_true"}}, {name:"aria-multiselectable", values:{"true":"aria_multiselectable_true"}}, {name:"aria-pressed", values:{"true":"aria_pressed_true", "false":"aria_pressed_false", mixed:"aria_pressed_mixed"}}, {name:"aria-readonly", values:{"true":"aria_readonly_true"}}, {name:"aria-required", values:{"true":"aria_required_true"}}, {name:"aria-selected", values:{"true":"aria_selected_true", 
-"false":"aria_selected_false"}}];
-axs.constants.INPUT_TYPE_TO_INFORMATION_TABLE_MSG = {button:"input_type_button", checkbox:"input_type_checkbox", color:"input_type_color", datetime:"input_type_datetime", "datetime-local":"input_type_datetime_local", date:"input_type_date", email:"input_type_email", file:"input_type_file", image:"input_type_image", month:"input_type_month", number:"input_type_number", password:"input_type_password", radio:"input_type_radio", range:"input_type_range", reset:"input_type_reset", search:"input_type_search", 
-submit:"input_type_submit", tel:"input_type_tel", text:"input_type_text", url:"input_type_url", week:"input_type_week"};
-axs.constants.TAG_TO_INFORMATION_TABLE_VERBOSE_MSG = {A:"tag_link", BUTTON:"tag_button", H1:"tag_h1", H2:"tag_h2", H3:"tag_h3", H4:"tag_h4", H5:"tag_h5", H6:"tag_h6", LI:"tag_li", OL:"tag_ol", SELECT:"tag_select", TEXTAREA:"tag_textarea", UL:"tag_ul", SECTION:"tag_section", NAV:"tag_nav", ARTICLE:"tag_article", ASIDE:"tag_aside", HGROUP:"tag_hgroup", HEADER:"tag_header", FOOTER:"tag_footer", TIME:"tag_time", MARK:"tag_mark"};
-axs.constants.TAG_TO_INFORMATION_TABLE_BRIEF_MSG = {BUTTON:"tag_button", SELECT:"tag_select", TEXTAREA:"tag_textarea"};
-axs.constants.MIXED_VALUES = {"true":!0, "false":!0, mixed:!0};
-axs.constants.Severity = {INFO:"Info", WARNING:"Warning", SEVERE:"Severe"};
-axs.constants.AuditResult = {PASS:"PASS", FAIL:"FAIL", NA:"NA"};
-axs.constants.InlineElements = {TT:!0, I:!0, B:!0, BIG:!0, SMALL:!0, EM:!0, STRONG:!0, DFN:!0, CODE:!0, SAMP:!0, KBD:!0, VAR:!0, CITE:!0, ABBR:!0, ACRONYM:!0, A:!0, IMG:!0, OBJECT:!0, BR:!0, SCRIPT:!0, MAP:!0, Q:!0, SUB:!0, SUP:!0, SPAN:!0, BDO:!0, INPUT:!0, SELECT:!0, TEXTAREA:!0, LABEL:!0, BUTTON:!0};
-axs.constants.NATIVELY_DISABLEABLE = {BUTTON:!0, INPUT:!0, SELECT:!0, TEXTAREA:!0, FIELDSET:!0, OPTGROUP:!0, OPTION:!0};
-axs.constants.ARIA_TO_HTML_ATTRIBUTE = {"aria-checked":"checked", "aria-disabled":"disabled", "aria-hidden":"hidden", "aria-expanded":"open", "aria-valuemax":"max", "aria-valuemin":"min", "aria-readonly":"readonly", "aria-required":"required", "aria-selected":"selected", "aria-valuenow":"value"};
-axs.constants.TAG_TO_IMPLICIT_SEMANTIC_INFO = {A:[{role:"link", allowed:"button checkbox menuitem menuitemcheckbox menuitemradio tab treeitem".split(" "), selector:"a[href]"}], ADDRESS:[{role:"", allowed:["contentinfo", "presentation"]}], AREA:[{role:"link", selector:"area[href]"}], ARTICLE:[{role:"article", allowed:["presentation", "article", "document", "application", "main"]}], ASIDE:[{role:"complementary", allowed:["note", "complementary", "search", "presentation"]}], AUDIO:[{role:"", allowed:["application", 
-"presentation"]}], BASE:[{role:"", reserved:!0}], BODY:[{role:"document", allowed:["presentation"]}], BUTTON:[{role:"button", allowed:["link", "menuitem", "menuitemcheckbox", "menuitemradio", "radio"], selector:'button:not([aria-pressed]):not([type="menu"])'}, {role:"button", allowed:["button"], selector:"button[aria-pressed]"}, {role:"button", attributes:{"aria-haspopup":!0}, allowed:["link", "menuitem", "menuitemcheckbox", "menuitemradio", "radio"], selector:'button[type="menu"]'}], CAPTION:[{role:"", 
-allowed:["presentation"]}], COL:[{role:"", reserved:!0}], COLGROUP:[{role:"", reserved:!0}], DATALIST:[{role:"listbox", attributes:{"aria-multiselectable":!1}, allowed:["presentation"]}], DEL:[{role:"", allowed:["*"]}], DD:[{role:"", allowed:["presentation"]}], DT:[{role:"", allowed:["presentation"]}], DETAILS:[{role:"group", allowed:["group", "presentation"]}], DIALOG:[{role:"dialog", allowed:"dialog alert alertdialog application log marquee status".split(" "), selector:"dialog[open]"}, {role:"dialog", 
-attributes:{"aria-hidden":!0}, allowed:"dialog alert alertdialog application log marquee status".split(" "), selector:"dialog:not([open])"}], DIV:[{role:"", allowed:["*"]}], DL:[{role:"list", allowed:["presentation"]}], EMBED:[{role:"", allowed:["application", "document", "img", "presentation"]}], FIGURE:[{role:"", allowed:["*"]}], FOOTER:[{role:"", allowed:["contentinfo", "presentation"]}], FORM:[{role:"form", allowed:["presentation"]}], P:[{role:"", allowed:["*"]}], PRE:[{role:"", allowed:["*"]}], 
-BLOCKQUOTE:[{role:"", allowed:["*"]}], H1:[{role:"heading"}], H2:[{role:"heading"}], H3:[{role:"heading"}], H4:[{role:"heading"}], H5:[{role:"heading"}], H6:[{role:"heading"}], HEAD:[{role:"", reserved:!0}], HEADER:[{role:"", allowed:["banner", "presentation"]}], HR:[{role:"separator", allowed:["presentation"]}], HTML:[{role:"", reserved:!0}], IFRAME:[{role:"", allowed:["application", "document", "img", "presentation"], selector:"iframe:not([seamless])"}, {role:"", allowed:["application", "document", 
-"img", "presentation", "group"], selector:"iframe[seamless]"}], IMG:[{role:"presentation", reserved:!0, selector:'img[alt=""]'}, {role:"img", allowed:["*"], selector:'img[alt]:not([alt=""])'}], INPUT:[{role:"button", allowed:["link", "menuitem", "menuitemcheckbox", "menuitemradio", "radio"], selector:'input[type="button"]:not([aria-pressed])'}, {role:"button", allowed:["button"], selector:'input[type="button"][aria-pressed]'}, {role:"checkbox", allowed:["checkbox"], selector:'input[type="checkbox"]'}, 
-{role:"", selector:'input[type="color"]'}, {role:"", selector:'input[type="date"]'}, {role:"", selector:'input[type="datetime"]'}, {role:"textbox", selector:'input[type="email"]:not([list])'}, {role:"", selector:'input[type="file"]'}, {role:"", reserved:!0, selector:'input[type="hidden"]'}, {role:"button", allowed:["button"], selector:'input[type="image"][aria-pressed]'}, {role:"button", allowed:["link", "menuitem", "menuitemcheckbox", "menuitemradio", "radio"], selector:'input[type="image"]:not([aria-pressed])'}, 
-{role:"", selector:'input[type="month"]'}, {role:"", selector:'input[type="number"]'}, {role:"textbox", selector:'input[type="password"]'}, {role:"radio", allowed:["menuitemradio"], selector:'input[type="radio"]'}, {role:"slider", selector:'input[type="range"]'}, {role:"button", selector:'input[type="reset"]'}, {role:"combobox", selector:'input[type="search"][list]'}, {role:"textbox", selector:'input[type="search"]:not([list])'}, {role:"button", selector:'input[type="submit"]'}, {role:"combobox", 
-selector:'input[type="tel"][list]'}, {role:"textbox", selector:'input[type="tel"]:not([list])'}, {role:"combobox", selector:'input[type="text"][list]'}, {role:"textbox", selector:'input[type="text"]:not([list])'}, {role:"textbox", selector:"input:not([type])"}, {role:"", selector:'input[type="time"]'}, {role:"combobox", selector:'input[type="url"][list]'}, {role:"textbox", selector:'input[type="url"]:not([list])'}, {role:"", selector:'input[type="week"]'}], INS:[{role:"", allowed:["*"]}], KEYGEN:[{role:""}], 
-LABEL:[{role:"", allowed:["presentation"]}], LI:[{role:"listitem", allowed:"menuitem menuitemcheckbox menuitemradio option tab treeitem presentation".split(" "), selector:'ol:not([role="presentation"])>li, ul:not([role="presentation"])>li'}, {role:"listitem", allowed:"listitem menuitem menuitemcheckbox menuitemradio option tab treeitem presentation".split(" "), selector:'ol[role="presentation"]>li, ul[role="presentation"]>li'}], LINK:[{role:"link", reserved:!0, selector:"link[href]"}], MAIN:[{role:"", 
-allowed:["main", "presentation"]}], MAP:[{role:"", reserved:!0}], MATH:[{role:"", allowed:["presentation"]}], MENU:[{role:"toolbar", selector:'menu[type="toolbar"]'}], MENUITEM:[{role:"menuitem", selector:'menuitem[type="command"]'}, {role:"menuitemcheckbox", selector:'menuitem[type="checkbox"]'}, {role:"menuitemradio", selector:'menuitem[type="radio"]'}], META:[{role:"", reserved:!0}], METER:[{role:"progressbar", allowed:["presentation"]}], NAV:[{role:"navigation", allowed:["navigation", "presentation"]}], 
-NOSCRIPT:[{role:"", reserved:!0}], OBJECT:[{role:"", allowed:["application", "document", "img", "presentation"]}], OL:[{role:"list", allowed:"directory group listbox menu menubar tablist toolbar tree presentation".split(" ")}], OPTGROUP:[{role:"", allowed:["presentation"]}], OPTION:[{role:"option"}], OUTPUT:[{role:"status", allowed:["*"]}], PARAM:[{role:"", reserved:!0}], PICTURE:[{role:"", reserved:!0}], PROGRESS:[{role:"progressbar", allowed:["presentation"]}], SCRIPT:[{role:"", reserved:!0}], 
-SECTION:[{role:"region", allowed:"alert alertdialog application contentinfo dialog document log marquee search status presentation".split(" ")}], SELECT:[{role:"listbox"}], SOURCE:[{role:"", reserved:!0}], SPAN:[{role:"", allowed:["*"]}], STYLE:[{role:"", reserved:!0}], SVG:[{role:"", allowed:["application", "document", "img", "presentation"]}], SUMMARY:[{role:"", allowed:["presentation"]}], TABLE:[{role:"", allowed:["*"]}], TEMPLATE:[{role:"", reserved:!0}], TEXTAREA:[{role:"textbox"}], TBODY:[{role:"rowgroup", 
-allowed:["*"]}], THEAD:[{role:"rowgroup", allowed:["*"]}], TFOOT:[{role:"rowgroup", allowed:["*"]}], TITLE:[{role:"", reserved:!0}], TD:[{role:"", allowed:["*"]}], TH:[{role:"", allowed:["*"]}], TR:[{role:"", allowed:["*"]}], TRACK:[{role:"", reserved:!0}], UL:[{role:"list", allowed:"directory group listbox menu menubar tablist toolbar tree presentation".split(" ")}], VIDEO:[{role:"", allowed:["application", "presentation"]}]};
-axs.color = {};
-axs.color.Color = function(a, b, c, d) {
-  this.red = a;
-  this.green = b;
-  this.blue = c;
-  this.alpha = d;
-};
-axs.color.YCbCr = function(a) {
-  this.luma = this.z = a[0];
-  this.Cb = this.x = a[1];
-  this.Cr = this.y = a[2];
-};
-axs.color.YCbCr.prototype = {multiply:function(a) {
-  return new axs.color.YCbCr([this.luma * a, this.Cb * a, this.Cr * a]);
-}, add:function(a) {
-  return new axs.color.YCbCr([this.luma + a.luma, this.Cb + a.Cb, this.Cr + a.Cr]);
-}, subtract:function(a) {
-  return new axs.color.YCbCr([this.luma - a.luma, this.Cb - a.Cb, this.Cr - a.Cr]);
-}};
-axs.color.calculateContrastRatio = function(a, b) {
-  1 > a.alpha && (a = axs.color.flattenColors(a, b));
-  var c = axs.color.calculateLuminance(a), d = axs.color.calculateLuminance(b);
-  return (Math.max(c, d) + .05) / (Math.min(c, d) + .05);
-};
-axs.color.calculateLuminance = function(a) {
-  return axs.color.toYCbCr(a).luma;
-};
-axs.color.luminanceRatio = function(a, b) {
-  return (Math.max(a, b) + .05) / (Math.min(a, b) + .05);
-};
-axs.color.parseColor = function(a) {
-  if ("transparent" === a) {
-    return new axs.color.Color(0, 0, 0, 0);
-  }
-  var b = a.match(/^rgb\((\d+), (\d+), (\d+)\)$/);
-  if (b) {
-    a = parseInt(b[1], 10);
-    var c = parseInt(b[2], 10), d = parseInt(b[3], 10);
-    return new axs.color.Color(a, c, d, 1);
-  }
-  return (b = a.match(/^rgba\((\d+), (\d+), (\d+), (\d*(\.\d+)?)\)/)) ? (a = parseInt(b[1], 10), c = parseInt(b[2], 10), d = parseInt(b[3], 10), b = parseFloat(b[4]), new axs.color.Color(a, c, d, b)) : null;
-};
-axs.color.colorChannelToString = function(a) {
-  a = Math.round(a);
-  return 15 >= a ? "0" + a.toString(16) : a.toString(16);
-};
-axs.color.colorToString = function(a) {
-  return 1 == a.alpha ? "#" + axs.color.colorChannelToString(a.red) + axs.color.colorChannelToString(a.green) + axs.color.colorChannelToString(a.blue) : "rgba(" + [a.red, a.green, a.blue, a.alpha].join() + ")";
-};
-axs.color.luminanceFromContrastRatio = function(a, b, c) {
-  return c ? (a + .05) * b - .05 : (a + .05) / b - .05;
-};
-axs.color.translateColor = function(a, b) {
-  for (var c = b > a.luma ? axs.color.WHITE_YCC : axs.color.BLACK_YCC, d = c == axs.color.WHITE_YCC ? axs.color.YCC_CUBE_FACES_WHITE : axs.color.YCC_CUBE_FACES_BLACK, e = new axs.color.YCbCr([0, a.Cb, a.Cr]), f = new axs.color.YCbCr([1, a.Cb, a.Cr]), f = {a:e, b:f}, e = null, g = 0;g < d.length && !(e = axs.color.findIntersection(f, d[g]), 0 <= e.z && 1 >= e.z);g++) {
-  }
-  if (!e) {
-    throw "Couldn't find intersection with YCbCr color cube for Cb=" + a.Cb + ", Cr=" + a.Cr + ".";
-  }
-  if (e.x != a.x || e.y != a.y) {
-    throw "Intersection has wrong Cb/Cr values.";
-  }
-  if (Math.abs(c.luma - e.luma) < Math.abs(c.luma - b)) {
-    return c = [b, a.Cb, a.Cr], axs.color.fromYCbCrArray(c);
-  }
-  c = (b - e.luma) / (c.luma - e.luma);
-  c = [b, e.Cb - e.Cb * c, e.Cr - e.Cr * c];
-  return axs.color.fromYCbCrArray(c);
-};
-axs.color.suggestColors = function(a, b, c) {
-  var d = {}, e = axs.color.calculateLuminance(a), f = axs.color.calculateLuminance(b), g = f > e, h = axs.color.toYCbCr(b), k = axs.color.toYCbCr(a), m;
-  for (m in c) {
-    var l = c[m], n = axs.color.luminanceFromContrastRatio(e, l + .02, g);
-    if (1 >= n && 0 <= n) {
-      var p = axs.color.translateColor(h, n), l = axs.color.calculateContrastRatio(p, a), n = {};
-      n.fg = axs.color.colorToString(p);
-      n.bg = axs.color.colorToString(a);
-      n.contrast = l.toFixed(2);
-      d[m] = n;
-    } else {
-      l = axs.color.luminanceFromContrastRatio(f, l + .02, !g), 1 >= l && 0 <= l && (p = axs.color.translateColor(k, l), l = axs.color.calculateContrastRatio(b, p), n = {}, n.bg = axs.color.colorToString(p), n.fg = axs.color.colorToString(b), n.contrast = l.toFixed(2), d[m] = n);
-    }
-  }
-  return d;
-};
-axs.color.flattenColors = function(a, b) {
-  var c = a.alpha;
-  return new axs.color.Color((1 - c) * b.red + c * a.red, (1 - c) * b.green + c * a.green, (1 - c) * b.blue + c * a.blue, a.alpha + b.alpha * (1 - a.alpha));
-};
-axs.color.multiplyMatrixVector = function(a, b) {
-  var c = b[0], d = b[1], e = b[2];
-  return [a[0][0] * c + a[0][1] * d + a[0][2] * e, a[1][0] * c + a[1][1] * d + a[1][2] * e, a[2][0] * c + a[2][1] * d + a[2][2] * e];
-};
-axs.color.toYCbCr = function(a) {
-  var b = a.red / 255, c = a.green / 255;
-  a = a.blue / 255;
-  return new axs.color.YCbCr(axs.color.multiplyMatrixVector(axs.color.YCC_MATRIX, [.03928 >= b ? b / 12.92 : Math.pow((b + .055) / 1.055, 2.4), .03928 >= c ? c / 12.92 : Math.pow((c + .055) / 1.055, 2.4), .03928 >= a ? a / 12.92 : Math.pow((a + .055) / 1.055, 2.4)]));
-};
-axs.color.fromYCbCr = function(a) {
-  return axs.color.fromYCbCrArray([a.luma, a.Cb, a.Cr]);
-};
-axs.color.fromYCbCrArray = function(a) {
-  var b = axs.color.multiplyMatrixVector(axs.color.INVERTED_YCC_MATRIX, a);
-  a = b[0];
-  var c = b[1], b = b[2];
-  return new axs.color.Color(Math.min(Math.max(Math.round(255 * (.00303949 >= a ? 12.92 * a : 1.055 * Math.pow(a, 1 / 2.4) - .055)), 0), 255), Math.min(Math.max(Math.round(255 * (.00303949 >= c ? 12.92 * c : 1.055 * Math.pow(c, 1 / 2.4) - .055)), 0), 255), Math.min(Math.max(Math.round(255 * (.00303949 >= b ? 12.92 * b : 1.055 * Math.pow(b, 1 / 2.4) - .055)), 0), 255), 1);
-};
-axs.color.RGBToYCbCrMatrix = function(a, b) {
-  return [[a, 1 - a - b, b], [-a / (2 - 2 * b), (a + b - 1) / (2 - 2 * b), (1 - b) / (2 - 2 * b)], [(1 - a) / (2 - 2 * a), (a + b - 1) / (2 - 2 * a), -b / (2 - 2 * a)]];
-};
-axs.color.invert3x3Matrix = function(a) {
-  var b = a[0][0], c = a[0][1], d = a[0][2], e = a[1][0], f = a[1][1], g = a[1][2], h = a[2][0], k = a[2][1];
-  a = a[2][2];
-  return axs.color.scalarMultiplyMatrix([[f * a - g * k, d * k - c * a, c * g - d * f], [g * h - e * a, b * a - d * h, d * e - b * g], [e * k - f * h, h * c - b * k, b * f - c * e]], 1 / (b * (f * a - g * k) - c * (a * e - g * h) + d * (e * k - f * h)));
-};
-axs.color.findIntersection = function(a, b) {
-  var c = [a.a.x - b.p0.x, a.a.y - b.p0.y, a.a.z - b.p0.z], d = axs.color.invert3x3Matrix([[a.a.x - a.b.x, b.p1.x - b.p0.x, b.p2.x - b.p0.x], [a.a.y - a.b.y, b.p1.y - b.p0.y, b.p2.y - b.p0.y], [a.a.z - a.b.z, b.p1.z - b.p0.z, b.p2.z - b.p0.z]]), c = axs.color.multiplyMatrixVector(d, c)[0];
-  return a.a.add(a.b.subtract(a.a).multiply(c));
-};
-axs.color.scalarMultiplyMatrix = function(a, b) {
-  for (var c = [], d = 0;3 > d;d++) {
-    c[d] = axs.color.scalarMultiplyVector(a[d], b);
-  }
-  return c;
-};
-axs.color.scalarMultiplyVector = function(a, b) {
-  for (var c = [], d = 0;d < a.length;d++) {
-    c[d] = a[d] * b;
-  }
-  return c;
-};
-axs.color.kR = .2126;
-axs.color.kB = .0722;
-axs.color.YCC_MATRIX = axs.color.RGBToYCbCrMatrix(axs.color.kR, axs.color.kB);
-axs.color.INVERTED_YCC_MATRIX = axs.color.invert3x3Matrix(axs.color.YCC_MATRIX);
-axs.color.BLACK = new axs.color.Color(0, 0, 0, 1);
-axs.color.BLACK_YCC = axs.color.toYCbCr(axs.color.BLACK);
-axs.color.WHITE = new axs.color.Color(255, 255, 255, 1);
-axs.color.WHITE_YCC = axs.color.toYCbCr(axs.color.WHITE);
-axs.color.RED = new axs.color.Color(255, 0, 0, 1);
-axs.color.RED_YCC = axs.color.toYCbCr(axs.color.RED);
-axs.color.GREEN = new axs.color.Color(0, 255, 0, 1);
-axs.color.GREEN_YCC = axs.color.toYCbCr(axs.color.GREEN);
-axs.color.BLUE = new axs.color.Color(0, 0, 255, 1);
-axs.color.BLUE_YCC = axs.color.toYCbCr(axs.color.BLUE);
-axs.color.CYAN = new axs.color.Color(0, 255, 255, 1);
-axs.color.CYAN_YCC = axs.color.toYCbCr(axs.color.CYAN);
-axs.color.MAGENTA = new axs.color.Color(255, 0, 255, 1);
-axs.color.MAGENTA_YCC = axs.color.toYCbCr(axs.color.MAGENTA);
-axs.color.YELLOW = new axs.color.Color(255, 255, 0, 1);
-axs.color.YELLOW_YCC = axs.color.toYCbCr(axs.color.YELLOW);
-axs.color.YCC_CUBE_FACES_BLACK = [{p0:axs.color.BLACK_YCC, p1:axs.color.RED_YCC, p2:axs.color.GREEN_YCC}, {p0:axs.color.BLACK_YCC, p1:axs.color.GREEN_YCC, p2:axs.color.BLUE_YCC}, {p0:axs.color.BLACK_YCC, p1:axs.color.BLUE_YCC, p2:axs.color.RED_YCC}];
-axs.color.YCC_CUBE_FACES_WHITE = [{p0:axs.color.WHITE_YCC, p1:axs.color.CYAN_YCC, p2:axs.color.MAGENTA_YCC}, {p0:axs.color.WHITE_YCC, p1:axs.color.MAGENTA_YCC, p2:axs.color.YELLOW_YCC}, {p0:axs.color.WHITE_YCC, p1:axs.color.YELLOW_YCC, p2:axs.color.CYAN_YCC}];
-axs.dom = {};
-axs.dom.parentElement = function(a) {
-  if (!a) {
-    return null;
-  }
-  a = axs.dom.composedParentNode(a);
-  if (!a) {
-    return null;
-  }
-  switch(a.nodeType) {
-    case Node.ELEMENT_NODE:
-      return a;
-    default:
-      return axs.dom.parentElement(a);
-  }
-};
-axs.dom.shadowHost = function(a) {
-  return "host" in a ? a.host : null;
-};
-axs.dom.composedParentNode = function(a) {
-  if (!a) {
-    return null;
-  }
-  if (a.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
-    return axs.dom.shadowHost(a);
-  }
-  var b = a.parentNode;
-  if (!b) {
-    return null;
-  }
-  if (b.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
-    return axs.dom.shadowHost(b);
-  }
-  if (!b.shadowRoot) {
-    return b;
-  }
-  a = a.getDestinationInsertionPoints();
-  return 0 < a.length ? axs.dom.composedParentNode(a[a.length - 1]) : null;
-};
-axs.dom.asElement = function(a) {
-  switch(a.nodeType) {
-    case Node.COMMENT_NODE:
-      break;
-    case Node.ELEMENT_NODE:
-      if ("script" == a.localName || "template" == a.localName) {
-        break;
-      }
-      return a;
-    case Node.DOCUMENT_FRAGMENT_NODE:
-      return a.host;
-    case Node.TEXT_NODE:
-      return axs.dom.parentElement(a);
-    default:
-      console.warn("Unhandled node type: ", a.nodeType);
-  }
-  return null;
-};
-axs.dom.composedTreeSearch = function(a, b, c, d, e) {
-  if (a === b) {
-    return !0;
-  }
-  if (a.nodeType == Node.ELEMENT_NODE) {
-    var f = a
-  }
-  var g = !1;
-  d = Object.create(d);
-  if (f) {
-    var h = f.localName;
-    d.collectIdRefs && (d.idrefs = axs.utils.getReferencedIds(f));
-    if (!d.disabled || "legend" === h && axs.browserUtils.matchSelector(f, "fieldset>legend:first-of-type")) {
-      d.disabled = axs.utils.isElementDisabled(f, !0);
-    }
-    d.hidden || (d.hidden = axs.utils.isElementHidden(f));
-    if (c.preorder && !c.preorder(f, d)) {
-      return g;
-    }
-    var k = f.shadowRoot || f.webkitShadowRoot;
-    if (k) {
-      return d.level++, g = axs.dom.composedTreeSearch(k, b, c, d, k), f && c.postorder && !g && c.postorder(f, d), g;
-    }
-    if ("content" == h) {
-      a = f.getDistributedNodes();
-      for (h = 0;h < a.length && !g;h++) {
-        g = axs.dom.composedTreeSearch(a[h], b, c, d, e);
-      }
-      c.postorder && !g && c.postorder.call(null, f, d);
-      return g;
-    }
-  }
-  for (a = a.firstChild;null != a && !g;) {
-    g = axs.dom.composedTreeSearch(a, b, c, d, e), a = a.nextSibling;
-  }
-  f && c.postorder && !g && c.postorder.call(null, f, d);
-  return g;
-};
-axs.utils = {};
-axs.utils.FOCUSABLE_ELEMENTS_SELECTOR = "input:not([type=hidden]):not([disabled]),select:not([disabled]),textarea:not([disabled]),button:not([disabled]),a[href],iframe,[tabindex]";
-axs.utils.LABELABLE_ELEMENTS_SELECTOR = "button,input:not([type=hidden]),keygen,meter,output,progress,select,textarea";
-axs.utils.elementIsTransparent = function(a) {
-  return "0" == a.style.opacity;
-};
-axs.utils.elementHasZeroArea = function(a) {
-  a = a.getBoundingClientRect();
-  var b = a.top - a.bottom;
-  return a.right - a.left && b ? !1 : !0;
-};
-axs.utils.elementIsOutsideScrollArea = function(a) {
-  for (var b = axs.dom.parentElement(a), c = a.ownerDocument.defaultView;b != c.document.body;) {
-    if (axs.utils.isClippedBy(a, b)) {
-      return !0;
-    }
-    if (axs.utils.canScrollTo(a, b) && !axs.utils.elementIsOutsideScrollArea(b)) {
-      return !1;
-    }
-    b = axs.dom.parentElement(b);
-  }
-  return !axs.utils.canScrollTo(a, c.document.body);
-};
-axs.utils.canScrollTo = function(a, b) {
-  var c = a.getBoundingClientRect(), d = b.getBoundingClientRect();
-  if (b == b.ownerDocument.body) {
-    var e = d.top, f = d.left
-  } else {
-    e = d.top - b.scrollTop, f = d.left - b.scrollLeft;
-  }
-  var g = e + b.scrollHeight, h = f + b.scrollWidth;
-  if (c.right < f || c.bottom < e || c.left > h || c.top > g) {
-    return !1;
-  }
-  e = a.ownerDocument.defaultView;
-  f = e.getComputedStyle(b);
-  return c.left > d.right || c.top > d.bottom ? "scroll" == f.overflow || "auto" == f.overflow || b instanceof e.HTMLBodyElement : !0;
-};
-axs.utils.isClippedBy = function(a, b) {
-  var c = a.getBoundingClientRect(), d = b.getBoundingClientRect(), e = d.top - b.scrollTop, f = d.left - b.scrollLeft, g = a.ownerDocument.defaultView.getComputedStyle(b);
-  return (c.right < d.left || c.bottom < d.top || c.left > d.right || c.top > d.bottom) && "hidden" == g.overflow ? !0 : c.right < f || c.bottom < e ? "visible" != g.overflow : !1;
-};
-axs.utils.isAncestor = function(a, b) {
-  if (null == b) {
-    return !1;
-  }
-  if (b === a) {
-    return !0;
-  }
-  var c = axs.dom.composedParentNode(b);
-  return axs.utils.isAncestor(a, c);
-};
-axs.utils.overlappingElements = function(a) {
-  if (axs.utils.elementHasZeroArea(a)) {
-    return null;
-  }
-  for (var b = [], c = a.getClientRects(), d = 0;d < c.length;d++) {
-    var e = c[d], e = document.elementFromPoint((e.left + e.right) / 2, (e.top + e.bottom) / 2);
-    if (null != e && e != a && !axs.utils.isAncestor(e, a) && !axs.utils.isAncestor(a, e)) {
-      var f = window.getComputedStyle(e, null);
-      f && (f = axs.utils.getBgColor(f, e)) && 0 < f.alpha && 0 > b.indexOf(e) && b.push(e);
-    }
-  }
-  return b;
-};
-axs.utils.elementIsHtmlControl = function(a) {
-  var b = a.ownerDocument.defaultView;
-  return a instanceof b.HTMLButtonElement || a instanceof b.HTMLInputElement || a instanceof b.HTMLSelectElement || a instanceof b.HTMLTextAreaElement ? !0 : !1;
-};
-axs.utils.elementIsAriaWidget = function(a) {
-  return a.hasAttribute("role") && (a = a.getAttribute("role")) && (a = axs.constants.ARIA_ROLES[a]) && "widget" in a.allParentRolesSet ? !0 : !1;
-};
-axs.utils.elementIsVisible = function(a) {
-  return axs.utils.elementIsTransparent(a) || axs.utils.elementHasZeroArea(a) || axs.utils.elementIsOutsideScrollArea(a) || axs.utils.overlappingElements(a).length ? !1 : !0;
-};
-axs.utils.isLargeFont = function(a) {
-  var b = a.fontSize;
-  a = "bold" == a.fontWeight;
-  var c = b.match(/(\d+)px/);
-  if (c) {
-    b = parseInt(c[1], 10);
-    if (c = window.getComputedStyle(document.body, null).fontSize.match(/(\d+)px/)) {
-      var d = parseInt(c[1], 10), c = 1.2 * d, d = 1.5 * d
-    } else {
-      c = 19.2, d = 24;
-    }
-    return a && b >= c || b >= d;
-  }
-  if (c = b.match(/(\d+)em/)) {
-    return b = parseInt(c[1], 10), a && 1.2 <= b || 1.5 <= b ? !0 : !1;
-  }
-  if (c = b.match(/(\d+)%/)) {
-    return b = parseInt(c[1], 10), a && 120 <= b || 150 <= b ? !0 : !1;
-  }
-  if (c = b.match(/(\d+)pt/)) {
-    if (b = parseInt(c[1], 10), a && 14 <= b || 18 <= b) {
-      return !0;
-    }
-  }
-  return !1;
-};
-axs.utils.getBgColor = function(a, b) {
-  var c = axs.color.parseColor(a.backgroundColor);
-  if (!c) {
-    return null;
-  }
-  1 > a.opacity && (c.alpha *= a.opacity);
-  if (1 > c.alpha) {
-    var d = axs.utils.getParentBgColor(b);
-    if (null == d) {
-      return null;
-    }
-    c = axs.color.flattenColors(c, d);
-  }
-  return c;
-};
-axs.utils.getParentBgColor = function(a) {
-  var b = a;
-  a = [];
-  for (var c = null;b = axs.dom.parentElement(b);) {
-    var d = window.getComputedStyle(b, null);
-    if (d) {
-      var e = axs.color.parseColor(d.backgroundColor);
-      if (e && (1 > d.opacity && (e.alpha *= d.opacity), 0 != e.alpha && (a.push(e), 1 == e.alpha))) {
-        c = !0;
-        break;
-      }
-    }
-  }
-  c || a.push(new axs.color.Color(255, 255, 255, 1));
-  for (b = a.pop();a.length;) {
-    c = a.pop(), b = axs.color.flattenColors(c, b);
-  }
-  return b;
-};
-axs.utils.getFgColor = function(a, b, c) {
-  var d = axs.color.parseColor(a.color);
-  if (!d) {
-    return null;
-  }
-  1 > d.alpha && (d = axs.color.flattenColors(d, c));
-  1 > a.opacity && (b = axs.utils.getParentBgColor(b), d.alpha *= a.opacity, d = axs.color.flattenColors(d, b));
-  return d;
-};
-axs.utils.getContrastRatioForElement = function(a) {
-  var b = window.getComputedStyle(a, null);
-  return axs.utils.getContrastRatioForElementWithComputedStyle(b, a);
-};
-axs.utils.getContrastRatioForElementWithComputedStyle = function(a, b) {
-  if (axs.utils.isElementHidden(b)) {
-    return null;
-  }
-  var c = axs.utils.getBgColor(a, b);
-  if (!c) {
-    return null;
-  }
-  var d = axs.utils.getFgColor(a, b, c);
-  return d ? axs.color.calculateContrastRatio(d, c) : null;
-};
-axs.utils.isNativeTextElement = function(a) {
-  var b = a.tagName.toLowerCase();
-  a = a.type ? a.type.toLowerCase() : "";
-  if ("textarea" == b) {
-    return !0;
-  }
-  if ("input" != b) {
-    return !1;
-  }
-  switch(a) {
-    case "email":
-    ;
-    case "number":
-    ;
-    case "password":
-    ;
-    case "search":
-    ;
-    case "text":
-    ;
-    case "tel":
-    ;
-    case "url":
-    ;
-    case "":
-      return !0;
-    default:
-      return !1;
-  }
-};
-axs.utils.isLowContrast = function(a, b, c) {
-  a = Math.round(10 * a) / 10;
-  return c ? 4.5 > a || !axs.utils.isLargeFont(b) && 7 > a : 3 > a || !axs.utils.isLargeFont(b) && 4.5 > a;
-};
-axs.utils.hasLabel = function(a) {
-  var b = a.tagName.toLowerCase(), c = a.type ? a.type.toLowerCase() : "";
-  if (a.hasAttribute("aria-label") || a.hasAttribute("title") || "img" == b && a.hasAttribute("alt") || "input" == b && "image" == c && a.hasAttribute("alt") || "input" == b && ("submit" == c || "reset" == c) || a.hasAttribute("aria-labelledby") || a.hasAttribute("id") && 0 < document.querySelectorAll('label[for="' + a.id + '"]').length) {
-    return !0;
-  }
-  for (b = axs.dom.parentElement(a);b;) {
-    if ("label" == b.tagName.toLowerCase() && b.control == a) {
-      return !0;
-    }
-    b = axs.dom.parentElement(b);
-  }
-  return !1;
-};
-axs.utils.isNativelyDisableable = function(a) {
-  return a.tagName.toUpperCase() in axs.constants.NATIVELY_DISABLEABLE;
-};
-axs.utils.isElementDisabled = function(a, b) {
-  if (axs.browserUtils.matchSelector(a, b ? "[aria-disabled=true]" : "[aria-disabled=true], [aria-disabled=true] *")) {
-    return !0;
-  }
-  if (!axs.utils.isNativelyDisableable(a) || axs.browserUtils.matchSelector(a, "fieldset>legend:first-of-type *")) {
-    return !1;
-  }
-  for (var c = a;null !== c;c = axs.dom.parentElement(c)) {
-    if (c.hasAttribute("disabled")) {
-      return !0;
-    }
-    if (b) {
-      break;
-    }
-  }
-  return !1;
-};
-axs.utils.isElementHidden = function(a) {
-  if (!(a instanceof a.ownerDocument.defaultView.HTMLElement)) {
-    return !1;
-  }
-  if (a.hasAttribute("chromevoxignoreariahidden")) {
-    var b = !0
-  }
-  var c = window.getComputedStyle(a, null);
-  return "none" == c.display || "hidden" == c.visibility ? !0 : a.hasAttribute("aria-hidden") && "true" == a.getAttribute("aria-hidden").toLowerCase() ? !b : !1;
-};
-axs.utils.isElementOrAncestorHidden = function(a) {
-  return axs.utils.isElementHidden(a) ? !0 : axs.dom.parentElement(a) ? axs.utils.isElementOrAncestorHidden(axs.dom.parentElement(a)) : !1;
-};
-axs.utils.isInlineElement = function(a) {
-  a = a.tagName.toUpperCase();
-  return axs.constants.InlineElements[a];
-};
-axs.utils.getRoles = function(a, b) {
-  if (!a || a.nodeType !== Node.ELEMENT_NODE || !a.hasAttribute("role") && !b) {
-    return null;
-  }
-  var c = a.getAttribute("role");
-  !c && b && (c = axs.properties.getImplicitRole(a));
-  if (!c) {
-    return null;
-  }
-  for (var c = c.split(" "), d = {roles:[], valid:!1}, e = 0;e < c.length;e++) {
-    var f = c[e], g = axs.constants.ARIA_ROLES[f], f = {name:f};
-    g && !g["abstract"] ? (f.details = g, d.applied || (d.applied = f), f.valid = d.valid = !0) : f.valid = !1;
-    d.roles.push(f);
-  }
-  return d;
-};
-axs.utils.getAriaPropertyValue = function(a, b, c) {
-  var d = a.replace(/^aria-/, ""), e = axs.constants.ARIA_PROPERTIES[d], d = {name:a, rawValue:b};
-  if (!e) {
-    return d.valid = !1, d.reason = '"' + a + '" is not a valid ARIA property', d;
-  }
-  e = e.valueType;
-  if (!e) {
-    return d.valid = !1, d.reason = '"' + a + '" is not a valid ARIA property', d;
-  }
-  switch(e) {
-    case "idref":
-      a = axs.utils.isValidIDRefValue(b, c), d.valid = a.valid, d.reason = a.reason, d.idref = a.idref;
-    case "idref_list":
-      a = b.split(/\s+/);
-      d.valid = !0;
-      for (b = 0;b < a.length;b++) {
-        e = axs.utils.isValidIDRefValue(a[b], c), e.valid || (d.valid = !1), d.values ? d.values.push(e) : d.values = [e];
-      }
-      return d;
-    case "integer":
-      c = axs.utils.isValidNumber(b);
-      if (!c.valid) {
-        return d.valid = !1, d.reason = c.reason, d;
-      }
-      Math.floor(c.value) !== c.value ? (d.valid = !1, d.reason = "" + b + " is not a whole integer") : (d.valid = !0, d.value = c.value);
-      return d;
-    case "decimal":
-    ;
-    case "number":
-      c = axs.utils.isValidNumber(b);
-      d.valid = c.valid;
-      if (!c.valid) {
-        return d.reason = c.reason, d;
-      }
-      d.value = c.value;
-      return d;
-    case "string":
-      return d.valid = !0, d.value = b, d;
-    case "token":
-      return c = axs.utils.isValidTokenValue(a, b.toLowerCase()), c.valid ? (d.valid = !0, d.value = c.value) : (d.valid = !1, d.value = b, d.reason = c.reason), d;
-    case "token_list":
-      e = b.split(/\s+/);
-      d.valid = !0;
-      for (b = 0;b < e.length;b++) {
-        c = axs.utils.isValidTokenValue(a, e[b].toLowerCase()), c.valid || (d.valid = !1, d.reason ? (d.reason = [d.reason], d.reason.push(c.reason)) : (d.reason = c.reason, d.possibleValues = c.possibleValues)), d.values ? d.values.push(c.value) : d.values = [c.value];
-      }
-      return d;
-    case "tristate":
-      return c = axs.utils.isPossibleValue(b.toLowerCase(), axs.constants.MIXED_VALUES, a), c.valid ? (d.valid = !0, d.value = c.value) : (d.valid = !1, d.value = b, d.reason = c.reason), d;
-    case "boolean":
-      return c = axs.utils.isValidBoolean(b), c.valid ? (d.valid = !0, d.value = c.value) : (d.valid = !1, d.value = b, d.reason = c.reason), d;
-  }
-  d.valid = !1;
-  d.reason = "Not a valid ARIA property";
-  return d;
-};
-axs.utils.isValidTokenValue = function(a, b) {
-  var c = a.replace(/^aria-/, "");
-  return axs.utils.isPossibleValue(b, axs.constants.ARIA_PROPERTIES[c].valuesSet, a);
-};
-axs.utils.isPossibleValue = function(a, b, c) {
-  return b[a] ? {valid:!0, value:a} : {valid:!1, value:a, reason:'"' + a + '" is not a valid value for ' + c, possibleValues:Object.keys(b)};
-};
-axs.utils.isValidBoolean = function(a) {
-  try {
-    var b = JSON.parse(a);
-  } catch (c) {
-    b = "";
-  }
-  return "boolean" != typeof b ? {valid:!1, value:a, reason:'"' + a + '" is not a true/false value'} : {valid:!0, value:b};
-};
-axs.utils.isValidIDRefValue = function(a, b) {
-  return 0 == a.length ? {valid:!0, idref:a} : b.ownerDocument.getElementById(a) ? {valid:!0, idref:a} : {valid:!1, idref:a, reason:'No element with ID "' + a + '"'};
-};
-axs.utils.isValidNumber = function(a) {
-  var b = {valid:!1, value:a, reason:'"' + a + '" is not a number'};
-  if (!a) {
-    return b;
-  }
-  if (/^0x/i.test(a)) {
-    return b.reason = '"' + a + '" is not a decimal number', b;
-  }
-  a *= 1;
-  return isFinite(a) ? {valid:!0, value:a} : b;
-};
-axs.utils.isElementImplicitlyFocusable = function(a) {
-  var b = a.ownerDocument.defaultView;
-  return a instanceof b.HTMLAnchorElement || a instanceof b.HTMLAreaElement ? a.hasAttribute("href") : a instanceof b.HTMLInputElement || a instanceof b.HTMLSelectElement || a instanceof b.HTMLTextAreaElement || a instanceof b.HTMLButtonElement || a instanceof b.HTMLIFrameElement ? !a.disabled : !1;
-};
-axs.utils.values = function(a) {
-  var b = [], c;
-  for (c in a) {
-    a.hasOwnProperty(c) && "function" != typeof a[c] && b.push(a[c]);
-  }
-  return b;
-};
-axs.utils.namedValues = function(a) {
-  var b = {}, c;
-  for (c in a) {
-    a.hasOwnProperty(c) && "function" != typeof a[c] && (b[c] = a[c]);
-  }
-  return b;
-};
-function escapeId(a) {
-  return a.replace(/[^a-zA-Z0-9_-]/g, function(a) {
-    return "\\" + a;
-  });
-}
-axs.utils.getQuerySelectorText = function(a) {
-  if (null == a || "HTML" == a.tagName) {
-    return "html";
-  }
-  if ("BODY" == a.tagName) {
-    return "body";
-  }
-  if (a.hasAttribute) {
-    if (a.id) {
-      return "#" + escapeId(a.id);
-    }
-    if (a.className) {
-      for (var b = "", c = 0;c < a.classList.length;c++) {
-        b += "." + a.classList[c];
-      }
-      var d = 0;
-      if (a.parentNode) {
-        for (c = 0;c < a.parentNode.children.length;c++) {
-          var e = a.parentNode.children[c];
-          axs.browserUtils.matchSelector(e, b) && d++;
-          if (e === a) {
-            break;
-          }
-        }
-      } else {
-        d = 1;
-      }
-      if (1 == d) {
-        return axs.utils.getQuerySelectorText(a.parentNode) + " > " + b;
-      }
-    }
-    if (a.parentNode) {
-      b = a.parentNode.children;
-      d = 1;
-      for (c = 0;b[c] !== a;) {
-        b[c].tagName == a.tagName && d++, c++;
-      }
-      c = "";
-      "BODY" != a.parentNode.tagName && (c = axs.utils.getQuerySelectorText(a.parentNode) + " > ");
-      return 1 == d ? c + a.tagName : c + a.tagName + ":nth-of-type(" + d + ")";
-    }
-  } else {
-    if (a.selectorText) {
-      return a.selectorText;
-    }
-  }
-  return "";
-};
-axs.utils.getAriaIdReferrers = function(a, b) {
-  var c = function(a) {
-    var b = axs.constants.ARIA_PROPERTIES[a];
-    if (b) {
-      if ("idref" === b.valueType) {
-        return "[aria-" + a + "='" + d + "']";
-      }
-      if ("idref_list" === b.valueType) {
-        return "[aria-" + a + "~='" + d + "']";
-      }
-    }
-    return "";
-  };
-  if (!a) {
-    return null;
-  }
-  var d = a.id;
-  if (!d) {
-    return null;
-  }
-  d = d.replace(/'/g, "\\'");
-  if (b) {
-    var e = b.replace(/^aria-/, ""), f = c(e);
-    if (f) {
-      return a.ownerDocument.querySelectorAll(f);
-    }
-  } else {
-    var g = [];
-    for (e in axs.constants.ARIA_PROPERTIES) {
-      (f = c(e)) && g.push(f);
-    }
-    return a.ownerDocument.querySelectorAll(g.join(","));
-  }
-  return null;
-};
-axs.utils.getHtmlIdReferrers = function(a) {
-  if (!a) {
-    return null;
-  }
-  var b = a.id;
-  if (!b) {
-    return null;
-  }
-  var b = b.replace(/'/g, "\\'"), c = "[contextmenu='{id}'] [itemref~='{id}'] button[form='{id}'] button[menu='{id}'] fieldset[form='{id}'] input[form='{id}'] input[list='{id}'] keygen[form='{id}'] label[for='{id}'] label[form='{id}'] menuitem[command='{id}'] object[form='{id}'] output[for~='{id}'] output[form='{id}'] select[form='{id}'] td[headers~='{id}'] textarea[form='{id}'] tr[headers~='{id}']".split(" ").map(function(a) {
-    return a.replace("{id}", b);
-  });
-  return a.ownerDocument.querySelectorAll(c.join(","));
-};
-axs.utils.getReferencedIds = function(a) {
-  for (var b = [], c = function(a) {
-    a && (0 < a.indexOf(" ") ? b = b.concat(f.value.split(" ")) : b.push(a));
-  }, d = 0;d < a.attributes.length;d++) {
-    var e = a.tagName.toLowerCase(), f = a.attributes[d];
-    if (f.specified) {
-      var g = f.name, h = g.match(/aria-(.+)/);
-      if (h) {
-        e = axs.constants.ARIA_PROPERTIES[h[1]], !e || "idref" !== e.valueType && "idref_list" !== e.valueType || c(f.value);
-      } else {
-        switch(g) {
-          case "contextmenu":
-          ;
-          case "itemref":
-            c(f.value);
-            break;
-          case "form":
-            "button" != e && "fieldset" != e && "input" != e && "keygen" != e && "label" != e && "object" != e && "output" != e && "select" != e && "textarea" != e || c(f.value);
-            break;
-          case "for":
-            "label" != e && "output" != e || c(f.value);
-            break;
-          case "menu":
-            "button" == e && c(f.value);
-            break;
-          case "list":
-            "input" == e && c(f.value);
-            break;
-          case "command":
-            "menuitem" == e && c(f.value);
-            break;
-          case "headers":
-            "td" != e && "tr" != e || c(f.value);
-        }
-      }
-    }
-  }
-  return b;
-};
-axs.utils.getIdReferrers = function(a) {
-  var b = [], c = axs.utils.getHtmlIdReferrers(a);
-  c && (b = b.concat(Array.prototype.slice.call(c)));
-  (c = axs.utils.getAriaIdReferrers(a)) && (b = b.concat(Array.prototype.slice.call(c)));
-  return b;
-};
-axs.utils.getIdReferents = function(a, b) {
-  var c = [], d = a.replace(/^aria-/, ""), d = axs.constants.ARIA_PROPERTIES[d];
-  if (!d || !b.hasAttribute(a)) {
-    return c;
-  }
-  d = d.valueType;
-  if ("idref_list" === d || "idref" === d) {
-    for (var d = b.ownerDocument, e = b.getAttribute(a), e = e.split(/\s+/), f = 0, g = e.length;f < g;f++) {
-      var h = d.getElementById(e[f]);
-      h && (c[c.length] = h);
-    }
-  }
-  return c;
-};
-axs.utils.getAriaPropertiesByValueType = function(a) {
-  var b = {}, c;
-  for (c in axs.constants.ARIA_PROPERTIES) {
-    var d = axs.constants.ARIA_PROPERTIES[c];
-    d && 0 <= a.indexOf(d.valueType) && (b[c] = d);
-  }
-  return b;
-};
-axs.utils.getSelectorForAriaProperties = function(a) {
-  a = Object.keys(a).map(function(a) {
-    return "[aria-" + a + "]";
-  });
-  a.sort();
-  return a.join(",");
-};
-axs.utils.findDescendantsWithRole = function(a, b) {
-  if (!a || !b) {
-    return [];
-  }
-  var c = axs.properties.getSelectorForRole(b);
-  if (c && (c = a.querySelectorAll(c))) {
-    c = Array.prototype.map.call(c, function(a) {
-      return a;
-    });
-  } else {
-    return [];
-  }
-  return c;
-};
-axs.properties = {};
-axs.properties.TEXT_CONTENT_XPATH = './/text()[normalize-space(.)!=""]/parent::*[name()!="script"]';
-axs.properties.getFocusProperties = function(a) {
-  var b = {}, c = a.getAttribute("tabindex");
-  void 0 != c ? b.tabindex = {value:c, valid:!0} : axs.utils.isElementImplicitlyFocusable(a) && (b.implicitlyFocusable = {value:!0, valid:!0});
-  if (0 == Object.keys(b).length) {
-    return null;
-  }
-  var d = axs.utils.elementIsTransparent(a), e = axs.utils.elementHasZeroArea(a), f = axs.utils.elementIsOutsideScrollArea(a), g = axs.utils.overlappingElements(a);
-  if (d || e || f || 0 < g.length) {
-    var c = axs.utils.isElementOrAncestorHidden(a), h = {value:!1, valid:c};
-    d && (h.transparent = !0);
-    e && (h.zeroArea = !0);
-    f && (h.outsideScrollArea = !0);
-    g && 0 < g.length && (h.overlappingElements = g);
-    d = {value:c, valid:c};
-    c && (d.reason = axs.properties.getHiddenReason(a));
-    h.hidden = d;
-    b.visible = h;
-  } else {
-    b.visible = {value:!0, valid:!0};
-  }
-  return b;
-};
-axs.properties.getHiddenReason = function(a) {
-  if (!(a && a instanceof a.ownerDocument.defaultView.HTMLElement)) {
-    return null;
-  }
-  if (a.hasAttribute("chromevoxignoreariahidden")) {
-    var b = !0
-  }
-  var c = window.getComputedStyle(a, null);
-  return "none" == c.display ? {property:"display: none", on:a} : "hidden" == c.visibility ? {property:"visibility: hidden", on:a} : a.hasAttribute("aria-hidden") && "true" == a.getAttribute("aria-hidden").toLowerCase() && !b ? {property:"aria-hidden", on:a} : axs.properties.getHiddenReason(axs.dom.parentElement(a));
-};
-axs.properties.getColorProperties = function(a) {
-  var b = {};
-  (a = axs.properties.getContrastRatioProperties(a)) && (b.contrastRatio = a);
-  return 0 == Object.keys(b).length ? null : b;
-};
-axs.properties.hasDirectTextDescendant = function(a) {
-  function b() {
-    for (var b = c.evaluate(axs.properties.TEXT_CONTENT_XPATH, a, null, XPathResult.ANY_TYPE, null), e = b.iterateNext();null != e;e = b.iterateNext()) {
-      if (e === a) {
-        return !0;
-      }
-    }
-    return !1;
-  }
-  var c;
-  c = a.nodeType == Node.DOCUMENT_NODE ? a : a.ownerDocument;
-  return c.evaluate ? b() : function() {
-    for (var b = c.createTreeWalker(a, NodeFilter.SHOW_TEXT, null, !1);b.nextNode();) {
-      var e = b.currentNode, f = e.parentNode.tagName.toLowerCase();
-      if (e.nodeValue.trim() && "script" !== f && a !== e) {
-        return !0;
-      }
-    }
-    return !1;
-  }();
-};
-axs.properties.getContrastRatioProperties = function(a) {
-  if (!axs.properties.hasDirectTextDescendant(a)) {
-    return null;
-  }
-  var b = {}, c = window.getComputedStyle(a, null), d = axs.utils.getBgColor(c, a);
-  if (!d) {
-    return null;
-  }
-  b.backgroundColor = axs.color.colorToString(d);
-  var e = axs.utils.getFgColor(c, a, d);
-  b.foregroundColor = axs.color.colorToString(e);
-  a = axs.utils.getContrastRatioForElementWithComputedStyle(c, a);
-  if (!a) {
-    return null;
-  }
-  b.value = a.toFixed(2);
-  axs.utils.isLowContrast(a, c) && (b.alert = !0);
-  var f = axs.utils.isLargeFont(c) ? 3 : 4.5, c = axs.utils.isLargeFont(c) ? 4.5 : 7, g = {};
-  f > a && (g.AA = f);
-  c > a && (g.AAA = c);
-  if (!Object.keys(g).length) {
-    return b;
-  }
-  (d = axs.color.suggestColors(d, e, g)) && Object.keys(d).length && (b.suggestedColors = d);
-  return b;
-};
-axs.properties.findTextAlternatives = function(a, b, c, d) {
-  var e = c || !1;
-  c = axs.dom.asElement(a);
-  if (!c || !d && axs.utils.isElementOrAncestorHidden(c)) {
-    return null;
-  }
-  if (a.nodeType == Node.TEXT_NODE) {
-    return c = {type:"text"}, c.text = a.textContent, c.lastWord = axs.properties.getLastWord(c.text), b.content = c, a.textContent;
-  }
-  a = null;
-  e || (a = axs.properties.getTextFromAriaLabelledby(c, b));
-  if (c.hasAttribute("aria-label")) {
-    var f = {type:"text"};
-    f.text = c.getAttribute("aria-label");
-    f.lastWord = axs.properties.getLastWord(f.text);
-    a ? f.unused = !0 : e && axs.utils.elementIsHtmlControl(c) || (a = f.text);
-    b.ariaLabel = f;
-  }
-  c.hasAttribute("role") && "presentation" == c.getAttribute("role") || (a = axs.properties.getTextFromHostLanguageAttributes(c, b, a, e));
-  e && axs.utils.elementIsHtmlControl(c) && (f = c.ownerDocument.defaultView, c instanceof f.HTMLInputElement && ("text" == c.type && c.value && 0 < c.value.length && (b.controlValue = {text:c.value}), "range" == c.type && (b.controlValue = {text:c.value})), c instanceof f.HTMLSelectElement && (b.controlValue = {text:c.value}), b.controlValue && (f = b.controlValue, a ? f.unused = !0 : a = f.text));
-  if (e && axs.utils.elementIsAriaWidget(c)) {
-    e = c.getAttribute("role");
-    "textbox" == e && c.textContent && 0 < c.textContent.length && (b.controlValue = {text:c.textContent});
-    if ("slider" == e || "spinbutton" == e) {
-      c.hasAttribute("aria-valuetext") ? b.controlValue = {text:c.getAttribute("aria-valuetext")} : c.hasAttribute("aria-valuenow") && (b.controlValue = {value:c.getAttribute("aria-valuenow"), text:"" + c.getAttribute("aria-valuenow")});
-    }
-    if ("menu" == e) {
-      for (var g = c.querySelectorAll("[role=menuitemcheckbox], [role=menuitemradio]"), f = [], h = 0;h < g.length;h++) {
-        "true" == g[h].getAttribute("aria-checked") && f.push(g[h]);
-      }
-      if (0 < f.length) {
-        g = "";
-        for (h = 0;h < f.length;h++) {
-          g += axs.properties.findTextAlternatives(f[h], {}, !0), h < f.length - 1 && (g += ", ");
-        }
-        b.controlValue = {text:g};
-      }
-    }
-    if ("combobox" == e || "select" == e) {
-      b.controlValue = {text:"TODO"};
-    }
-    b.controlValue && (f = b.controlValue, a ? f.unused = !0 : a = f.text);
-  }
-  f = !0;
-  c.hasAttribute("role") && (e = c.getAttribute("role"), (e = axs.constants.ARIA_ROLES[e]) && (!e.namefrom || 0 > e.namefrom.indexOf("contents")) && (f = !1));
-  (d = axs.properties.getTextFromDescendantContent(c, d)) && f && (e = {type:"text"}, e.text = d, e.lastWord = axs.properties.getLastWord(e.text), a ? e.unused = !0 : a = d, b.content = e);
-  c.hasAttribute("title") && (d = {type:"string", valid:!0}, d.text = c.getAttribute("title"), d.lastWord = axs.properties.getLastWord(d.lastWord), a ? d.unused = !0 : a = d.text, b.title = d);
-  return 0 == Object.keys(b).length && null == a ? null : a;
-};
-axs.properties.getTextFromDescendantContent = function(a, b) {
-  for (var c = a.childNodes, d = [], e = 0;e < c.length;e++) {
-    var f = axs.properties.findTextAlternatives(c[e], {}, !0, b);
-    f && d.push(f.trim());
-  }
-  if (d.length) {
-    c = "";
-    for (e = 0;e < d.length;e++) {
-      c = [c, d[e]].join(" ").trim();
-    }
-    return c;
-  }
-  return null;
-};
-axs.properties.getTextFromAriaLabelledby = function(a, b) {
-  var c = null;
-  if (!a.hasAttribute("aria-labelledby")) {
-    return c;
-  }
-  for (var d = a.getAttribute("aria-labelledby").split(/\s+/), e = {valid:!0}, f = [], g = [], h = 0;h < d.length;h++) {
-    var k = {type:"element"}, m = d[h];
-    k.value = m;
-    var l = document.getElementById(m);
-    l ? (k.valid = !0, k.text = axs.properties.findTextAlternatives(l, {}, !0, !0), k.lastWord = axs.properties.getLastWord(k.text), f.push(k.text), k.element = l) : (k.valid = !1, e.valid = !1, k.errorMessage = {messageKey:"noElementWithId", args:[m]});
-    g.push(k);
-  }
-  0 < g.length && (g[g.length - 1].last = !0, e.values = g, e.text = f.join(" "), e.lastWord = axs.properties.getLastWord(e.text), c = e.text, b.ariaLabelledby = e);
-  return c;
-};
-axs.properties.getTextFromHostLanguageAttributes = function(a, b, c, d) {
-  if (axs.browserUtils.matchSelector(a, "img") && a.hasAttribute("alt")) {
-    var e = {type:"string", valid:!0};
-    e.text = a.getAttribute("alt");
-    c ? e.unused = !0 : c = e.text;
-    b.alt = e;
-  }
-  if (axs.browserUtils.matchSelector(a, 'input:not([type="hidden"]):not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), video:not([disabled])') && !d) {
-    if (a.hasAttribute("id")) {
-      d = document.querySelectorAll('label[for="' + a.id + '"]');
-      for (var e = {}, f = [], g = [], h = 0;h < d.length;h++) {
-        var k = {type:"element"}, m = d[h], l = axs.properties.findTextAlternatives(m, {}, !0);
-        l && 0 < l.trim().length && (k.text = l.trim(), g.push(l.trim()));
-        k.element = m;
-        f.push(k);
-      }
-      0 < f.length && (f[f.length - 1].last = !0, e.values = f, e.text = g.join(" "), e.lastWord = axs.properties.getLastWord(e.text), c ? e.unused = !0 : c = e.text, b.labelFor = e);
-    }
-    d = axs.dom.parentElement(a);
-    for (e = {};d;) {
-      if ("label" == d.tagName.toLowerCase() && (f = d, f.control == a)) {
-        e.type = "element";
-        e.text = axs.properties.findTextAlternatives(f, {}, !0);
-        e.lastWord = axs.properties.getLastWord(e.text);
-        e.element = f;
-        break;
-      }
-      d = axs.dom.parentElement(d);
-    }
-    e.text && (c ? e.unused = !0 : c = e.text, b.labelWrapped = e);
-    axs.browserUtils.matchSelector(a, 'input[type="image"]') && a.hasAttribute("alt") && (e = {type:"string", valid:!0}, e.text = a.getAttribute("alt"), c ? e.unused = !0 : c = e.text, b.alt = e);
-    Object.keys(b).length || (b.noLabel = !0);
-  }
-  return c;
-};
-axs.properties.getLastWord = function(a) {
-  if (!a) {
-    return null;
-  }
-  var b = a.lastIndexOf(" ") + 1, c = a.length - 10;
-  return a.substring(b > c ? b : c);
-};
-axs.properties.getTextProperties = function(a) {
-  var b = {}, c = axs.properties.findTextAlternatives(a, b, !1, !0);
-  if (0 == Object.keys(b).length && ((a = axs.dom.asElement(a)) && axs.browserUtils.matchSelector(a, "img") && (b.alt = {valid:!1, errorMessage:"No alt value provided"}, a = a.src, "string" == typeof a && (c = a.split("/").pop(), b.filename = {text:c})), !c)) {
-    return null;
-  }
-  b.hasProperties = !!Object.keys(b).length;
-  b.computedText = c;
-  b.lastWord = axs.properties.getLastWord(c);
-  return b;
-};
-axs.properties.getAriaProperties = function(a) {
-  var b = {}, c = axs.properties.getGlobalAriaProperties(a), d;
-  for (d in axs.constants.ARIA_PROPERTIES) {
-    var e = "aria-" + d;
-    if (a.hasAttribute(e)) {
-      var f = a.getAttribute(e);
-      c[e] = axs.utils.getAriaPropertyValue(e, f, a);
-    }
-  }
-  0 < Object.keys(c).length && (b.properties = axs.utils.values(c));
-  f = axs.utils.getRoles(a);
-  if (!f) {
-    return Object.keys(b).length ? b : null;
-  }
-  b.roles = f;
-  if (!f.valid || !f.roles) {
-    return b;
-  }
-  for (var e = f.roles, g = 0;g < e.length;g++) {
-    var h = e[g];
-    if (h.details && h.details.propertiesSet) {
-      for (d in h.details.propertiesSet) {
-        d in c || (a.hasAttribute(d) ? (f = a.getAttribute(d), c[d] = axs.utils.getAriaPropertyValue(d, f, a), "values" in c[d] && (f = c[d].values, f[f.length - 1].isLast = !0)) : h.details.requiredPropertiesSet[d] && (c[d] = {name:d, valid:!1, reason:"Required property not set"}));
-      }
-    }
-  }
-  0 < Object.keys(c).length && (b.properties = axs.utils.values(c));
-  return 0 < Object.keys(b).length ? b : null;
-};
-axs.properties.getGlobalAriaProperties = function(a) {
-  var b = {}, c;
-  for (c in axs.constants.GLOBAL_PROPERTIES) {
-    if (a.hasAttribute(c)) {
-      var d = a.getAttribute(c);
-      b[c] = axs.utils.getAriaPropertyValue(c, d, a);
-    }
-  }
-  return b;
-};
-axs.properties.getVideoProperties = function(a) {
-  if (!axs.browserUtils.matchSelector(a, "video")) {
-    return null;
-  }
-  var b = {};
-  b.captionTracks = axs.properties.getTrackElements(a, "captions");
-  b.descriptionTracks = axs.properties.getTrackElements(a, "descriptions");
-  b.chapterTracks = axs.properties.getTrackElements(a, "chapters");
-  return b;
-};
-axs.properties.getTrackElements = function(a, b) {
-  var c = a.querySelectorAll("track[kind=" + b + "]"), d = {};
-  if (!c.length) {
-    return d.valid = !1, d.reason = {messageKey:"noTracksProvided", args:[[b]]}, d;
-  }
-  d.valid = !0;
-  for (var e = [], f = 0;f < c.length;f++) {
-    var g = {}, h = c[f].getAttribute("src"), k = c[f].getAttribute("srcLang"), m = c[f].getAttribute("label");
-    h ? (g.valid = !0, g.src = h) : (g.valid = !1, g.reason = {messageKey:"noSrcProvided"});
-    h = "";
-    m && (h += m, k && (h += " "));
-    k && (h += "(" + k + ")");
-    "" == h && (h = "[[object Object]]");
-    g.name = h;
-    e.push(g);
-  }
-  d.values = e;
-  return d;
-};
-axs.properties.getAllProperties = function(a) {
-  var b = axs.dom.asElement(a);
-  if (!b) {
-    return {};
-  }
-  var c = {};
-  c.ariaProperties = axs.properties.getAriaProperties(b);
-  c.colorProperties = axs.properties.getColorProperties(b);
-  c.focusProperties = axs.properties.getFocusProperties(b);
-  c.textProperties = axs.properties.getTextProperties(a);
-  c.videoProperties = axs.properties.getVideoProperties(b);
-  return c;
-};
-(function() {
-  function a(a) {
-    if (!a) {
-      return null;
-    }
-    var c = a.tagName;
-    if (!c) {
-      return null;
-    }
-    c = c.toUpperCase();
-    c = axs.constants.TAG_TO_IMPLICIT_SEMANTIC_INFO[c];
-    if (!c || !c.length) {
-      return null;
-    }
-    for (var d = null, e = 0, f = c.length;e < f;e++) {
-      var g = c[e];
-      if (g.selector) {
-        if (axs.browserUtils.matchSelector(a, g.selector)) {
-          return g;
-        }
-      } else {
-        d = g;
-      }
-    }
-    return d;
-  }
-  axs.properties.getImplicitRole = function(b) {
-    return (b = a(b)) ? b.role : "";
-  };
-  axs.properties.canTakeAriaAttributes = function(b) {
-    return (b = a(b)) ? !b.reserved : !0;
-  };
-})();
-axs.properties.getNativelySupportedAttributes = function(a) {
-  var b = [];
-  if (!a) {
-    return b;
-  }
-  a = a.cloneNode(!1);
-  for (var c = Object.keys(axs.constants.ARIA_TO_HTML_ATTRIBUTE), d = 0;d < c.length;d++) {
-    var e = c[d];
-    axs.constants.ARIA_TO_HTML_ATTRIBUTE[e] in a && (b[b.length] = e);
-  }
-  return b;
-};
-(function() {
-  var a = {};
-  axs.properties.getSelectorForRole = function(b) {
-    if (!b) {
-      return "";
-    }
-    if (a[b] && a.hasOwnProperty(b)) {
-      return a[b];
-    }
-    var c = ['[role="' + b + '"]'];
-    Object.keys(axs.constants.TAG_TO_IMPLICIT_SEMANTIC_INFO).forEach(function(a) {
-      var e = axs.constants.TAG_TO_IMPLICIT_SEMANTIC_INFO[a];
-      if (e && e.length) {
-        for (var f = 0;f < e.length;f++) {
-          var g = e[f];
-          if (g.role === b) {
-            if (g.selector) {
-              c[c.length] = g.selector;
-            } else {
-              c[c.length] = a;
-              break;
-            }
-          }
-        }
-      }
-    });
-    return a[b] = c.join(",");
-  };
-})();
-axs.AuditRule = function(a) {
-  for (var b = a.opt_requires || {}, c = !0, d = [], e = 0;e < axs.AuditRule.requiredFields.length;e++) {
-    var f = axs.AuditRule.requiredFields[e];
-    f in a || (c = !1, d.push(f));
-  }
-  if (!c) {
-    throw "Invalid spec; the following fields were not specified: " + d.join(", ") + "\n" + JSON.stringify(a);
-  }
-  this.name = a.name;
-  this.severity = a.severity;
-  this.relevantElementMatcher_ = a.relevantElementMatcher;
-  this.isRelevant_ = a.isRelevant || function(a, b) {
-    return !0;
-  };
-  this.test_ = a.test;
-  this.code = a.code;
-  this.heading = a.heading || "";
-  this.url = a.url || "";
-  this.requiresConsoleAPI = !!b.consoleAPI;
-  this.relevantElements = [];
-  this.relatedElements = [];
-  this.collectIdRefs = b.idRefs || !1;
-};
-axs.AuditRule.requiredFields = "name severity relevantElementMatcher test code heading".split(" ");
-axs.AuditRule.NOT_APPLICABLE = {result:axs.constants.AuditResult.NA};
-axs.AuditRule.prototype.addElement = function(a, b) {
-  a.push(b);
-};
-axs.AuditRule.prototype.collectMatchingElement = function(a, b) {
-  return this.relevantElementMatcher_(a, b) && b.inScope ? (this.relevantElements.push({element:a, flags:b}), !0) : !1;
-};
-axs.AuditRule.prototype.canRun = function(a) {
-  return this.disabled || !a.withConsoleApi && this.requiresConsoleAPI ? !1 : !0;
-};
-axs.AuditRule.Result = function(a, b) {
-  var c = axs.utils.namedValues(b);
-  c.severity = a.getSeverity(b.name) || c.severity;
-  this.rule = c;
-  this.maxResults = a.maxResults;
-  this.update(axs.constants.AuditResult.NA);
-};
-axs.AuditRule.Result.prototype.update = function(a, b) {
-  if (a === axs.constants.AuditResult.FAIL) {
-    var c = this.elements || (this.elements = []);
-    this.result = a;
-    this.maxResults && this.elements.length >= this.maxResults ? this.resultsTruncated = !0 : b && c.push(b);
-  } else {
-    a === axs.constants.AuditResult.PASS ? (this.elements || (this.elements = []), this.result !== axs.constants.AuditResult.FAIL && (this.result = a)) : this.result || (this.result = a);
-  }
-};
-axs.AuditRule.prototype.run = function(a) {
-  try {
-    for (var b = this._options || {}, c = new axs.AuditRule.Result(a, this), d;d = this.relevantElements.shift();) {
-      var e = d.element, f = d.flags;
-      this.isRelevant_(e, f) && (this.test_(e, f, b.config) ? c.update(axs.constants.AuditResult.FAIL, e) : c.update(axs.constants.AuditResult.PASS, e));
-    }
-    return c;
-  } finally {
-    this.relatedElements.length = 0;
-  }
-};
-axs.AuditRules = {};
-(function() {
-  var a = {}, b = {};
-  axs.AuditRules.specs = {};
-  axs.AuditRules.addRule = function(c) {
-    var d = new axs.AuditRule(c);
-    if (d.code in b) {
-      throw Error('Can not add audit rule with same code: "' + d.code + '"');
-    }
-    if (d.name in a) {
-      throw Error('Can not add audit rule with same name: "' + d.name + '"');
-    }
-    a[d.name] = b[d.code] = d;
-    axs.AuditRules.specs[c.name] = c;
-  };
-  axs.AuditRules.getRule = function(c) {
-    return a[c] || b[c] || null;
-  };
-  axs.AuditRules.getRules = function(b) {
-    var d = Object.keys(a);
-    return b ? d : d.map(function(a) {
-      return this.getRule(a);
-    }, axs.AuditRules);
-  };
-  axs.AuditRules.getActiveRules = function(a) {
-    var b;
-    b = a.auditRulesToRun && 0 < a.auditRulesToRun.length ? a.auditRulesToRun : axs.AuditRules.getRules(!0);
-    if (a.auditRulesToIgnore) {
-      for (var e = 0;e < a.auditRulesToIgnore.length;e++) {
-        var f = a.auditRulesToIgnore[e];
-        0 > b.indexOf(f) || b.splice(b.indexOf(f), 1);
-      }
-    }
-    return b.map(axs.AuditRules.getRule);
-  };
-})();
-axs.AuditResults = function() {
-  this.errors_ = [];
-  this.warnings_ = [];
-};
-goog.exportSymbol("axs.AuditResults", axs.AuditResults);
-axs.AuditResults.prototype.addError = function(a) {
-  "" != a && this.errors_.push(a);
-};
-goog.exportProperty(axs.AuditResults.prototype, "addError", axs.AuditResults.prototype.addError);
-axs.AuditResults.prototype.addWarning = function(a) {
-  "" != a && this.warnings_.push(a);
-};
-goog.exportProperty(axs.AuditResults.prototype, "addWarning", axs.AuditResults.prototype.addWarning);
-axs.AuditResults.prototype.numErrors = function() {
-  return this.errors_.length;
-};
-goog.exportProperty(axs.AuditResults.prototype, "numErrors", axs.AuditResults.prototype.numErrors);
-axs.AuditResults.prototype.numWarnings = function() {
-  return this.warnings_.length;
-};
-goog.exportProperty(axs.AuditResults.prototype, "numWarnings", axs.AuditResults.prototype.numWarnings);
-axs.AuditResults.prototype.getErrors = function() {
-  return this.errors_;
-};
-goog.exportProperty(axs.AuditResults.prototype, "getErrors", axs.AuditResults.prototype.getErrors);
-axs.AuditResults.prototype.getWarnings = function() {
-  return this.warnings_;
-};
-goog.exportProperty(axs.AuditResults.prototype, "getWarnings", axs.AuditResults.prototype.getWarnings);
-axs.AuditResults.prototype.toString = function() {
-  for (var a = "", b = 0;b < this.errors_.length;b++) {
-    0 == b && (a += "\nErrors:\n");
-    var c = this.errors_[b], a = a + (c + "\n\n");
-  }
-  for (b = 0;b < this.warnings_.length;b++) {
-    0 == b && (a += "\nWarnings:\n"), c = this.warnings_[b], a += c + "\n\n";
-  }
-  return a;
-};
-goog.exportProperty(axs.AuditResults.prototype, "toString", axs.AuditResults.prototype.toString);
-axs.Audit = {};
-axs.AuditConfiguration = function(a) {
-  null == a && (a = {});
-  this.rules_ = {};
-  this.maxResults = this.auditRulesToIgnore = this.auditRulesToRun = this.scope = null;
-  this.withConsoleApi = !1;
-  this.showUnsupportedRulesWarning = this.walkDom = !0;
-  for (var b in this) {
-    this.hasOwnProperty(b) && b in a && (this[b] = a[b]);
-  }
-  goog.exportProperty(this, "scope", this.scope);
-  goog.exportProperty(this, "auditRulesToRun", this.auditRulesToRun);
-  goog.exportProperty(this, "auditRulesToIgnore", this.auditRulesToIgnore);
-  goog.exportProperty(this, "withConsoleApi", this.withConsoleApi);
-  goog.exportProperty(this, "walkDom", this.walkDom);
-  goog.exportProperty(this, "showUnsupportedRulesWarning", this.showUnsupportedRulesWarning);
-};
-goog.exportSymbol("axs.AuditConfiguration", axs.AuditConfiguration);
-axs.AuditConfiguration.prototype = {ignoreSelectors:function(a, b) {
-  a in this.rules_ || (this.rules_[a] = {});
-  "ignore" in this.rules_[a] || (this.rules_[a].ignore = []);
-  Array.prototype.push.call(this.rules_[a].ignore, b);
-}, getIgnoreSelectors:function(a) {
-  return a in this.rules_ && "ignore" in this.rules_[a] ? this.rules_[a].ignore : [];
-}, setSeverity:function(a, b) {
-  a in this.rules_ || (this.rules_[a] = {});
-  this.rules_[a].severity = b;
-}, getSeverity:function(a) {
-  return a in this.rules_ && "severity" in this.rules_[a] ? this.rules_[a].severity : null;
-}, setRuleConfig:function(a, b) {
-  a in this.rules_ || (this.rules_[a] = {});
-  this.rules_[a].config = b;
-}, getRuleConfig:function(a) {
-  return a in this.rules_ && "config" in this.rules_[a] ? this.rules_[a].config : null;
-}};
-goog.exportProperty(axs.AuditConfiguration.prototype, "ignoreSelectors", axs.AuditConfiguration.prototype.ignoreSelectors);
-goog.exportProperty(axs.AuditConfiguration.prototype, "getIgnoreSelectors", axs.AuditConfiguration.prototype.getIgnoreSelectors);
-axs.Audit.unsupportedRulesWarningShown = !1;
-axs.Audit.getRulesCannotRun = function(a) {
-  return a.withConsoleApi ? [] : axs.AuditRules.getRules().filter(function(a) {
-    return a.requiresConsoleAPI;
-  }).map(function(a) {
-    return a.code;
-  });
-};
-axs.Audit.run = function(a) {
-  a = a || new axs.AuditConfiguration;
-  if (!axs.Audit.unsupportedRulesWarningShown && a.showUnsupportedRulesWarning) {
-    var b = axs.Audit.getRulesCannotRun(a);
-    0 < b.length && (console.warn("Some rules cannot be checked using the axs.Audit.run() method call. Use the Chrome plugin to check these rules: " + b.join(", ")), console.warn("To remove this message, pass an AuditConfiguration object to axs.Audit.run() and set configuration.showUnsupportedRulesWarning = false."));
-    axs.Audit.unsupportedRulesWarningShown = !0;
-  }
-  b = axs.AuditRules.getActiveRules(a);
-  a.collectIdRefs = b.some(function(a) {
-    return a.collectIdRefs;
-  });
-  a.scope || (a.scope = document.documentElement);
-  axs.Audit.collectMatchingElements(a, b);
-  for (var c = [], d = 0;d < b.length;d++) {
-    var e = b[d];
-    e.canRun(a) && c.push(e.run(a));
-  }
-  return c;
-};
-goog.exportSymbol("axs.Audit.run", axs.Audit.run);
-(function() {
-  function a(a, c) {
-    var d = a.getIgnoreSelectors(c.name);
-    if (0 < d.length || a.scope) {
-      this.ignoreSelectors = d;
-    }
-    if (d = a.getRuleConfig(c.name)) {
-      this.config = d;
-    }
-  }
-  axs.Audit.collectMatchingElements = function(b, c) {
-    axs.dom.composedTreeSearch(b.walkDom ? document.documentElement : b.scope, null, {preorder:function(d, e) {
-      e.inScope || (e.inScope = d === b.scope);
-      for (var f = 0;f < c.length;f++) {
-        var g = c[f];
-        g.canRun(b) && (g._options = new a(b, g), e.ignoring[g.name] || (e.ignoring[g.name] = g._options.shouldIgnore(d)) || g.collectMatchingElement(d, e));
-      }
-      return !0;
-    }}, {walkDom:b.walkDom, collectIdRefs:b.collectIdRefs, level:0, ignoring:{}, disabled:!1, hidden:!1});
-  };
-  a.prototype.shouldIgnore = function(a) {
-    var c = this.ignoreSelectors;
-    if (c) {
-      for (var d = 0;d < c.length;d++) {
-        if (axs.browserUtils.matchSelector(a, c[d])) {
-          return !0;
-        }
-      }
-    }
-    return !1;
-  };
-})();
-axs.Audit.auditResults = function(a) {
-  for (var b = new axs.AuditResults, c = 0;c < a.length;c++) {
-    var d = a[c];
-    d.result == axs.constants.AuditResult.FAIL && (d.rule.severity == axs.constants.Severity.SEVERE ? b.addError(axs.Audit.accessibilityErrorMessage(d)) : b.addWarning(axs.Audit.accessibilityErrorMessage(d)));
-  }
-  return b;
-};
-goog.exportSymbol("axs.Audit.auditResults", axs.Audit.auditResults);
-axs.Audit.createReport = function(a, b) {
-  var c;
-  c = "*** Begin accessibility audit results ***\nAn accessibility audit found " + axs.Audit.auditResults(a).toString();
-  b && (c = c + "\nFor more information, please see " + b);
-  return c + "\n*** End accessibility audit results ***";
-};
-goog.exportSymbol("axs.Audit.createReport", axs.Audit.createReport);
-axs.Audit.accessibilityErrorMessage = function(a) {
-  for (var b = a.rule.severity == axs.constants.Severity.SEVERE ? "Error: " : "Warning: ", b = b + (a.rule.code + " (" + a.rule.heading + ") failed on the following " + (1 == a.elements.length ? "element" : "elements")), b = 1 == a.elements.length ? b + ":" : b + (" (1 - " + Math.min(5, a.elements.length) + " of " + a.elements.length + "):"), c = Math.min(a.elements.length, 5), d = 0;d < c;d++) {
-    var e = a.elements[d], b = b + "\n";
-    try {
-      b += axs.utils.getQuerySelectorText(e);
-    } catch (f) {
-      b += " tagName:" + e.tagName, b += " id:" + e.id;
-    }
-  }
-  "" != a.rule.url && (b += "\nSee " + a.rule.url + " for more information.");
-  return b;
-};
-goog.exportSymbol("axs.Audit.accessibilityErrorMessage", axs.Audit.accessibilityErrorMessage);
-axs.AuditRules.addRule({name:"ariaOnReservedElement", heading:"This element does not support ARIA roles, states and properties", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_12", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  return !axs.properties.canTakeAriaAttributes(a);
-}, test:function(a) {
-  return null !== axs.properties.getAriaProperties(a);
-}, code:"AX_ARIA_12"});
-axs.AuditRules.addRule({name:"ariaOwnsDescendant", heading:"aria-owns should not be used if ownership is implicit in the DOM", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_06", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "[aria-owns]");
-}, test:function(a) {
-  return axs.utils.getIdReferents("aria-owns", a).some(function(b) {
-    return a.compareDocumentPosition(b) & Node.DOCUMENT_POSITION_CONTAINED_BY;
-  });
-}, code:"AX_ARIA_06"});
-axs.AuditRules.addRule({name:"ariaRoleNotScoped", heading:"Elements with ARIA roles must be in the correct scope", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_09", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "[role]");
-}, test:function(a) {
-  var b = axs.utils.getRoles(a);
-  if (!b || !b.applied) {
-    return !1;
-  }
-  b = b.applied.details.scope;
-  if (!b || 0 === b.length) {
-    return !1;
-  }
-  for (var c = a;c = axs.dom.parentElement(c);) {
-    var d = axs.utils.getRoles(c, !0);
-    if (d && d.applied && 0 <= b.indexOf(d.applied.name)) {
-      return !1;
-    }
-  }
-  if (a = axs.utils.getAriaIdReferrers(a, "aria-owns")) {
-    for (c = 0;c < a.length;c++) {
-      if ((d = axs.utils.getRoles(a[c], !0)) && d.applied && 0 <= b.indexOf(d.applied.name)) {
-        return !1;
-      }
-    }
-  }
-  return !0;
-}, code:"AX_ARIA_09"});
-axs.AuditRules.addRule({name:"audioWithoutControls", heading:"Audio elements should have controls", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_audio_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "audio[autoplay]");
-}, test:function(a) {
-  return !a.querySelectorAll("[controls]").length && 3 < a.duration;
-}, code:"AX_AUDIO_01"});
-(function() {
-  var a = /^aria\-/;
-  axs.AuditRules.addRule({name:"badAriaAttribute", heading:"This element has an invalid ARIA attribute", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_11", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(b) {
-    b = b.attributes;
-    for (var c = 0, d = b.length;c < d;c++) {
-      if (a.test(b[c].name)) {
-        return !0;
-      }
-    }
-    return !1;
-  }, test:function(b) {
-    b = b.attributes;
-    for (var c = 0, d = b.length;c < d;c++) {
-      var e = b[c].name;
-      if (a.test(e) && (e = e.replace(a, ""), !axs.constants.ARIA_PROPERTIES.hasOwnProperty(e))) {
-        return !0;
-      }
-    }
-    return !1;
-  }, code:"AX_ARIA_11"});
-})();
-axs.AuditRules.addRule({name:"badAriaAttributeValue", heading:"ARIA state and property values must be valid", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_04", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
-  var b = axs.utils.getSelectorForAriaProperties(axs.constants.ARIA_PROPERTIES);
-  return axs.browserUtils.matchSelector(a, b);
-}, test:function(a) {
-  for (var b in axs.constants.ARIA_PROPERTIES) {
-    var c = "aria-" + b;
-    if (a.hasAttribute(c)) {
-      var d = a.getAttribute(c);
-      if (!axs.utils.getAriaPropertyValue(c, d, a).valid) {
-        return !0;
-      }
-    }
-  }
-  return !1;
-}, code:"AX_ARIA_04"});
-axs.AuditRules.addRule({name:"badAriaRole", heading:"Elements with ARIA roles must use a valid, non-abstract ARIA role", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_01", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "[role]");
-}, test:function(a) {
-  return !axs.utils.getRoles(a).valid;
-}, code:"AX_ARIA_01"});
-axs.AuditRules.addRule({name:"controlsWithoutLabel", heading:"Controls and media elements should have labels", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_01", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
-  if (!axs.browserUtils.matchSelector(a, 'input:not([type="hidden"]):not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), video:not([disabled])') || "presentation" == a.getAttribute("role")) {
-    return !1;
-  }
-  if (0 <= a.tabIndex) {
-    return !0;
-  }
-  for (a = axs.dom.parentElement(a);null != a;a = axs.dom.parentElement(a)) {
-    if (axs.utils.elementIsAriaWidget(a)) {
-      return !1;
-    }
-  }
-  return !0;
-}, test:function(a, b) {
-  if (b.hidden || "input" == a.tagName.toLowerCase() && "button" == a.type && a.value.length || "button" == a.tagName.toLowerCase() && a.textContent.replace(/^\s+|\s+$/g, "").length || axs.utils.hasLabel(a)) {
-    return !1;
-  }
-  var c = axs.properties.findTextAlternatives(a, {});
-  return null === c || "" === c.trim() ? !0 : !1;
-}, code:"AX_TEXT_01", ruleName:"Controls and media elements should have labels"});
-axs.AuditRules.addRule({name:"duplicateId", heading:"Any ID referred to via an IDREF must be unique in the DOM", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_html_02", severity:axs.constants.Severity.SEVERE, opt_requires:{idRefs:!0}, relevantElementMatcher:function(a, b) {
-  b.idrefs.length && !b.hidden && this.relatedElements.push({element:a, flags:b});
-  return a.hasAttribute("id") ? !0 : !1;
-}, isRelevant:function(a, b) {
-  var c = a.id, d = b.level;
-  return this.relatedElements.some(function(a) {
-    var b = a.flags.idrefs;
-    return a.flags.level === d && 0 <= b.indexOf(c);
-  });
-}, test:function(a) {
-  var b = "[id='" + a.id.replace(/'/g, "\\'") + "']";
-  return 1 < a.ownerDocument.querySelectorAll(b).length;
-}, code:"AX_HTML_02"});
-axs.AuditRules.addRule({name:"focusableElementNotVisibleAndNotAriaHidden", heading:"These elements are focusable but either invisible or obscured by another element", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_focus_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  if (!axs.browserUtils.matchSelector(a, axs.utils.FOCUSABLE_ELEMENTS_SELECTOR)) {
-    return !1;
-  }
-  if (0 <= a.tabIndex) {
-    return !0;
-  }
-  for (var b = axs.dom.parentElement(a);null != b;b = axs.dom.parentElement(b)) {
-    if (axs.utils.elementIsAriaWidget(b)) {
-      return !1;
-    }
-  }
-  a = axs.properties.findTextAlternatives(a, {});
-  return null === a || "" === a.trim() ? !1 : !0;
-}, test:function(a, b) {
-  if (b.hidden) {
-    return !1;
-  }
-  a.focus();
-  return !axs.utils.elementIsVisible(a);
-}, code:"AX_FOCUS_01"});
-axs.AuditRules.addRule({name:"humanLangMissing", heading:"The web page should have the content's human language indicated in the markup", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_html_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  return a instanceof a.ownerDocument.defaultView.HTMLHtmlElement;
-}, test:function(a) {
-  return a.lang ? !1 : !0;
-}, code:"AX_HTML_01"});
-axs.AuditRules.addRule({name:"imagesWithoutAltText", heading:"Images should have a text alternative or presentational role", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_02", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a, b) {
-  return axs.browserUtils.matchSelector(a, "img") && !b.hidden;
-}, test:function(a) {
-  if (a.hasAttribute("alt") && "" == a.alt || "presentation" == a.getAttribute("role")) {
-    return !1;
-  }
-  var b = {};
-  axs.properties.findTextAlternatives(a, b);
-  return 0 == Object.keys(b).length ? !0 : !1;
-}, code:"AX_TEXT_02"});
-axs.AuditRules.addRule({name:"linkWithUnclearPurpose", heading:"The purpose of each link should be clear from the link text", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_04", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a, b) {
-  return axs.browserUtils.matchSelector(a, "a[href]") && !b.hidden;
-}, test:function(a, b, c) {
-  c = c || {};
-  var d = c.blacklistPhrases || [], e = /\s+/;
-  for (b = 0;b < d.length;b++) {
-    var f = "^\\s*" + d[b].trim().replace(e, "\\s*") + "s*[^a-z]$";
-    if ((new RegExp(f, "i")).test(a.textContent)) {
-      return !0;
-    }
-  }
-  c = c.stopwords || "click tap go here learn more this page link about".split(" ");
-  a = axs.properties.findTextAlternatives(a, {});
-  if (null === a || "" === a.trim()) {
-    return !0;
-  }
-  a = a.replace(/[^a-zA-Z ]/g, "");
-  for (b = 0;b < c.length;b++) {
-    if (a = a.replace(new RegExp("\\b" + c[b] + "\\b", "ig"), ""), "" == a.trim()) {
-      return !0;
-    }
-  }
-  return !1;
-}, code:"AX_TEXT_04"});
-axs.AuditRules.addRule({name:"lowContrastElements", heading:"Text elements should have a reasonable contrast ratio", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_color_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a, b) {
-  return !b.disabled && axs.properties.hasDirectTextDescendant(a);
-}, test:function(a) {
-  var b = window.getComputedStyle(a, null);
-  return (a = axs.utils.getContrastRatioForElementWithComputedStyle(b, a)) && axs.utils.isLowContrast(a, b);
-}, code:"AX_COLOR_01"});
-axs.AuditRules.addRule({name:"mainRoleOnInappropriateElement", heading:"role=main should only appear on significant elements", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_05", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "[role~=main]");
-}, test:function(a) {
-  if (axs.utils.isInlineElement(a)) {
-    return !0;
-  }
-  a = axs.properties.getTextFromDescendantContent(a);
-  return !a || 50 > a.length ? !0 : !1;
-}, code:"AX_ARIA_05"});
-axs.AuditRules.addRule({name:"elementsWithMeaningfulBackgroundImage", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a, b) {
-  return !b.hidden;
-}, heading:"Meaningful images should not be used in element backgrounds", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_image_01", test:function(a) {
-  if (a.textContent && 0 < a.textContent.length) {
-    return !1;
-  }
-  a = window.getComputedStyle(a, null);
-  var b = a.backgroundImage;
-  if (!b || "undefined" === b || "none" === b || 0 != b.indexOf("url")) {
-    return !1;
-  }
-  b = parseInt(a.width, 10);
-  a = parseInt(a.height, 10);
-  return 150 > b && 150 > a;
-}, code:"AX_IMAGE_01"});
-axs.AuditRules.addRule({name:"multipleAriaOwners", heading:"An element's ID must not be present in more that one aria-owns attribute at any time", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_07", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "[aria-owns]");
-}, test:function(a) {
-  return axs.utils.getIdReferents("aria-owns", a).some(function(a) {
-    return 1 < axs.utils.getAriaIdReferrers(a, "aria-owns").length;
-  });
-}, code:"AX_ARIA_07"});
-axs.AuditRules.addRule({name:"multipleLabelableElementsPerLabel", heading:"A label element may not have labelable descendants other than its labeled control.", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#-ax_text_03--labels-should-only-contain-one-labelable-element", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "label");
-}, test:function(a) {
-  if (1 < a.querySelectorAll(axs.utils.LABELABLE_ELEMENTS_SELECTOR).length) {
-    return !0;
-  }
-}, code:"AX_TEXT_03"});
-axs.AuditRules.addRule({name:"nonExistentRelatedElement", heading:"Attributes which refer to other elements by ID should refer to elements which exist in the DOM", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_html_03", severity:axs.constants.Severity.SEVERE, opt_requires:{idRefs:!0}, relevantElementMatcher:function(a, b) {
-  return 0 < b.idrefs.length;
-}, test:function(a, b) {
-  return b.idrefs.some(function(a) {
-    return !document.getElementById(a);
-  });
-}, code:"AX_HTML_03"});
-axs.AuditRules.addRule({name:"pageWithoutTitle", heading:"The web page should have a title that describes topic or purpose", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_title_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  return "html" == a.tagName.toLowerCase();
-}, test:function(a) {
-  a = a.querySelector("head");
-  return a ? (a = a.querySelector("title")) ? !a.textContent : !0 : !0;
-}, code:"AX_TITLE_01"});
-axs.AuditRules.addRule({name:"requiredAriaAttributeMissing", heading:"Elements with ARIA roles must have all required attributes for that role", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_03", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "[role]");
-}, test:function(a) {
-  var b = axs.utils.getRoles(a);
-  if (!b.valid) {
-    return !1;
-  }
-  for (var c = 0;c < b.roles.length;c++) {
-    var d = b.roles[c].details.requiredPropertiesSet, e;
-    for (e in d) {
-      if (d = e.replace(/^aria-/, ""), !("defaultValue" in axs.constants.ARIA_PROPERTIES[d] || a.hasAttribute(e)) && 0 > axs.properties.getNativelySupportedAttributes(a).indexOf(e)) {
-        return !0;
-      }
-    }
-  }
-}, code:"AX_ARIA_03"});
-(function() {
-  function a(a) {
-    a = axs.utils.getRoles(a);
-    if (!a || !a.applied) {
-      return [];
-    }
-    a = a.applied;
-    return a.valid ? a.details.mustcontain || [] : [];
-  }
-  axs.AuditRules.addRule({name:"requiredOwnedAriaRoleMissing", heading:"Elements with ARIA roles must ensure required owned elements are present", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_08", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(b) {
-    return axs.browserUtils.matchSelector(b, "[role]") ? 0 < a(b).length : !1;
-  }, test:function(b) {
-    if ("true" === b.getAttribute("aria-busy")) {
-      return !1;
-    }
-    for (var c = a(b), d = c.length - 1;0 <= d;d--) {
-      var e = axs.utils.findDescendantsWithRole(b, c[d]);
-      if (e && e.length) {
-        return !1;
-      }
-    }
-    b = axs.utils.getIdReferents("aria-owns", b);
-    for (d = b.length - 1;0 <= d;d--) {
-      if ((e = axs.utils.getRoles(b[d], !0)) && e.applied) {
-        for (var e = e.applied, f = c.length - 1;0 <= f;f--) {
-          if (e.name === c[f]) {
-            return !1;
-          }
-        }
-      }
-    }
-    return !0;
-  }, code:"AX_ARIA_08"});
-})();
-axs.AuditRules.addRule({name:"roleTooltipRequiresDescribedby", heading:"Elements with role=tooltip should have a corresponding element with aria-describedby", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_02", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a, b) {
-  return axs.browserUtils.matchSelector(a, "[role=tooltip]") && !b.hidden;
-}, test:function(a) {
-  a = axs.utils.getAriaIdReferrers(a, "aria-describedby");
-  return !a || 0 === a.length;
-}, code:"AX_TOOLTIP_01"});
-axs.AuditRules.addRule({name:"tabIndexGreaterThanZero", heading:"Avoid positive integer values for tabIndex", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_focus_03", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "[tabindex]");
-}, test:function(a) {
-  if (0 < a.tabIndex) {
-    return !0;
-  }
-}, code:"AX_FOCUS_03"});
-(function() {
-  function a(a) {
-    if (0 == a.childElementCount) {
-      return !0;
-    }
-    if (a.hasAttribute("role") && "presentation" != a.getAttribute("role")) {
-      return !1;
-    }
-    if ("presentation" == a.getAttribute("role")) {
-      a = a.querySelectorAll("*");
-      for (var c = 0;c < a.length;c++) {
-        if ("TR" != a[c].tagName && "TD" != a[c].tagName) {
-          return !1;
-        }
-      }
-      return !0;
-    }
-    return !1;
-  }
-  axs.AuditRules.addRule({name:"tableHasAppropriateHeaders", heading:"Tables should have appropriate headers", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_table_01", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(b) {
-    return axs.browserUtils.matchSelector(b, "table") && !a(b) && 0 < b.querySelectorAll("tr").length;
-  }, test:function(a) {
-    a = a.querySelectorAll("tr");
-    var c;
-    a: {
-      c = a[0].children;
-      for (var d = 0;d < c.length;d++) {
-        if ("TH" != c[d].tagName) {
-          c = !0;
-          break a;
-        }
-      }
-      c = !1;
-    }
-    if (c) {
-      a: {
-        for (c = 0;c < a.length;c++) {
-          if ("TH" != a[c].children[0].tagName) {
-            c = !0;
-            break a;
-          }
-        }
-        c = !1;
-      }
-    }
-    if (c) {
-      a: {
-        c = a[0].children;
-        for (d = 1;d < c.length;d++) {
-          if ("TH" != c[d].tagName) {
-            c = !0;
-            break a;
-          }
-        }
-        for (d = 1;d < a.length;d++) {
-          if ("TH" != a[d].children[0].tagName) {
-            c = !0;
-            break a;
-          }
-        }
-        c = !1;
-      }
-    }
-    return c;
-  }, code:"AX_TABLE_01"});
-})();
-(function() {
-  axs.AuditRules.addRule({name:"uncontrolledTabpanel", heading:"A tabpanel should be related to a tab via aria-controls or aria-labelledby", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_13", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-    return axs.browserUtils.matchSelector(a, '[role="tabpanel"]');
-  }, test:function(a) {
-    var b;
-    b = document.querySelectorAll('[role="tab"][aria-controls="' + a.id + '"]');
-    (b = a.id && 1 === b.length) || (a.hasAttribute("aria-labelledby") ? (a = document.querySelectorAll("#" + a.getAttribute("aria-labelledby")), b = 1 === a.length && "tab" === a[0].getAttribute("role")) : b = !1);
-    return !b;
-  }, code:"AX_ARIA_13"});
-})();
-axs.AuditRules.addRule({name:"unfocusableElementsWithOnClick", heading:"Elements with onclick handlers must be focusable", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_focus_02", severity:axs.constants.Severity.WARNING, opt_requires:{consoleAPI:!0}, relevantElementMatcher:function(a, b) {
-  return a instanceof a.ownerDocument.defaultView.HTMLBodyElement || b.hidden ? !1 : "click" in getEventListeners(a) ? !0 : !1;
-}, test:function(a) {
-  return !a.hasAttribute("tabindex") && !axs.utils.isElementImplicitlyFocusable(a) && !a.disabled;
-}, code:"AX_FOCUS_02"});
-(function() {
-  var a = /^aria\-/, b = axs.utils.getSelectorForAriaProperties(axs.constants.ARIA_PROPERTIES);
-  axs.AuditRules.addRule({name:"unsupportedAriaAttribute", heading:"This element has an unsupported ARIA attribute", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_10", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
-    return axs.browserUtils.matchSelector(a, b);
-  }, test:function(b) {
-    var d = axs.utils.getRoles(b, !0), d = d && d.applied ? d.applied.details.propertiesSet : axs.constants.GLOBAL_PROPERTIES;
-    b = b.attributes;
-    for (var e = 0, f = b.length;e < f;e++) {
-      var g = b[e].name;
-      if (a.test(g)) {
-        var h = g.replace(a, "");
-        if (axs.constants.ARIA_PROPERTIES.hasOwnProperty(h) && !(g in d)) {
-          return !0;
-        }
-      }
-    }
-    return !1;
-  }, code:"AX_ARIA_10"});
-})();
-axs.AuditRules.addRule({name:"videoWithoutCaptions", heading:"Video elements should use <track> elements to provide captions", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_video_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "video");
-}, test:function(a) {
-  return !a.querySelectorAll("track[kind=captions]").length;
-}, code:"AX_VIDEO_01"});
-
-  return axs;
-});
-
-// Define AMD module if possible, export globals otherwise.
-if (typeof define !== 'undefined' && define.amd) {
-  define([], fn);
-} else {
-  var axs = fn.call(this);
-}
-
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index a8cc93b56..4510b13f3 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1,7 +1,135 @@
 "use strict";
 
 window._qutebrowser.caret = (function() {
-    const funcs = {};
+
+    var axs = {};
+
+    axs.dom = {};
+
+    axs.color = {};
+
+    axs.utils = {};
+
+    axs.dom.parentElement = function(a) {
+        if (!a) {
+            return null;
+        }
+        a = axs.dom.composedParentNode(a);
+        if (!a) {
+            return null;
+        }
+        switch(a.nodeType) {
+            case Node.ELEMENT_NODE:
+                return a;
+            default:
+                return axs.dom.parentElement(a);
+        }
+    };
+
+    axs.dom.shadowHost = function(a) {
+        return "host" in a ? a.host : null;
+    };
+
+    axs.dom.composedParentNode = function(a) {
+        if (!a) {
+            return null;
+        }
+        if (a.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
+            return axs.dom.shadowHost(a);
+        }
+        var b = a.parentNode;
+        if (!b) {
+            return null;
+        }
+        if (b.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
+            return axs.dom.shadowHost(b);
+        }
+        if (!b.shadowRoot) {
+            return b;
+        }
+        a = a.getDestinationInsertionPoints();
+        return 0 < a.length ? axs.dom.composedParentNode(a[a.length - 1]) : null;
+    };
+
+    axs.color.Color = function(a, b, c, d) {
+        this.red = a;
+        this.green = b;
+        this.blue = c;
+        this.alpha = d;
+    };
+
+    axs.color.parseColor = function(a) {
+        if ("transparent" === a) {
+            return new axs.color.Color(0, 0, 0, 0);
+        }
+        var b = a.match(/^rgb\((\d+), (\d+), (\d+)\)$/);
+        if (b) {
+            a = parseInt(b[1], 10);
+            var c = parseInt(b[2], 10), d = parseInt(b[3], 10);
+            return new axs.color.Color(a, c, d, 1);
+        }
+        return (b = a.match(/^rgba\((\d+), (\d+), (\d+), (\d*(\.\d+)?)\)/)) ? (a = parseInt(b[1], 10), c = parseInt(b[2], 10), d = parseInt(b[3], 10), b = parseFloat(b[4]), new axs.color.Color(a, c, d, b)) : null;
+    };
+
+    axs.color.flattenColors = function(a, b) {
+        var c = a.alpha;
+        return new axs.color.Color((1 - c) * b.red + c * a.red, (1 - c) * b.green + c * a.green, (1 - c) * b.blue + c * a.blue, a.alpha + b.alpha * (1 - a.alpha));
+    };
+
+    axs.utils.getParentBgColor = function(a) {
+        var b = a;
+        a = [];
+        for (var c = null;b = axs.dom.parentElement(b);) {
+            var d = window.getComputedStyle(b, null);
+            if (d) {
+                var e = axs.color.parseColor(d.backgroundColor);
+                if (e && (1 > d.opacity && (e.alpha *= d.opacity), 0 != e.alpha && (a.push(e), 1 == e.alpha))) {
+                    c = !0;
+                    break;
+                }
+            }
+        }
+        c || a.push(new axs.color.Color(255, 255, 255, 1));
+        for (b = a.pop();a.length;) {
+            c = a.pop(), b = axs.color.flattenColors(c, b);
+        }
+        return b;
+    };
+
+    axs.utils.getFgColor = function(a, b, c) {
+        var d = axs.color.parseColor(a.color);
+        if (!d) {
+            return null;
+        }
+        1 > d.alpha && (d = axs.color.flattenColors(d, c));
+        1 > a.opacity && (b = axs.utils.getParentBgColor(b), d.alpha *= a.opacity, d = axs.color.flattenColors(d, b));
+        return d;
+    };
+
+    axs.utils.getBgColor = function(a, b) {
+        var c = axs.color.parseColor(a.backgroundColor);
+        if (!c) {
+            return null;
+        }
+        1 > a.opacity && (c.alpha *= a.opacity);
+        if (1 > c.alpha) {
+            var d = axs.utils.getParentBgColor(b);
+            if (null == d) {
+                return null;
+            }
+            c = axs.color.flattenColors(c, d);
+        }
+        return c;
+    };
+
+    axs.color.colorChannelToString = function(a) {
+        a = Math.round(a);
+        return 15 >= a ? "0" + a.toString(16) : a.toString(16);
+    };
+
+    axs.color.colorToString = function(a) {
+        return 1 == a.alpha ? "#" + axs.color.colorChannelToString(a.red) + axs.color.colorChannelToString(a.green) + axs.color.colorChannelToString(a.blue) : "rgba(" + [a.red, a.green, a.blue, a.alpha].join() + ")";
+    };
 
     var Cursor = function(node, index, text) {
         this.node = node;
@@ -69,23 +197,6 @@ window._qutebrowser.caret = (function() {
         return (c == ' ' || c == '\n' || c == '\r' || c == '\t');
     };
 
-    /**
-     * Set the selection to the range between the given start and end cursors.
-     * @param {Cursor} start The desired start of the selection.
-     * @param {Cursor} end The desired end of the selection.
-     * @return {Selection} the selection object.
-     */
-    TraverseUtil.setSelection = function(start, end) {
-        var sel = window.getSelection();
-        sel.removeAllRanges();
-        var range = document.createRange();
-        range.setStart(start.node, start.index);
-        range.setEnd(end.node, end.index);
-        sel.addRange(range);
-
-        return sel;
-    };
-
     /**
      * Use the computed CSS style to figure out if this DOM node is currently
      * visible.
@@ -196,91 +307,6 @@ window._qutebrowser.caret = (function() {
         }
     };
 
-    /**
-     * Moves the cursor backwards until it has crossed exactly one character.
-     * @param {Cursor} cursor The cursor location where the search should start.
-     *     On exit, the cursor will be immediately to the left of the
-     *     character returned.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @return {?string} The previous character, or null if the top of the
-     *     document has been reached.
-     */
-    TraverseUtil.backwardsChar = function(cursor, nodesCrossed) {
-        while (true) {
-            // Move down until we get to a leaf node.
-            var childNode = null;
-            if (!TraverseUtil.treatAsLeafNode(cursor.node)) {
-                for (var i = cursor.index - 1; i >= 0; i--) {
-                    var node = cursor.node.childNodes[i];
-                    if (TraverseUtil.isSkipped(node)) {
-                        nodesCrossed.push(node);
-                        continue;
-                    }
-                    if (TraverseUtil.isVisible(node)) {
-                        childNode = node;
-                        break;
-                    }
-                }
-            }
-            if (childNode) {
-                cursor.node = childNode;
-                cursor.text = TraverseUtil.getNodeText(cursor.node);
-                if (cursor.text.length)
-                    cursor.index = cursor.text.length;
-                else
-                    cursor.index = cursor.node.childNodes.length;
-                if (cursor.node.constructor != Text)
-                    nodesCrossed.push(cursor.node);
-                continue;
-            }
-
-            // Return the previous character from this leaf node.
-            if (cursor.text.length > 0 && cursor.index > 0) {
-                return cursor.text[--cursor.index];
-            }
-
-            // Move to the previous sibling, going up the tree as necessary.
-            while (true) {
-                // Try to move to the previous sibling.
-                var siblingNode = null;
-                for (var node = cursor.node.previousSibling;
-                    node != null;
-                    node = node.previousSibling) {
-                    if (TraverseUtil.isSkipped(node)) {
-                        nodesCrossed.push(node);
-                        continue;
-                    }
-                    if (TraverseUtil.isVisible(node)) {
-                        siblingNode = node;
-                        break;
-                    }
-                }
-                if (siblingNode) {
-                    cursor.node = siblingNode;
-                    cursor.text = TraverseUtil.getNodeText(siblingNode);
-                    if (cursor.text.length)
-                        cursor.index = cursor.text.length;
-                    else
-                        cursor.index = cursor.node.childNodes.length;
-                    if (cursor.node.constructor != Text)
-                        nodesCrossed.push(cursor.node);
-                    break;
-                }
-
-                // Otherwise, move to the parent.
-                if (cursor.node.parentNode &&
-                    cursor.node.parentNode.constructor != HTMLBodyElement) {
-                    cursor.node = cursor.node.parentNode;
-                    cursor.text = null;
-                    cursor.index = 0;
-                } else {
-                    return null;
-                }
-            }
-        }
-    };
-
     /**
      * Finds the next character, starting from endCursor.  Upon exit, startCursor
      * and endCursor will surround the next character. If skipWhitespace is
@@ -341,538 +367,6 @@ window._qutebrowser.caret = (function() {
         }
     };
 
-    /**
-     * Finds the previous character, starting from startCursor.  Upon exit,
-     * startCursor and endCursor will surround the previous character.
-     * If skipWhitespace is true, will skip until a real character is found.
-     * Otherwise, it will attempt to select all of the whitespace between
-     * the initial position of endCursor and the next non-whitespace character.
-     * @param {Cursor} startCursor The position to start searching for the
-     *     char. On exit, will point to the position before the char.
-     * @param {Cursor} endCursor The position to start searching for the next
-     *     char. On exit, will point to the position past the char.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @param {boolean} skipWhitespace If true, will keep scanning until a
-     *     non-whitespace character is found.
-     * @return {?string} The previous char, or null if the top of the
-     *     document has been reached.
-     */
-    TraverseUtil.getPreviousChar = function(
-        startCursor, endCursor, nodesCrossed, skipWhitespace) {
-
-        // Save the starting position and get the first character.
-        endCursor.copyFrom(startCursor);
-        var c = TraverseUtil.backwardsChar(startCursor, nodesCrossed);
-        if (c == null)
-        return null;
-
-        // Keep track of whether the first character was whitespace.
-        var initialWhitespace = TraverseUtil.isWhitespace(c);
-
-        // Keep scanning until we find a non-whitespace or non-skipped character.
-        while ((TraverseUtil.isWhitespace(c)) ||
-            (TraverseUtil.isSkipped(startCursor.node))) {
-            c = TraverseUtil.backwardsChar(startCursor, nodesCrossed);
-            if (c == null)
-            return null;
-        }
-        if (skipWhitespace || !initialWhitespace) {
-            // If skipWhitepace is true, or if the first character we encountered
-            // was not whitespace, return that non-whitespace character.
-            endCursor.copyFrom(startCursor);
-            endCursor.index++;
-            return c;
-        } else {
-            for (var i = 0; i < nodesCrossed.length; i++) {
-                if (TraverseUtil.isSkipped(nodesCrossed[i])) {
-                    startCursor.index++;
-                    endCursor.copyFrom(startCursor);
-                    endCursor.index++;
-                    return ' ';
-                }
-            }
-            // Otherwise, return all of the whitespace before that last character.
-            startCursor.index++;
-            return ' ';
-        }
-    };
-
-    /**
-     * Finds the next word, starting from endCursor.  Upon exit, startCursor
-     * and endCursor will surround the next word.  A word is defined to be
-     * a string of 1 or more non-whitespace characters in the same DOM node.
-     * @param {Cursor} startCursor On exit, will point to the beginning of the
-     *     word returned.
-     * @param {Cursor} endCursor The position to start searching for the next
-     *     word.  On exit, will point to the end of the word returned.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @return {?string} The next word, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.getNextWord = function(startCursor, endCursor,
-        nodesCrossed) {
-
-        // Find the first non-whitespace or non-skipped character.
-        var cursor = endCursor.clone();
-        var c = TraverseUtil.forwardsChar(cursor, nodesCrossed);
-        if (c == null)
-        return null;
-        while ((TraverseUtil.isWhitespace(c)) ||
-            (TraverseUtil.isSkipped(cursor.node))) {
-            c = TraverseUtil.forwardsChar(cursor, nodesCrossed);
-            if (c == null)
-            return null;
-        }
-
-        // Set startCursor to the position immediately before the first
-        // character in our word. It's safe to decrement |index| because
-        // forwardsChar guarantees that the cursor will be immediately to the
-        // right of the returned character on exit.
-        startCursor.copyFrom(cursor);
-        startCursor.index--;
-
-        // Keep building up our word until we reach a whitespace character or
-        // would cross a tag.  Don't actually return any tags crossed, because this
-        // word goes up until the tag boundary but not past it.
-        endCursor.copyFrom(cursor);
-        var word = c;
-        var newNodesCrossed = [];
-        c = TraverseUtil.forwardsChar(cursor, newNodesCrossed);
-        if (c == null) {
-            return word;
-        }
-        while (!TraverseUtil.isWhitespace(c) &&
-            newNodesCrossed.length == 0) {
-            word += c;
-            endCursor.copyFrom(cursor);
-            c = TraverseUtil.forwardsChar(cursor, newNodesCrossed);
-            if (c == null) {
-                return word;
-            }
-        }
-        return word;
-    };
-
-    /**
-     * Finds the previous word, starting from startCursor.  Upon exit, startCursor
-     * and endCursor will surround the previous word.  A word is defined to be
-     * a string of 1 or more non-whitespace characters in the same DOM node.
-     * @param {Cursor} startCursor The position to start searching for the
-     *     previous word.  On exit, will point to the beginning of the
-     *     word returned.
-     * @param {Cursor} endCursor On exit, will point to the end of the
-     *     word returned.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @return {?string} The previous word, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.getPreviousWord = function(startCursor, endCursor,
-        nodesCrossed) {
-        // Find the first non-whitespace or non-skipped character.
-        var cursor = startCursor.clone();
-        var c = TraverseUtil.backwardsChar(cursor, nodesCrossed);
-        if (c == null)
-        return null;
-        while ((TraverseUtil.isWhitespace(c) ||
-            (TraverseUtil.isSkipped(cursor.node)))) {
-            c = TraverseUtil.backwardsChar(cursor, nodesCrossed);
-            if (c == null)
-            return null;
-        }
-
-        // Set endCursor to the position immediately after the first
-        // character we've found (the last character of the word, since we're
-        // searching backwards).
-        endCursor.copyFrom(cursor);
-        endCursor.index++;
-
-        // Keep building up our word until we reach a whitespace character or
-        // would cross a tag.  Don't actually return any tags crossed, because this
-        // word goes up until the tag boundary but not past it.
-        startCursor.copyFrom(cursor);
-        var word = c;
-        var newNodesCrossed = [];
-        c = TraverseUtil.backwardsChar(cursor, newNodesCrossed);
-        if (c == null)
-        return word;
-        while (!TraverseUtil.isWhitespace(c) &&
-            newNodesCrossed.length == 0) {
-            word = c + word;
-            startCursor.copyFrom(cursor);
-            c = TraverseUtil.backwardsChar(cursor, newNodesCrossed);
-            if (c == null)
-            return word;
-        }
-
-        return word;
-    };
-
-    /**
-     * Finds the next sentence, starting from endCursor.  Upon exit,
-     * startCursor and endCursor will surround the next sentence.
-     *
-     * @param {Cursor} startCursor On exit, marks the beginning of the sentence.
-     * @param {Cursor} endCursor The position to start searching for the next
-     *     sentence.  On exit, will point to the end of the returned string.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @param {Object} breakTags Associative array of tags that should break
-     *     the sentence.
-     * @return {?string} The next sentence, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.getNextSentence = function(
-        startCursor, endCursor, nodesCrossed, breakTags) {
-        return TraverseUtil.getNextString(
-            startCursor, endCursor, nodesCrossed,
-            function(str, word, nodes) {
-                if (str.substr(-1) == '.')
-                    return true;
-                for (var i = 0; i < nodes.length; i++) {
-                    if (TraverseUtil.isSkipped(nodes[i])) {
-                        return true;
-                    }
-                    var style = window.getComputedStyle(nodes[i], null);
-                    if (style && (style.display != 'inline' ||
-                        breakTags[nodes[i].tagName])) {
-                        return true;
-                    }
-                }
-                return false;
-            });
-    };
-
-    /**
-     * Finds the previous sentence, starting from startCursor.  Upon exit,
-     * startCursor and endCursor will surround the previous sentence.
-     *
-     * @param {Cursor} startCursor The position to start searching for the next
-     *     sentence.  On exit, will point to the start of the returned string.
-     * @param {Cursor} endCursor On exit, the end of the returned string.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @param {Object} breakTags Associative array of tags that should break
-     *     the sentence.
-     * @return {?string} The previous sentence, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.getPreviousSentence = function(
-        startCursor, endCursor, nodesCrossed, breakTags) {
-        return TraverseUtil.getPreviousString(
-            startCursor, endCursor, nodesCrossed,
-            function(str, word, nodes) {
-                if (word.substr(-1) == '.')
-                    return true;
-                for (var i = 0; i < nodes.length; i++) {
-                    if (TraverseUtil.isSkipped(nodes[i])) {
-                        return true;
-                    }
-                    var style = window.getComputedStyle(nodes[i], null);
-                    if (style && (style.display != 'inline' ||
-                        breakTags[nodes[i].tagName])) {
-                        return true;
-                    }
-                }
-                return false;
-            });
-    };
-
-    /**
-     * Finds the next line, starting from endCursor.  Upon exit,
-     * startCursor and endCursor will surround the next line.
-     *
-     * @param {Cursor} startCursor On exit, marks the beginning of the line.
-     * @param {Cursor} endCursor The position to start searching for the next
-     *     line.  On exit, will point to the end of the returned string.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @param {number} lineLength The maximum number of characters in a line.
-     * @param {Object} breakTags Associative array of tags that should break
-     *     the line.
-     * @return {?string} The next line, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.getNextLine = function(
-        startCursor, endCursor, nodesCrossed, lineLength, breakTags) {
-        return TraverseUtil.getNextString(
-            startCursor, endCursor, nodesCrossed,
-            function(str, word, nodes) {
-                if (str.length + word.length + 1 > lineLength)
-                    return true;
-                for (var i = 0; i < nodes.length; i++) {
-                    if (TraverseUtil.isSkipped(nodes[i])) {
-                        return true;
-                    }
-                    var style = window.getComputedStyle(nodes[i], null);
-                    if (style && (style.display != 'inline' ||
-                        breakTags[nodes[i].tagName])) {
-                        return true;
-                    }
-                }
-                return false;
-            });
-    };
-
-    /**
-     * Finds the previous line, starting from startCursor.  Upon exit,
-     * startCursor and endCursor will surround the previous line.
-     *
-     * @param {Cursor} startCursor The position to start searching for the next
-     *     line.  On exit, will point to the start of the returned string.
-     * @param {Cursor} endCursor On exit, the end of the returned string.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @param {number} lineLength The maximum number of characters in a line.
-     * @param {Object} breakTags Associative array of tags that should break
-     *     the sentence.
-     *  @return {?string} The previous line, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.getPreviousLine = function(
-        startCursor, endCursor, nodesCrossed, lineLength, breakTags) {
-        return TraverseUtil.getPreviousString(
-            startCursor, endCursor, nodesCrossed,
-            function(str, word, nodes) {
-                if (str.length + word.length + 1 > lineLength)
-                    return true;
-                for (var i = 0; i < nodes.length; i++) {
-                    if (TraverseUtil.isSkipped(nodes[i])) {
-                        return true;
-                    }
-                    var style = window.getComputedStyle(nodes[i], null);
-                    if (style && (style.display != 'inline' ||
-                        breakTags[nodes[i].tagName])) {
-                        return true;
-                    }
-                }
-                return false;
-            });
-    };
-
-    /**
-     * Finds the next paragraph, starting from endCursor.  Upon exit,
-     * startCursor and endCursor will surround the next paragraph.
-     *
-     * @param {Cursor} startCursor On exit, marks the beginning of the paragraph.
-     * @param {Cursor} endCursor The position to start searching for the next
-     *     paragraph.  On exit, will point to the end of the returned string.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @return {?string} The next paragraph, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.getNextParagraph = function(startCursor, endCursor,
-        nodesCrossed) {
-        return TraverseUtil.getNextString(
-            startCursor, endCursor, nodesCrossed,
-            function(str, word, nodes) {
-                for (var i = 0; i < nodes.length; i++) {
-                    if (TraverseUtil.isSkipped(nodes[i])) {
-                        return true;
-                    }
-                    var style = window.getComputedStyle(nodes[i], null);
-                    if (style && style.display != 'inline') {
-                        return true;
-                    }
-                }
-                return false;
-            });
-    };
-
-    /**
-     * Finds the previous paragraph, starting from startCursor.  Upon exit,
-     * startCursor and endCursor will surround the previous paragraph.
-     *
-     * @param {Cursor} startCursor The position to start searching for the next
-     *     paragraph.  On exit, will point to the start of the returned string.
-     * @param {Cursor} endCursor On exit, the end of the returned string.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @return {?string} The previous paragraph, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.getPreviousParagraph = function(
-        startCursor, endCursor, nodesCrossed) {
-        return TraverseUtil.getPreviousString(
-            startCursor, endCursor, nodesCrossed,
-            function(str, word, nodes) {
-                for (var i = 0; i < nodes.length; i++) {
-                    if (TraverseUtil.isSkipped(nodes[i])) {
-                        return true;
-                    }
-                    var style = window.getComputedStyle(nodes[i], null);
-                    if (style && style.display != 'inline') {
-                        return true;
-                    }
-                }
-                return false;
-            });
-    };
-
-    /**
-     * Customizable function to return the next string of words in the DOM, based
-     * on provided functions to decide when to break one string and start
-     * the next. This can be used to get the next sentence, line, paragraph,
-     * or potentially other granularities.
-     *
-     * Finds the next contiguous string, starting from endCursor.  Upon exit,
-     * startCursor and endCursor will surround the next string.
-     *
-     * The breakBefore function takes three parameters, and
-     * should return true if the string should be broken before the proposed
-     * next word:
-     *   str The string so far.
-     *   word The next word to be added.
-     *   nodesCrossed The nodes crossed in reaching this next word.
-     *
-     * @param {Cursor} startCursor On exit, will point to the beginning of the
-     *     next string.
-     * @param {Cursor} endCursor The position to start searching for the next
-     *     string.  On exit, will point to the end of the returned string.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @param {function(string, string, Array<string>)} breakBefore
-     *     Function that takes the string so far, next word to be added, and
-     *     nodes crossed, and returns true if the string should be ended before
-     *     adding this word.
-     * @return {?string} The next string, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.getNextString = function(
-        startCursor, endCursor, nodesCrossed, breakBefore) {
-        // Get the first word and set the start cursor to the start of the
-        // first word.
-        var wordStartCursor = endCursor.clone();
-        var wordEndCursor = endCursor.clone();
-        var newNodesCrossed = [];
-        var str = '';
-        var word = TraverseUtil.getNextWord(
-            wordStartCursor, wordEndCursor, newNodesCrossed);
-        if (word == null)
-        return null;
-        startCursor.copyFrom(wordStartCursor);
-
-        // Always add the first word when the string is empty, and then keep
-        // adding more words as long as breakBefore returns false
-        while (!str || !breakBefore(str, word, newNodesCrossed)) {
-            // Append this word, set the end cursor to the end of this word, and
-            // update the returned list of nodes crossed to include ones we crossed
-            // in reaching this word.
-            if (str)
-                str += ' ';
-            str += word;
-            nodesCrossed = nodesCrossed.concat(newNodesCrossed);
-            endCursor.copyFrom(wordEndCursor);
-
-            // Get the next word and go back to the top of the loop.
-            newNodesCrossed = [];
-            word = TraverseUtil.getNextWord(
-                wordStartCursor, wordEndCursor, newNodesCrossed);
-            if (word == null)
-                return str;
-        }
-
-        return str;
-    };
-
-    /**
-     * Customizable function to return the previous string of words in the DOM,
-     * based on provided functions to decide when to break one string and start
-     * the next. See getNextString, above, for more details.
-     *
-     * Finds the previous contiguous string, starting from startCursor.  Upon exit,
-     * startCursor and endCursor will surround the next string.
-     *
-     * @param {Cursor} startCursor The position to start searching for the
-     *     previous string.  On exit, will point to the beginning of the
-     *     string returned.
-     * @param {Cursor} endCursor On exit, will point to the end of the
-     *     string returned.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @param {function(string, string, Array<string>)} breakBefore
-     *     Function that takes the string so far, the word to be added, and
-     *     nodes crossed, and returns true if the string should be ended before
-     *     adding this word.
-     * @return {?string} The next string, or null if the top of the
-     *     document has been reached.
-     */
-    TraverseUtil.getPreviousString = function(
-        startCursor, endCursor, nodesCrossed, breakBefore) {
-        // Get the first word and set the end cursor to the end of the
-        // first word.
-        var wordStartCursor = startCursor.clone();
-        var wordEndCursor = startCursor.clone();
-        var newNodesCrossed = [];
-        var str = '';
-        var word = TraverseUtil.getPreviousWord(
-            wordStartCursor, wordEndCursor, newNodesCrossed);
-        if (word == null)
-        return null;
-        endCursor.copyFrom(wordEndCursor);
-
-        // Always add the first word when the string is empty, and then keep
-        // adding more words as long as breakBefore returns false
-        while (!str || !breakBefore(str, word, newNodesCrossed)) {
-            // Prepend this word, set the start cursor to the start of this word, and
-            // update the returned list of nodes crossed to include ones we crossed
-            // in reaching this word.
-            if (str)
-                str = ' ' + str;
-            str = word + str;
-            nodesCrossed = nodesCrossed.concat(newNodesCrossed);
-            startCursor.copyFrom(wordStartCursor);
-            // Get the previous word and go back to the top of the loop.
-            newNodesCrossed = [];
-            word = TraverseUtil.getPreviousWord(
-                wordStartCursor, wordEndCursor, newNodesCrossed);
-            if (word == null)
-                return str;
-        }
-
-        return str;
-    };
-
-
-    function isFocusable(targetNode) {
-        if (!targetNode || typeof(targetNode.tabIndex) != 'number') {
-            return false;
-        }
-
-        if (targetNode.tabIndex >= 0) {
-            return true;
-        }
-
-        if (targetNode.hasAttribute &&
-            targetNode.hasAttribute('tabindex') &&
-            targetNode.getAttribute('tabindex') == '-1') {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Determines whether or not a node is or is the descendant of another node.
-     *
-     * @param {Object} node The node to be checked.
-     * @param {Object} ancestor The node to see if it's a descendant of.
-     * @return {boolean} True if the node is ancestor or is a descendant of it.
-     */
-    function isDescendantOfNode(node, ancestor) {
-        while (node && ancestor) {
-            if (node.isSameNode(ancestor)) {
-                return true;
-            }
-            node = node.parentNode;
-        }
-        return false;
-    }
-
-
     var CaretBrowsing = function() {};
 
     /**
@@ -989,12 +483,6 @@ window._qutebrowser.caret = (function() {
      */
     CaretBrowsing.blinkFlag = true;
 
-    /**
-     * Whether or not we're on a Mac - affects modifier keys.
-     * @type {boolean}
-     */
-    CaretBrowsing.isMac = (navigator.appVersion.indexOf("Mac") != -1);
-
     /**
      * Check if a node is a control that normally allows the user to interact
      * with it using arrow keys. We won't override the arrow keys when such a
@@ -1070,7 +558,7 @@ window._qutebrowser.caret = (function() {
         return false;
     };
 
-    function injectCaretStyles() {
+    CaretBrowsing.injectCaretStyles = function() {
         var style = '.CaretBrowsing_Caret {' +
             '  position: absolute;' +
             '  z-index: 2147483647;' +
@@ -1098,55 +586,6 @@ window._qutebrowser.caret = (function() {
         document.body.appendChild(node);
     }
 
-    /**
-     * If there's no initial selection, set the cursor just before the
-     * first text character in the document.
-     */
-    funcs.setInitialCursor = () => {
-        if (!CaretBrowsing.initiated) {
-            injectCaretStyles();
-            CaretBrowsing.setInitialCursor();
-        } else {
-            if (!window.getSelection().toString()) {
-                positionCaret();
-            }
-            CaretBrowsing.toggle();
-        }
-    }
-
-    funcs.toggle = () => {
-        CaretBrowsing.toggle();
-    }
-
-    function positionCaret() {
-        const walker = document.createTreeWalker(document.body, -1);
-        let node;
-        const textNodes = [];
-        let el;
-        while ((node = walker.nextNode())) {
-            if (node.nodeType === 3 && node.nodeValue.trim() !== "") {
-                textNodes.push(node);
-            }
-        }
-        for (let i = 0; i < textNodes.length; i++) {
-            const element = textNodes[i].parentElement;
-            if (isElementInViewport(element)) {
-                el = element;
-                break;
-            }
-        }
-        if (el !== undefined) {
-            var start = new Cursor(el, 0, '');
-            var end = new Cursor(el, 0, '');
-            var nodesCrossed = [];
-            var result = TraverseUtil.getNextChar(start, end, nodesCrossed, true);
-            if (result == null) {
-                return;
-            }
-            CaretBrowsing.setAndValidateSelection(start, start);
-        }
-    }
-
     CaretBrowsing.setInitialCursor = function() {
         var sel = window.getSelection();
         if (sel.rangeCount > 0) {
@@ -1154,6 +593,7 @@ window._qutebrowser.caret = (function() {
         }
 
         positionCaret();
+        CaretBrowsing.injectCaretStyles();
         CaretBrowsing.toggle();
         CaretBrowsing.initiated = true;
         CaretBrowsing.selectionEnabled = false;
@@ -1196,22 +636,6 @@ window._qutebrowser.caret = (function() {
         return false;
     };
 
-    /**
-     * Set focus to the first focusable node in the given list.
-     * select the text, otherwise it doesn't appear focused to the user.
-     * Every other control behaves normally if you just call focus() on it.
-     * @param {Array<Node>} nodeList An array of nodes to focus.
-     * @return {boolean} True if the node was focused.
-     */
-    CaretBrowsing.setFocusToFirstFocusable = function(nodeList) {
-        for (var i = 0; i < nodeList.length; i++) {
-            if (CaretBrowsing.setFocusToNode(nodeList[i])) {
-                return true;
-            }
-        }
-        return false;
-    };
-
     /**
      * Set the caret element's normal style, i.e. not when animating.
      */
@@ -1489,165 +913,6 @@ window._qutebrowser.caret = (function() {
         }
     };
 
-    /**
-     * Return true if the selection directionality is ambiguous, which happens
-     * if, for example, the user double-clicks in the middle of a word to select
-     * it. In that case, the selection should extend by the right edge if the
-     * user presses right, and by the left edge if the user presses left.
-     * @param {Selection} sel The selection.
-     * @return {boolean} True if the selection directionality is ambiguous.
-     */
-    CaretBrowsing.isAmbiguous = function(sel) {
-        return (sel.anchorNode != sel.baseNode ||
-            sel.anchorOffset != sel.baseOffset ||
-            sel.focusNode != sel.extentNode ||
-            sel.focusOffset != sel.extentOffset);
-    };
-
-    /**
-     * Create a Cursor from the anchor position of the selection, the
-     * part that doesn't normally move.
-     * @param {Selection} sel The selection.
-     * @return {Cursor} A cursor pointing to the selection's anchor location.
-     */
-    CaretBrowsing.makeAnchorCursor = function(sel) {
-        return new Cursor(sel.anchorNode, sel.anchorOffset,
-            TraverseUtil.getNodeText(sel.anchorNode));
-    };
-
-    /**
-     * Create a Cursor from the focus position of the selection.
-     * @param {Selection} sel The selection.
-     * @return {Cursor} A cursor pointing to the selection's focus location.
-     */
-    CaretBrowsing.makeFocusCursor = function(sel) {
-        return new Cursor(sel.focusNode, sel.focusOffset,
-            TraverseUtil.getNodeText(sel.focusNode));
-    };
-
-    /**
-     * Create a Cursor from the left boundary of the selection - the boundary
-     * closer to the start of the document.
-     * @param {Selection} sel The selection.
-     * @return {Cursor} A cursor pointing to the selection's left boundary.
-     */
-    CaretBrowsing.makeLeftCursor = function(sel) {
-        var range = sel.rangeCount == 1 ? sel.getRangeAt(0) : null;
-        if (range &&
-            range.endContainer == sel.anchorNode &&
-            range.endOffset == sel.anchorOffset) {
-            return CaretBrowsing.makeFocusCursor(sel);
-        } else {
-            return CaretBrowsing.makeAnchorCursor(sel);
-        }
-    };
-
-    /**
-     * Create a Cursor from the right boundary of the selection - the boundary
-     * closer to the end of the document.
-     * @param {Selection} sel The selection.
-     * @return {Cursor} A cursor pointing to the selection's right boundary.
-     */
-    CaretBrowsing.makeRightCursor = function(sel) {
-        var range = sel.rangeCount == 1 ? sel.getRangeAt(0) : null;
-        if (range &&
-            range.endContainer == sel.anchorNode &&
-            range.endOffset == sel.anchorOffset) {
-            return CaretBrowsing.makeAnchorCursor(sel);
-        } else {
-            return CaretBrowsing.makeFocusCursor(sel);
-        }
-    };
-
-    /**
-     * Try to set the window's selection to be between the given start and end
-     * cursors, and return whether or not it was successful.
-     * @param {Cursor} start The start position.
-     * @param {Cursor} end The end position.
-     * @return {boolean} True if the selection was successfully set.
-     */
-    CaretBrowsing.setAndValidateSelection = function(start, end) {
-        var sel = window.getSelection();
-        sel.setBaseAndExtent(start.node, start.index, end.node, end.index);
-
-        if (sel.rangeCount != 1) {
-            return false;
-        }
-
-        return (sel.anchorNode == start.node &&
-            sel.anchorOffset == start.index &&
-            sel.focusNode == end.node &&
-            sel.focusOffset == end.index);
-    };
-
-    /**
-     * Note: the built-in function by the same name is unreliable.
-     * @param {Selection} sel The selection.
-     * @return {boolean} True if the start and end positions are the same.
-     */
-    CaretBrowsing.isCollapsed = function(sel) {
-        return (sel.anchorOffset == sel.focusOffset &&
-            sel.anchorNode == sel.focusNode);
-    };
-
-    /**
-     * Determines if the modifier key is held down that should cause
-     * the cursor to move by word rather than by character.
-     * @param {Event} evt A keyboard event.
-     * @return {boolean} True if the cursor should move by word.
-     */
-    CaretBrowsing.isMoveByWordEvent = function(evt) {
-        return evt.ctrlKey;
-    };
-
-    /**
-     * Moves the cursor forwards to the next valid position.
-     * @param {Cursor} cursor The current cursor location.
-     *     On exit, the cursor will be at the next position.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @return {?string} The character reached, or null if the bottom of the
-     *     document has been reached.
-     */
-    CaretBrowsing.forwards = function(cursor, nodesCrossed) {
-        var previousCursor = cursor.clone();
-        var result = TraverseUtil.forwardsChar(cursor, nodesCrossed);
-
-        // Work around the fact that TraverseUtil.forwardsChar returns once per
-        // char in a block of text, rather than once per possible selection
-        // position in a block of text.
-        if (result && cursor.node != previousCursor.node && cursor.index > 0) {
-            cursor.index = 0;
-        }
-
-        return result;
-    };
-
-    /**
-     * Moves the cursor backwards to the previous valid position.
-     * @param {Cursor} cursor The current cursor location.
-     *     On exit, the cursor will be at the previous position.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @return {?string} The character reached, or null if the top of the
-     *     document has been reached.
-     */
-    CaretBrowsing.backwards = function(cursor, nodesCrossed) {
-        var previousCursor = cursor.clone();
-        var result = TraverseUtil.backwardsChar(cursor, nodesCrossed);
-
-        // Work around the fact that TraverseUtil.backwardsChar returns once per
-        // char in a block of text, rather than once per possible selection
-        // position in a block of text.
-        if (result &&
-            cursor.node != previousCursor.node &&
-            cursor.index < cursor.text.length) {
-            cursor.index = cursor.text.length;
-        }
-
-        return result;
-    };
-
     CaretBrowsing.move = function(direction, granularity) {
         window
             .getSelection()
@@ -1682,472 +947,6 @@ window._qutebrowser.caret = (function() {
 
     }
 
-    funcs.moveRight = () => {
-        CaretBrowsing.move('right', 'character');
-    }
-
-    funcs.moveLeft = () => {
-        CaretBrowsing.move('left', 'character');
-    }
-
-    funcs.moveDown = () => {
-        CaretBrowsing.move('forward', 'line');
-    }
-
-    funcs.moveUp = () => {
-        CaretBrowsing.move('backward', 'line');
-    }
-
-    funcs.moveToEndOfWord = () => {
-        funcs.moveToNextWord();
-        funcs.moveLeft();
-    }
-
-    funcs.moveToNextWord = () => {
-        CaretBrowsing.move('forward', 'word');
-        funcs.moveRight();
-    }
-
-    funcs.moveToPreviousWord = () => {
-        CaretBrowsing.move('backward', 'word');
-    }
-
-    funcs.moveToStartOfLine = () => {
-        CaretBrowsing.move('left', 'lineboundary');
-    }
-
-    funcs.moveToEndOfLine = () => {
-        CaretBrowsing.move('right', 'lineboundary');
-    }
-
-    funcs.moveToStartOfNextBlock = () => {
-        CaretBrowsing.moveToBlock('forward', 'backward');
-    }
-
-    funcs.moveToStartOfPrevBlock = () => {
-        CaretBrowsing.moveToBlock('backward', 'backward');
-    }
-
-    funcs.moveToEndOfNextBlock = () => {
-        CaretBrowsing.moveToBlock('forward', 'forward');
-    }
-
-    funcs.moveToEndOfPrevBlock = () => {
-        CaretBrowsing.moveToBlock('backward', 'forward');
-    }
-
-    funcs.moveToStartOfDocument = () => {
-        CaretBrowsing.move('backward', 'documentboundary');
-    }
-
-    funcs.moveToEndOfDocument = () => {
-        CaretBrowsing.move('forward', 'documentboundary');
-    }
-
-    funcs.dropSelection = () => {
-        window.getSelection().removeAllRanges();
-    }
-
-    funcs.getSelection = () => {
-        return window.getSelection().toString();
-    }
-
-    funcs.toggleSelection = () => {
-        CaretBrowsing.selectionEnabled = !CaretBrowsing.selectionEnabled;
-    }
-
-    /**
-     * Called when the user presses the right arrow. If there's a selection,
-     * moves the cursor to the end of the selection range. If it's a cursor,
-     * moves past one character.
-     * @param {Event} evt The DOM event.
-     * @return {boolean} True if the default action should be performed.
-     */
-    CaretBrowsing.moveRight = function(evt) {
-        CaretBrowsing.targetX = null;
-
-        var sel = window.getSelection();
-        if (!evt.shiftKey && !CaretBrowsing.isCollapsed(sel)) {
-            var right = CaretBrowsing.makeRightCursor(sel);
-            CaretBrowsing.setAndValidateSelection(right, right);
-            return false;
-        }
-
-        var start = CaretBrowsing.isAmbiguous(sel) ?
-            CaretBrowsing.makeLeftCursor(sel) :
-            CaretBrowsing.makeAnchorCursor(sel);
-        var end = CaretBrowsing.isAmbiguous(sel) ?
-            CaretBrowsing.makeRightCursor(sel) :
-            CaretBrowsing.makeFocusCursor(sel);
-        var previousEnd = end.clone();
-        var nodesCrossed = [];
-        while (true) {
-            var result;
-            if (CaretBrowsing.isMoveByWordEvent(evt)) {
-                result = TraverseUtil.getNextWord(previousEnd, end, nodesCrossed);
-            } else {
-                previousEnd = end.clone();
-                result = CaretBrowsing.forwards(end, nodesCrossed);
-            }
-
-            if (result === null) {
-                return CaretBrowsing.moveLeft(evt);
-            }
-
-            if (CaretBrowsing.setAndValidateSelection(
-                evt.shiftKey ? start : end, end)) {
-                break;
-            }
-        }
-
-        if (!evt.shiftKey) {
-            nodesCrossed.push(end.node);
-            CaretBrowsing.setFocusToFirstFocusable(nodesCrossed);
-        }
-
-        return false;
-    };
-
-    /**
-     * Called when the user presses the left arrow. If there's a selection,
-     * moves the cursor to the start of the selection range. If it's a cursor,
-     * moves backwards past one character.
-     * @param {Event} evt The DOM event.
-     * @return {boolean} True if the default action should be performed.
-     */
-    CaretBrowsing.moveLeft = function(evt) {
-        CaretBrowsing.targetX = null;
-
-        var sel = window.getSelection();
-        if (!evt.shiftKey && !CaretBrowsing.isCollapsed(sel)) {
-            var left = CaretBrowsing.makeLeftCursor(sel);
-            CaretBrowsing.setAndValidateSelection(left, left);
-            return false;
-        }
-
-        var start = CaretBrowsing.isAmbiguous(sel) ?
-            CaretBrowsing.makeLeftCursor(sel) :
-            CaretBrowsing.makeFocusCursor(sel);
-        var end = CaretBrowsing.isAmbiguous(sel) ?
-            CaretBrowsing.makeRightCursor(sel) :
-            CaretBrowsing.makeAnchorCursor(sel);
-        var previousStart = start.clone();
-        var nodesCrossed = [];
-        while (true) {
-            var result;
-            if (CaretBrowsing.isMoveByWordEvent(evt)) {
-                result = TraverseUtil.getPreviousWord(
-                    start, previousStart, nodesCrossed);
-            } else {
-                previousStart = start.clone();
-                result = CaretBrowsing.backwards(start, nodesCrossed);
-            }
-
-            if (result === null) {
-                break;
-            }
-
-            if (CaretBrowsing.setAndValidateSelection(
-                evt.shiftKey ? end : start, start)) {
-                break;
-            }
-        }
-
-        if (!evt.shiftKey) {
-            nodesCrossed.push(start.node);
-            CaretBrowsing.setFocusToFirstFocusable(nodesCrossed);
-        }
-
-        return false;
-    };
-
-
-    /**
-     * Called when the user presses the down arrow. If there's a selection,
-     * moves the cursor to the end of the selection range. If it's a cursor,
-     * attempts to move to the equivalent horizontal pixel position in the
-     * subsequent line of text. If this is impossible, go to the first character
-     * of the next line.
-     * @param {Event} evt The DOM event.
-     * @return {boolean} True if the default action should be performed.
-     */
-    CaretBrowsing.moveDown = function(evt) {
-        var sel = window.getSelection();
-        if (!evt.shiftKey && !CaretBrowsing.isCollapsed(sel)) {
-            var right = CaretBrowsing.makeRightCursor(sel);
-            CaretBrowsing.setAndValidateSelection(right, right);
-            return false;
-        }
-
-        var start = CaretBrowsing.isAmbiguous(sel) ?
-            CaretBrowsing.makeLeftCursor(sel) :
-            CaretBrowsing.makeAnchorCursor(sel);
-        var end = CaretBrowsing.isAmbiguous(sel) ?
-            CaretBrowsing.makeRightCursor(sel) :
-            CaretBrowsing.makeFocusCursor(sel);
-        var endRect = CaretBrowsing.getCursorRect(end);
-        if (CaretBrowsing.targetX === null) {
-            CaretBrowsing.targetX = endRect.left;
-        }
-        var previousEnd = end.clone();
-        var leftPos = end.clone();
-        var rightPos = end.clone();
-        var bestPos = null;
-        var bestY = null;
-        var bestDelta = null;
-        var bestHeight = null;
-        var nodesCrossed = [];
-        var y = -1;
-        while (true) {
-            if (null === CaretBrowsing.forwards(rightPos, nodesCrossed)) {
-                if (CaretBrowsing.setAndValidateSelection(
-                    evt.shiftKey ? start : leftPos, leftPos)) {
-                    break;
-                } else {
-                    return CaretBrowsing.moveLeft(evt);
-                }
-                break;
-            }
-            var range = document.createRange();
-            range.setStart(leftPos.node, leftPos.index);
-            range.setEnd(rightPos.node, rightPos.index);
-            var rect = range.getBoundingClientRect();
-            if (rect && rect.width < rect.height) {
-                y = rect.top + window.pageYOffset;
-
-                // Return the best match so far if we get half a line past the best.
-                if (bestY != null && y > bestY + bestHeight / 2) {
-                    if (CaretBrowsing.setAndValidateSelection(
-                        evt.shiftKey ? start : bestPos, bestPos)) {
-                        break;
-                    } else {
-                        bestY = null;
-                    }
-                }
-
-                // Stop here if we're an entire line the wrong direction
-                // (for example, we reached the top of the next column).
-                if (y < endRect.top - endRect.height) {
-                    if (CaretBrowsing.setAndValidateSelection(
-                        evt.shiftKey ? start : leftPos, leftPos)) {
-                        break;
-                    }
-                }
-
-                // Otherwise look to see if this current position is on the
-                // next line and better than the previous best match, if any.
-                if (y >= endRect.top + endRect.height) {
-                    var deltaLeft = Math.abs(CaretBrowsing.targetX - rect.left);
-                    if ((bestDelta == null || deltaLeft < bestDelta) &&
-                        (leftPos.node != end.node || leftPos.index != end.index)) {
-                        bestPos = leftPos.clone();
-                        bestY = y;
-                        bestDelta = deltaLeft;
-                        bestHeight = rect.height;
-                    }
-                    var deltaRight = Math.abs(CaretBrowsing.targetX - rect.right);
-                    if (bestDelta == null || deltaRight < bestDelta) {
-                        bestPos = rightPos.clone();
-                        bestY = y;
-                        bestDelta = deltaRight;
-                        bestHeight = rect.height;
-                    }
-
-                    // Return the best match so far if the deltas are getting worse,
-                    // not better.
-                    if (bestDelta != null &&
-                        deltaLeft > bestDelta &&
-                        deltaRight > bestDelta) {
-                        if (CaretBrowsing.setAndValidateSelection(
-                            evt.shiftKey ? start : bestPos, bestPos)) {
-                            break;
-                        } else {
-                            bestY = null;
-                        }
-                    }
-                }
-            }
-            leftPos = rightPos.clone();
-        }
-
-        if (!evt.shiftKey) {
-            CaretBrowsing.setFocusToNode(leftPos.node);
-        }
-
-        return false;
-    };
-
-    /**
-     * Called when the user presses the up arrow. If there's a selection,
-     * moves the cursor to the start of the selection range. If it's a cursor,
-     * attempts to move to the equivalent horizontal pixel position in the
-     * previous line of text. If this is impossible, go to the last character
-     * of the previous line.
-     * @param {Event} evt The DOM event.
-     * @return {boolean} True if the default action should be performed.
-     */
-    CaretBrowsing.moveUp = function(evt) {
-        var sel = window.getSelection();
-        if (!evt.shiftKey && !CaretBrowsing.isCollapsed(sel)) {
-            var left = CaretBrowsing.makeLeftCursor(sel);
-            CaretBrowsing.setAndValidateSelection(left, left);
-            return false;
-        }
-
-        var start = CaretBrowsing.isAmbiguous(sel) ?
-            CaretBrowsing.makeLeftCursor(sel) :
-            CaretBrowsing.makeFocusCursor(sel);
-        var end = CaretBrowsing.isAmbiguous(sel) ?
-            CaretBrowsing.makeRightCursor(sel) :
-            CaretBrowsing.makeAnchorCursor(sel);
-        var startRect = CaretBrowsing.getCursorRect(start);
-        if (CaretBrowsing.targetX === null) {
-            CaretBrowsing.targetX = startRect.left;
-        }
-        var previousStart = start.clone();
-        var leftPos = start.clone();
-        var rightPos = start.clone();
-        var bestPos = null;
-        var bestY = null;
-        var bestDelta = null;
-        var bestHeight = null;
-        var nodesCrossed = [];
-        var y = 999999;
-        while (true) {
-            if (null === CaretBrowsing.backwards(leftPos, nodesCrossed)) {
-                CaretBrowsing.setAndValidateSelection(
-                    evt.shiftKey ? end : rightPos, rightPos);
-                break;
-            }
-            var range = document.createRange();
-            range.setStart(leftPos.node, leftPos.index);
-            range.setEnd(rightPos.node, rightPos.index);
-            var rect = range.getBoundingClientRect();
-            if (rect && rect.width < rect.height) {
-                y = rect.top + window.pageYOffset;
-
-                // Return the best match so far if we get half a line past the best.
-                if (bestY != null && y < bestY - bestHeight / 2) {
-                    if (CaretBrowsing.setAndValidateSelection(
-                        evt.shiftKey ? end : bestPos, bestPos)) {
-                        break;
-                    } else {
-                        bestY = null;
-                    }
-                }
-
-                // Exit if we're an entire line the wrong direction
-                // (for example, we reached the bottom of the previous column.)
-                if (y > startRect.top + startRect.height) {
-                    if (CaretBrowsing.setAndValidateSelection(
-                        evt.shiftKey ? end : rightPos, rightPos)) {
-                        break;
-                    }
-                }
-
-                // Otherwise look to see if this current position is on the
-                // next line and better than the previous best match, if any.
-                if (y <= startRect.top - startRect.height) {
-                    var deltaLeft = Math.abs(CaretBrowsing.targetX - rect.left);
-                    if (bestDelta == null || deltaLeft < bestDelta) {
-                        bestPos = leftPos.clone();
-                        bestY = y;
-                        bestDelta = deltaLeft;
-                        bestHeight = rect.height;
-                    }
-                    var deltaRight = Math.abs(CaretBrowsing.targetX - rect.right);
-                    if ((bestDelta == null || deltaRight < bestDelta) &&
-                        (rightPos.node != start.node || rightPos.index != start.index)) {
-                        bestPos = rightPos.clone();
-                        bestY = y;
-                        bestDelta = deltaRight;
-                        bestHeight = rect.height;
-                    }
-
-                    // Return the best match so far if the deltas are getting worse,
-                    // not better.
-                    if (bestDelta != null &&
-                        deltaLeft > bestDelta &&
-                        deltaRight > bestDelta) {
-                        if (CaretBrowsing.setAndValidateSelection(
-                            evt.shiftKey ? end : bestPos, bestPos)) {
-                            break;
-                        } else {
-                            bestY = null;
-                        }
-                    }
-                }
-            }
-            rightPos = leftPos.clone();
-        }
-
-        if (!evt.shiftKey) {
-            CaretBrowsing.setFocusToNode(rightPos.node);
-        }
-
-        return false;
-    };
-
-    /**
-     * Set the document's selection to surround a control, so that the next
-     * arrow key they press will allow them to explore the content before
-     * or after a given control.
-     * @param {Node} control The control to escape from.
-     */
-    CaretBrowsing.escapeFromControl = function(control) {
-        control.blur();
-
-        var start = new Cursor(control, 0, '');
-        var previousStart = start.clone();
-        var end = new Cursor(control, 0, '');
-        var previousEnd = end.clone();
-
-        var nodesCrossed = [];
-        while (true) {
-            if (null === CaretBrowsing.backwards(start, nodesCrossed)) {
-                break;
-            }
-
-            var r = document.createRange();
-            r.setStart(start.node, start.index);
-            r.setEnd(previousStart.node, previousStart.index);
-            if (r.getBoundingClientRect()) {
-                break;
-            }
-            previousStart = start.clone();
-        }
-        while (true) {
-            if (null === CaretBrowsing.forwards(end, nodesCrossed)) {
-                break;
-            }
-            if (isDescendantOfNode(end.node, control)) {
-                previousEnd = end.clone();
-                continue;
-            }
-
-            var r = document.createRange();
-            r.setStart(previousEnd.node, previousEnd.index);
-            r.setEnd(end.node, end.index);
-            if (r.getBoundingClientRect()) {
-                break;
-            }
-        }
-
-        if (!isDescendantOfNode(previousStart.node, control)) {
-            start = previousStart.clone();
-        }
-
-        if (!isDescendantOfNode(previousEnd.node, control)) {
-            end = previousEnd.clone();
-        }
-
-        CaretBrowsing.setAndValidateSelection(start, end);
-
-        window.setTimeout(function() {
-            CaretBrowsing.updateCaretOrSelection(true);
-        }, 0);
-    };
-
     /**
      * Toggle whether caret browsing is enabled or not.
      */
@@ -2163,70 +962,6 @@ window._qutebrowser.caret = (function() {
         CaretBrowsing.updateIsCaretVisible();
     };
 
-    /**
-     * Event handler, called when a key is pressed.
-     * @param {Event} evt The DOM event.
-     * @return {boolean} True if the default action should be performed.
-     */
-    CaretBrowsing.onKeyDown = function(evt) {
-        if (!CaretBrowsing.isEnabled) {
-            return true;
-        }
-
-        evt.shiftKey = CaretBrowsing.selectionEnabled;
-        if (evt.target && CaretBrowsing.isControlThatNeedsArrowKeys(
-            /** @type (Node) */(evt.target))) {
-            if (evt.keyCode == 27) {
-                CaretBrowsing.escapeFromControl(/** @type {Node} */(evt.target));
-                return false;
-            } else {
-                return true;
-            }
-        }
-
-        // If the current selection doesn't have a range, try to escape out of
-        // the current control. If that fails, return so we don't fail whe
-        // trying to move the cursor or selection.
-        var sel = window.getSelection();
-        if (sel.rangeCount == 0) {
-            if (document.activeElement) {
-                CaretBrowsing.escapeFromControl(document.activeElement);
-                sel = window.getSelection();
-            }
-
-            if (sel.rangeCount == 0) {
-                return true;
-            }
-        }
-
-        if (CaretBrowsing.caretElement) {
-            CaretBrowsing.caretElement.style.visibility = 'visible';
-            CaretBrowsing.blinkFlag = true;
-        }
-
-        var result = true;
-        switch (evt.keyCode) {
-            case 37:
-                result = CaretBrowsing.moveLeft(evt);
-                break;
-            case 38:
-                result = CaretBrowsing.moveUp(evt);
-                break;
-            case 39:
-                result = CaretBrowsing.moveRight(evt);
-                break;
-            case 40:
-                result = CaretBrowsing.moveDown(evt);
-                break;
-        }
-
-        window.setTimeout(function() {
-            CaretBrowsing.updateCaretOrSelection(result == false);
-        }, 0);
-
-        return result;
-    };
-
     /**
      * Event handler, called when the mouse is clicked. Chrome already
      * sets the selection when the mouse is clicked, all we need to do is
@@ -2314,7 +1049,6 @@ window._qutebrowser.caret = (function() {
     CaretBrowsing.init = function() {
         CaretBrowsing.isWindowFocused = document.hasFocus();
 
-        // document.addEventListener('keydown', CaretBrowsing.onKeyDown, false);
         document.addEventListener('click', CaretBrowsing.onClick, false);
         window.addEventListener('focus', CaretBrowsing.onWindowFocus, false);
         window.addEventListener('blur', CaretBrowsing.onWindowBlur, false);
@@ -2340,13 +1074,13 @@ window._qutebrowser.caret = (function() {
     function isElementInViewport(node) {  // eslint-disable-line complexity
         let i;
         let boundingRect = (node.getClientRects()[0] ||
-                            node.getBoundingClientRect());
+            node.getBoundingClientRect());
 
         if (boundingRect.width <= 1 && boundingRect.height <= 1) {
             const rects = node.getClientRects();
             for (i = 0; i < rects.length; i++) {
                 if (rects[i].width > rects[0].height &&
-                        rects[i].height > rects[0].height) {
+                    rects[i].height > rects[0].height) {
                     boundingRect = rects[i];
                 }
             }
@@ -2362,7 +1096,7 @@ window._qutebrowser.caret = (function() {
             let visibleChildNode = false;
             for (i = 0; i < children.length; ++i) {
                 boundingRect = (children[i].getClientRects()[0] ||
-                                children[i].getBoundingClientRect());
+                    children[i].getBoundingClientRect());
                 if (boundingRect.width > 1 && boundingRect.height > 1) {
                     visibleChildNode = true;
                     break;
@@ -2373,20 +1107,157 @@ window._qutebrowser.caret = (function() {
             }
         }
         if (boundingRect.top + boundingRect.height < 10 ||
-                boundingRect.left + boundingRect.width < -10) {
+            boundingRect.left + boundingRect.width < -10) {
             return null;
         }
         const computedStyle = window.getComputedStyle(node, null);
         if (computedStyle.visibility !== "visible" ||
-                computedStyle.display === "none" ||
-                node.hasAttribute("disabled") ||
-                parseInt(computedStyle.width, 10) === 0 ||
-                parseInt(computedStyle.height, 10) === 0) {
+            computedStyle.display === "none" ||
+            node.hasAttribute("disabled") ||
+            parseInt(computedStyle.width, 10) === 0 ||
+            parseInt(computedStyle.height, 10) === 0) {
             return null;
         }
         return boundingRect.top >= -20;
     }
 
+    function positionCaret() {
+        const walker = document.createTreeWalker(document.body, -1);
+        let node;
+        const textNodes = [];
+        let el;
+        while ((node = walker.nextNode())) {
+            if (node.nodeType === 3 && node.nodeValue.trim() !== "") {
+                textNodes.push(node);
+            }
+        }
+        for (let i = 0; i < textNodes.length; i++) {
+            const element = textNodes[i].parentElement;
+            if (isElementInViewport(element)) {
+                el = element;
+                break;
+            }
+        }
+        if (el !== undefined) {
+            var start = new Cursor(el, 0, '');
+            var end = new Cursor(el, 0, '');
+            var nodesCrossed = [];
+            var result = TraverseUtil.getNextChar(start, end, nodesCrossed, true);
+            if (result == null) {
+                return;
+            }
+            CaretBrowsing.setAndValidateSelection(start, start);
+        }
+    }
+
+    function isFocusable(targetNode) {
+        if (!targetNode || typeof(targetNode.tabIndex) != 'number') {
+            return false;
+        }
+
+        if (targetNode.tabIndex >= 0) {
+            return true;
+        }
+
+        if (targetNode.hasAttribute &&
+            targetNode.hasAttribute('tabindex') &&
+            targetNode.getAttribute('tabindex') == '-1') {
+            return true;
+        }
+
+        return false;
+    }
+
+    const funcs = {};
+
+    funcs.setInitialCursor = () => {
+        if (!CaretBrowsing.initiated) {
+            CaretBrowsing.setInitialCursor();
+        } else {
+            if (!window.getSelection().toString()) {
+                positionCaret();
+            }
+            CaretBrowsing.toggle();
+        }
+    }
+
+    funcs.toggle = () => {
+        CaretBrowsing.toggle();
+    }
+
+    funcs.moveRight = () => {
+        CaretBrowsing.move('right', 'character');
+    }
+
+    funcs.moveLeft = () => {
+        CaretBrowsing.move('left', 'character');
+    }
+
+    funcs.moveDown = () => {
+        CaretBrowsing.move('forward', 'line');
+    }
+
+    funcs.moveUp = () => {
+        CaretBrowsing.move('backward', 'line');
+    }
+
+    funcs.moveToEndOfWord = () => {
+        funcs.moveToNextWord();
+        funcs.moveLeft();
+    }
+
+    funcs.moveToNextWord = () => {
+        CaretBrowsing.move('forward', 'word');
+        funcs.moveRight();
+    }
+
+    funcs.moveToPreviousWord = () => {
+        CaretBrowsing.move('backward', 'word');
+    }
+
+    funcs.moveToStartOfLine = () => {
+        CaretBrowsing.move('left', 'lineboundary');
+    }
+
+    funcs.moveToEndOfLine = () => {
+        CaretBrowsing.move('right', 'lineboundary');
+    }
+
+    funcs.moveToStartOfNextBlock = () => {
+        CaretBrowsing.moveToBlock('forward', 'backward');
+    }
+
+    funcs.moveToStartOfPrevBlock = () => {
+        CaretBrowsing.moveToBlock('backward', 'backward');
+    }
+
+    funcs.moveToEndOfNextBlock = () => {
+        CaretBrowsing.moveToBlock('forward', 'forward');
+    }
+
+    funcs.moveToEndOfPrevBlock = () => {
+        CaretBrowsing.moveToBlock('backward', 'forward');
+    }
+
+    funcs.moveToStartOfDocument = () => {
+        CaretBrowsing.move('backward', 'documentboundary');
+    }
+
+    funcs.moveToEndOfDocument = () => {
+        CaretBrowsing.move('forward', 'documentboundary');
+    }
+
+    funcs.dropSelection = () => {
+        window.getSelection().removeAllRanges();
+    }
+
+    funcs.getSelection = () => {
+        return window.getSelection().toString();
+    }
+
+    funcs.toggleSelection = () => {
+        CaretBrowsing.selectionEnabled = !CaretBrowsing.selectionEnabled;
+    }
 
     return funcs;
 })();

From 4eda328a61713d4a6d9c52fa5c3e272596669c2e Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 30 Nov 2017 20:38:38 +0600
Subject: [PATCH 010/574] Fix some lint warnings. Enable caret tests

---
 qutebrowser/browser/browsertab.py             |  2 +-
 qutebrowser/browser/commands.py               | 21 +++++-----
 qutebrowser/browser/webengine/webenginetab.py | 41 ++++++++++---------
 qutebrowser/javascript/webengine_caret.js     |  3 +-
 tests/end2end/features/test_caret_bdd.py      |  5 ---
 5 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 827d11761..1498097b1 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -392,7 +392,7 @@ class AbstractCaret(QObject):
     def has_selection(self):
         raise NotImplementedError
 
-    def selection(self, html=False, selection=None):
+    def selection(self, html=False, callback=None):
         raise NotImplementedError
 
     def follow_selected(self, *, tab=False):
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 5a0108b1b..476bf1693 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -839,9 +839,9 @@ class CommandDispatcher:
             keep: Stay in visual mode after yanking the selection.
         """
         self.yank_object = {
-                'sel': sel,
-                'what': what,
-                'keep': keep
+            'sel': sel,
+            'what': what,
+            'keep': keep
         }
         if what == 'title':
             s = self._tabbed_browser.page_title(self._current_index())
@@ -877,7 +877,8 @@ class CommandDispatcher:
 
         utils.set_clipboard(s, selection=self.yank_object['sel'])
         if self.yank_object['what'] != 'selection':
-            message.info("Yanked {} to {}: {}".format(self.yank_object['what'], target, s))
+            message.info("Yanked {} to {}: {}".format(
+                self.yank_object['what'], target, s))
         else:
             message.info("{} {} yanked to {}".format(
                 len(s), "char" if len(s) == 1 else "chars", target))
@@ -1222,9 +1223,9 @@ class CommandDispatcher:
             # until it fixed or blocked async call implemented:
             # https://github.com/qutebrowser/qutebrowser/issues/3327
             self.userscript_object = {
-                    'cmd': cmd,
-                    'args': args,
-                    'verbose': verbose
+                'cmd': cmd,
+                'args': args,
+                'verbose': verbose
             }
             caret = self._current_widget().caret
             caret.selection(False, self._selection_callback)
@@ -1279,9 +1280,9 @@ class CommandDispatcher:
             env['QUTE_URL'] = url.toString(QUrl.FullyEncoded)
 
         try:
-            userscripts.run_async(tab, self.userscript_object['cmd'], 
-                    *self.userscript_object['args'], win_id=self._win_id, 
-                    env=env, verbose=self.userscript_object['verbose'])
+            userscripts.run_async(tab, self.userscript_object['cmd'],
+                *self.userscript_object['args'], win_id=self._win_id,
+                env=env, verbose=self.userscript_object['verbose'])
         except userscripts.Error as e:
             raise cmdexc.CommandError(e)
         finally:
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 243a711e0..8f71d5b1c 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -180,91 +180,91 @@ class WebEngineCaret(browsertab.AbstractCaret):
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_entered(self, mode):
         self._tab.run_js_async(
-                javascript.assemble('caret', 'setInitialCursor'))
+            javascript.assemble('caret', 'setInitialCursor'))
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_left(self):
         self._tab.run_js_async(
-                javascript.assemble('caret', 'toggle'))
+            javascript.assemble('caret', 'toggle'))
 
     def move_to_next_line(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveDown'))
+                javascript.assemble('caret', 'moveDown'))
 
     def move_to_prev_line(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveUp'))
+                javascript.assemble('caret', 'moveUp'))
 
     def move_to_next_char(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveRight'))
+                javascript.assemble('caret', 'moveRight'))
 
     def move_to_prev_char(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveLeft'))
+                javascript.assemble('caret', 'moveLeft'))
 
     def move_to_end_of_word(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveToEndOfWord'))
+                javascript.assemble('caret', 'moveToEndOfWord'))
 
     def move_to_next_word(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveToNextWord'))
+                javascript.assemble('caret', 'moveToNextWord'))
 
     def move_to_prev_word(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveToPreviousWord'))
+                javascript.assemble('caret', 'moveToPreviousWord'))
 
     def move_to_start_of_line(self):
         self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToStartOfLine'))
+            javascript.assemble('caret', 'moveToStartOfLine'))
 
     def move_to_end_of_line(self):
         self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToEndOfLine'))
+            javascript.assemble('caret', 'moveToEndOfLine'))
 
     def move_to_start_of_next_block(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveToStartOfNextBlock'))
+                javascript.assemble('caret', 'moveToStartOfNextBlock'))
 
     def move_to_start_of_prev_block(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveToStartOfPrevBlock'))
+                javascript.assemble('caret', 'moveToStartOfPrevBlock'))
 
     def move_to_end_of_next_block(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveToEndOfNextBlock'))
+                javascript.assemble('caret', 'moveToEndOfNextBlock'))
 
     def move_to_end_of_prev_block(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveToEndOfPrevBlock'))
+                javascript.assemble('caret', 'moveToEndOfPrevBlock'))
 
     def move_to_start_of_document(self):
         self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToStartOfDocument'))
+            javascript.assemble('caret', 'moveToStartOfDocument'))
 
     def move_to_end_of_document(self):
         self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToEndOfDocument'))
+            javascript.assemble('caret', 'moveToEndOfDocument'))
 
     def toggle_selection(self):
         self._tab.run_js_async(
-                javascript.assemble('caret', 'toggleSelection'))
+            javascript.assemble('caret', 'toggleSelection'))
 
     def drop_selection(self):
         self._tab.run_js_async(
-                javascript.assemble('caret', 'dropSelection'))
+            javascript.assemble('caret', 'dropSelection'))
 
     def has_selection(self):
         if qtutils.version_check('5.10'):
@@ -283,7 +283,7 @@ class WebEngineCaret(browsertab.AbstractCaret):
             # WORKAROUND for
             # https://bugreports.qt.io/browse/QTBUG-53134
             self._tab.run_js_async(
-                    'window.getSelection().toString()', callback)
+                'window.getSelection().toString()', callback)
             self.drop_selection()
 
     def _follow_selected_cb(self, js_elem, tab=False):
@@ -328,6 +328,7 @@ class WebEngineCaret(browsertab.AbstractCaret):
             self._tab.run_js_async(js_code, lambda jsret:
                                    self._follow_selected_cb(jsret, tab))
 
+
 class WebEngineScroller(browsertab.AbstractScroller):
 
     """QtWebEngine implementations related to scrolling."""
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 4510b13f3..8390174a5 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1,8 +1,7 @@
 "use strict";
 
 window._qutebrowser.caret = (function() {
-
-    var axs = {};
+    const axs = {};
 
     axs.dom = {};
 
diff --git a/tests/end2end/features/test_caret_bdd.py b/tests/end2end/features/test_caret_bdd.py
index 9e4e1dedd..97b18434b 100644
--- a/tests/end2end/features/test_caret_bdd.py
+++ b/tests/end2end/features/test_caret_bdd.py
@@ -23,9 +23,4 @@ import pytest_bdd as bdd
 # pylint: disable=unused-import
 from end2end.features.test_yankpaste_bdd import init_fake_clipboard
 
-
-pytestmark = pytest.mark.qtwebengine_todo("Caret mode is not implemented",
-                                          run=False)
-
-
 bdd.scenarios('caret.feature')

From ed1d036077a9d86f901ae3b5253d16feab76352c Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Wed, 6 Dec 2017 12:11:06 +0600
Subject: [PATCH 011/574] Fix eslint warnings

used some eslint ignore comments
---
 qutebrowser/javascript/webengine_caret.js | 2047 ++++++++++-----------
 1 file changed, 926 insertions(+), 1121 deletions(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 8390174a5..e6f71d44f 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1,1075 +1,6 @@
-"use strict";
-
-window._qutebrowser.caret = (function() {
-    const axs = {};
-
-    axs.dom = {};
-
-    axs.color = {};
-
-    axs.utils = {};
-
-    axs.dom.parentElement = function(a) {
-        if (!a) {
-            return null;
-        }
-        a = axs.dom.composedParentNode(a);
-        if (!a) {
-            return null;
-        }
-        switch(a.nodeType) {
-            case Node.ELEMENT_NODE:
-                return a;
-            default:
-                return axs.dom.parentElement(a);
-        }
-    };
-
-    axs.dom.shadowHost = function(a) {
-        return "host" in a ? a.host : null;
-    };
-
-    axs.dom.composedParentNode = function(a) {
-        if (!a) {
-            return null;
-        }
-        if (a.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
-            return axs.dom.shadowHost(a);
-        }
-        var b = a.parentNode;
-        if (!b) {
-            return null;
-        }
-        if (b.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
-            return axs.dom.shadowHost(b);
-        }
-        if (!b.shadowRoot) {
-            return b;
-        }
-        a = a.getDestinationInsertionPoints();
-        return 0 < a.length ? axs.dom.composedParentNode(a[a.length - 1]) : null;
-    };
-
-    axs.color.Color = function(a, b, c, d) {
-        this.red = a;
-        this.green = b;
-        this.blue = c;
-        this.alpha = d;
-    };
-
-    axs.color.parseColor = function(a) {
-        if ("transparent" === a) {
-            return new axs.color.Color(0, 0, 0, 0);
-        }
-        var b = a.match(/^rgb\((\d+), (\d+), (\d+)\)$/);
-        if (b) {
-            a = parseInt(b[1], 10);
-            var c = parseInt(b[2], 10), d = parseInt(b[3], 10);
-            return new axs.color.Color(a, c, d, 1);
-        }
-        return (b = a.match(/^rgba\((\d+), (\d+), (\d+), (\d*(\.\d+)?)\)/)) ? (a = parseInt(b[1], 10), c = parseInt(b[2], 10), d = parseInt(b[3], 10), b = parseFloat(b[4]), new axs.color.Color(a, c, d, b)) : null;
-    };
-
-    axs.color.flattenColors = function(a, b) {
-        var c = a.alpha;
-        return new axs.color.Color((1 - c) * b.red + c * a.red, (1 - c) * b.green + c * a.green, (1 - c) * b.blue + c * a.blue, a.alpha + b.alpha * (1 - a.alpha));
-    };
-
-    axs.utils.getParentBgColor = function(a) {
-        var b = a;
-        a = [];
-        for (var c = null;b = axs.dom.parentElement(b);) {
-            var d = window.getComputedStyle(b, null);
-            if (d) {
-                var e = axs.color.parseColor(d.backgroundColor);
-                if (e && (1 > d.opacity && (e.alpha *= d.opacity), 0 != e.alpha && (a.push(e), 1 == e.alpha))) {
-                    c = !0;
-                    break;
-                }
-            }
-        }
-        c || a.push(new axs.color.Color(255, 255, 255, 1));
-        for (b = a.pop();a.length;) {
-            c = a.pop(), b = axs.color.flattenColors(c, b);
-        }
-        return b;
-    };
-
-    axs.utils.getFgColor = function(a, b, c) {
-        var d = axs.color.parseColor(a.color);
-        if (!d) {
-            return null;
-        }
-        1 > d.alpha && (d = axs.color.flattenColors(d, c));
-        1 > a.opacity && (b = axs.utils.getParentBgColor(b), d.alpha *= a.opacity, d = axs.color.flattenColors(d, b));
-        return d;
-    };
-
-    axs.utils.getBgColor = function(a, b) {
-        var c = axs.color.parseColor(a.backgroundColor);
-        if (!c) {
-            return null;
-        }
-        1 > a.opacity && (c.alpha *= a.opacity);
-        if (1 > c.alpha) {
-            var d = axs.utils.getParentBgColor(b);
-            if (null == d) {
-                return null;
-            }
-            c = axs.color.flattenColors(c, d);
-        }
-        return c;
-    };
-
-    axs.color.colorChannelToString = function(a) {
-        a = Math.round(a);
-        return 15 >= a ? "0" + a.toString(16) : a.toString(16);
-    };
-
-    axs.color.colorToString = function(a) {
-        return 1 == a.alpha ? "#" + axs.color.colorChannelToString(a.red) + axs.color.colorChannelToString(a.green) + axs.color.colorChannelToString(a.blue) : "rgba(" + [a.red, a.green, a.blue, a.alpha].join() + ")";
-    };
-
-    var Cursor = function(node, index, text) {
-        this.node = node;
-        this.index = index;
-        this.text = text;
-    };
-
-    /**
-     * @return {Cursor} A new cursor pointing to the same location.
-     */
-    Cursor.prototype.clone = function() {
-        return new Cursor(this.node, this.index, this.text);
-    };
-
-    /**
-     * Modify this cursor to point to the location that another cursor points to.
-     * @param {Cursor} otherCursor The cursor to copy from.
-     */
-    Cursor.prototype.copyFrom = function(otherCursor) {
-        this.node = otherCursor.node;
-        this.index = otherCursor.index;
-        this.text = otherCursor.text;
-    };
-
-    var TraverseUtil = function() {};
-
-    TraverseUtil.getNodeText = function(node) {
-        if (node.constructor == Text) {
-            return node.data;
-        } else {
-            return '';
-        }
-    };
-
-    /**
-     * Return true if a node should be treated as a leaf node, because
-     * its children are properties of the object that shouldn't be traversed.
-     *
-     * TODO(dmazzoni): replace this with a predicate that detects nodes with
-     * ARIA roles and other objects that have their own description.
-     * For now we just detect a couple of common cases.
-     *
-     * @param {Node} node A DOM node.
-     * @return {boolean} True if the node should be treated as a leaf node.
-     */
-    TraverseUtil.treatAsLeafNode = function(node) {
-        return node.childNodes.length == 0 ||
-            node.nodeName == 'SELECT' ||
-            node.nodeName == 'OBJECT';
-    };
-
-    /**
-     * Return true only if a single character is whitespace.
-     * From https://developer.mozilla.org/en/Whitespace_in_the_DOM,
-     * whitespace is defined as one of the characters
-     *  "\t" TAB \u0009
-     *  "\n" LF  \u000A
-     *  "\r" CR  \u000D
-     *  " "  SPC \u0020.
-     *
-     * @param {string} c A string containing a single character.
-     * @return {boolean} True if the character is whitespace, otherwise false.
-     */
-    TraverseUtil.isWhitespace = function(c) {
-        return (c == ' ' || c == '\n' || c == '\r' || c == '\t');
-    };
-
-    /**
-     * Use the computed CSS style to figure out if this DOM node is currently
-     * visible.
-     * @param {Node} node A HTML DOM node.
-     * @return {boolean} Whether or not the html node is visible.
-     */
-    TraverseUtil.isVisible = function(node) {
-        if (!node.style)
-            return true;
-        var style = window.getComputedStyle(/** @type {Element} */(node), null);
-        return (!!style && style.display != 'none' && style.visibility != 'hidden');
-    };
-
-    /**
-     * Use the class name to figure out if this DOM node should be traversed.
-     * @param {Node} node A HTML DOM node.
-     * @return {boolean} Whether or not the html node should be traversed.
-     */
-    TraverseUtil.isSkipped = function(node) {
-        if (node.constructor == Text)
-            node = node.parentElement;
-        if (node.className == 'CaretBrowsing_Caret' ||
-            node.className == 'CaretBrowsing_AnimateCaret') {
-            return true;
-        }
-        return false;
-    };
-
-    /**
-     * Moves the cursor forwards until it has crossed exactly one character.
-     * @param {Cursor} cursor The cursor location where the search should start.
-     *     On exit, the cursor will be immediately to the right of the
-     *     character returned.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @return {?string} The character found, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.forwardsChar = function(cursor, nodesCrossed) {
-        while (true) {
-            // Move down until we get to a leaf node.
-            var childNode = null;
-            if (!TraverseUtil.treatAsLeafNode(cursor.node)) {
-                for (var i = cursor.index; i < cursor.node.childNodes.length; i++) {
-                    var node = cursor.node.childNodes[i];
-                    if (TraverseUtil.isSkipped(node)) {
-                        nodesCrossed.push(node);
-                        continue;
-                    }
-                    if (TraverseUtil.isVisible(node)) {
-                        childNode = node;
-                        break;
-                    }
-                }
-            }
-            if (childNode) {
-                cursor.node = childNode;
-                cursor.index = 0;
-                cursor.text = TraverseUtil.getNodeText(cursor.node);
-                if (cursor.node.constructor != Text) {
-                    nodesCrossed.push(cursor.node);
-                }
-                continue;
-            }
-
-            // Return the next character from this leaf node.
-            if (cursor.index < cursor.text.length)
-                return cursor.text[cursor.index++];
-
-            // Move to the next sibling, going up the tree as necessary.
-            while (cursor.node != null) {
-                // Try to move to the next sibling.
-                var siblingNode = null;
-                for (var node = cursor.node.nextSibling;
-                    node != null;
-                    node = node.nextSibling) {
-                    if (TraverseUtil.isSkipped(node)) {
-                        nodesCrossed.push(node);
-                        continue;
-                    }
-                    if (TraverseUtil.isVisible(node)) {
-                        siblingNode = node;
-                        break;
-                    }
-                }
-                if (siblingNode) {
-                    cursor.node = siblingNode;
-                    cursor.text = TraverseUtil.getNodeText(siblingNode);
-                    cursor.index = 0;
-
-                    if (cursor.node.constructor != Text) {
-                        nodesCrossed.push(cursor.node);
-                    }
-
-                    break;
-                }
-
-                // Otherwise, move to the parent.
-                if (cursor.node.parentNode &&
-                    cursor.node.parentNode.constructor != HTMLBodyElement) {
-                    cursor.node = cursor.node.parentNode;
-                    cursor.text = null;
-                    cursor.index = 0;
-                } else {
-                    return null;
-                }
-            }
-        }
-    };
-
-    /**
-     * Finds the next character, starting from endCursor.  Upon exit, startCursor
-     * and endCursor will surround the next character. If skipWhitespace is
-     * true, will skip until a real character is found. Otherwise, it will
-     * attempt to select all of the whitespace between the initial position
-     * of endCursor and the next non-whitespace character.
-     * @param {Cursor} startCursor On exit, points to the position before
-     *     the char.
-     * @param {Cursor} endCursor The position to start searching for the next
-     *     char.  On exit, will point to the position past the char.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @param {boolean} skipWhitespace If true, will keep scanning until a
-     *     non-whitespace character is found.
-     * @return {?string} The next char, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.getNextChar = function(
-        startCursor, endCursor, nodesCrossed, skipWhitespace) {
-
-        // Save the starting position and get the first character.
-        startCursor.copyFrom(endCursor);
-        var c = TraverseUtil.forwardsChar(endCursor, nodesCrossed);
-        if (c == null)
-        return null;
-
-        // Keep track of whether the first character was whitespace.
-        var initialWhitespace = TraverseUtil.isWhitespace(c);
-
-        // Keep scanning until we find a non-whitespace or non-skipped character.
-        while ((TraverseUtil.isWhitespace(c)) ||
-            (TraverseUtil.isSkipped(endCursor.node))) {
-            c = TraverseUtil.forwardsChar(endCursor, nodesCrossed);
-            if (c == null)
-            return null;
-        }
-        if (skipWhitespace || !initialWhitespace) {
-            // If skipWhitepace is true, or if the first character we encountered
-            // was not whitespace, return that non-whitespace character.
-            startCursor.copyFrom(endCursor);
-            startCursor.index--;
-            return c;
-        }
-        else {
-            for (var i = 0; i < nodesCrossed.length; i++) {
-                if (TraverseUtil.isSkipped(nodesCrossed[i])) {
-                    // We need to make sure that startCursor and endCursor aren't
-                    // surrounding a skippable node.
-                    endCursor.index--;
-                    startCursor.copyFrom(endCursor);
-                    startCursor.index--;
-                    return ' ';
-                }
-            }
-            // Otherwise, return all of the whitespace before that last character.
-            endCursor.index--;
-            return ' ';
-        }
-    };
-
-    var CaretBrowsing = function() {};
-
-    /**
-     * Is caret browsing enabled?
-     * @type {boolean}
-     */
-    CaretBrowsing.isEnabled = false;
-
-    /**
-     * Keep it enabled even when flipped off (for the options page)?
-     * @type {boolean}
-     */
-    CaretBrowsing.forceEnabled = false;
-
-    /**
-     * What to do when the caret appears?
-     * @type {string}
-     */
-    CaretBrowsing.onEnable;
-
-    /**
-     * What to do when the caret jumps?
-     * @type {string}
-     */
-    CaretBrowsing.onJump;
-
-    /**
-     * Is this window / iframe focused? We won't show the caret if not,
-     * especially so that carets aren't shown in two iframes of the same
-     * tab.
-     * @type {boolean}
-     */
-    CaretBrowsing.isWindowFocused = false;
-
-    /**
-     * Is the caret actually visible? This is true only if isEnabled and
-     * isWindowFocused are both true.
-     * @type {boolean}
-     */
-    CaretBrowsing.isCaretVisible = false;
-
-    /**
-     * The actual caret element, an absolute-positioned flashing line.
-     * @type {Element}
-     */
-    CaretBrowsing.caretElement;
-
-    /**
-     * The x-position of the caret, in absolute pixels.
-     * @type {number}
-     */
-    CaretBrowsing.caretX = 0;
-
-    /**
-     * The y-position of the caret, in absolute pixels.
-     * @type {number}
-     */
-    CaretBrowsing.caretY = 0;
-
-    /**
-     * The width of the caret in pixels.
-     * @type {number}
-     */
-    CaretBrowsing.caretWidth = 0;
-
-    /**
-     * The height of the caret in pixels.
-     * @type {number}
-     */
-    CaretBrowsing.caretHeight = 0;
-
-    /**
-     * The foregroundc color.
-     * @type {string}
-     */
-    CaretBrowsing.caretForeground = '#000';
-
-    /**
-     * The backgroundc color.
-     * @type {string}
-     */
-    CaretBrowsing.caretBackground = '#fff';
-
-    /**
-     * Is the selection collapsed, i.e. are the start and end locations
-     * the same? If so, our blinking caret image is shown; otherwise
-     * the Chrome selection is shown.
-     * @type {boolean}
-     */
-    CaretBrowsing.isSelectionCollapsed = false;
-
-    /**
-     * The id returned by window.setInterval for our blink function, so
-     * we can cancel it when caret browsing is disabled.
-     * @type {number?}
-     */
-    CaretBrowsing.blinkFunctionId = null;
-
-    /**
-     * The desired x-coordinate to match when moving the caret up and down.
-     * To match the behavior as documented in Mozilla's caret browsing spec
-     * (http://www.mozilla.org/access/keyboard/proposal), we keep track of the
-     * initial x position when the user starts moving the caret up and down,
-     * so that the x position doesn't drift as you move throughout lines, but
-     * stays as close as possible to the initial position. This is reset when
-     * moving left or right or clicking.
-     * @type {number?}
-     */
-    CaretBrowsing.targetX = null;
-
-    /**
-     * A flag that flips on or off as the caret blinks.
-     * @type {boolean}
-     */
-    CaretBrowsing.blinkFlag = true;
-
-    /**
-     * Check if a node is a control that normally allows the user to interact
-     * with it using arrow keys. We won't override the arrow keys when such a
-     * control has focus, the user must press Escape to do caret browsing outside
-     * that control.
-     * @param {Node} node A node to check.
-     * @return {boolean} True if this node is a control that the user can
-     *     interact with using arrow keys.
-     */
-    CaretBrowsing.isControlThatNeedsArrowKeys = function(node) {
-        if (!node) {
-            return false;
-        }
-
-        if (node == document.body || node != document.activeElement) {
-            return false;
-        }
-
-        if (node.constructor == HTMLSelectElement) {
-            return true;
-        }
-
-        if (node.constructor == HTMLInputElement) {
-            switch (node.type) {
-                case 'email':
-                case 'number':
-                case 'password':
-                case 'search':
-                case 'text':
-                case 'tel':
-                case 'url':
-                case '':
-                    return true;  // All of these are text boxes.
-                case 'datetime':
-                case 'datetime-local':
-                case 'date':
-                case 'month':
-                case 'radio':
-                case 'range':
-                case 'week':
-                    return true;  // These are other input elements that use arrows.
-            }
-        }
-
-        // Handle focusable ARIA controls.
-        if (node.getAttribute && isFocusable(node)) {
-            var role = node.getAttribute('role');
-            switch (role) {
-                case 'combobox':
-                case 'grid':
-                case 'gridcell':
-                case 'listbox':
-                case 'menu':
-                case 'menubar':
-                case 'menuitem':
-                case 'menuitemcheckbox':
-                case 'menuitemradio':
-                case 'option':
-                case 'radiogroup':
-                case 'scrollbar':
-                case 'slider':
-                case 'spinbutton':
-                case 'tab':
-                case 'tablist':
-                case 'textbox':
-                case 'tree':
-                case 'treegrid':
-                case 'treeitem':
-                    return true;
-            }
-        }
-
-        return false;
-    };
-
-    CaretBrowsing.injectCaretStyles = function() {
-        var style = '.CaretBrowsing_Caret {' +
-            '  position: absolute;' +
-            '  z-index: 2147483647;' +
-            '  min-height: 10px;' +
-            '  background-color: #000;' +
-            '}' +
-            '.CaretBrowsing_AnimateCaret {' +
-            '  position: absolute;' +
-            '  z-index: 2147483647;' +
-            '  min-height: 10px;' +
-            '}' +
-            '.CaretBrowsing_FlashVert {' +
-            '  position: absolute;' +
-            '  z-index: 2147483647;' +
-            '  background: linear-gradient(' +
-            '      270deg,' +
-            '      rgba(128, 128, 255, 0) 0%,' +
-            '      rgba(128, 128, 255, 0.3) 45%,' +
-            '      rgba(128, 128, 255, 0.8) 50%,' +
-            '      rgba(128, 128, 255, 0.3) 65%,' +
-            '      rgba(128, 128, 255, 0) 100%);' +
-            '}';
-        var node = document.createElement('style');
-        node.innerHTML = style;
-        document.body.appendChild(node);
-    }
-
-    CaretBrowsing.setInitialCursor = function() {
-        var sel = window.getSelection();
-        if (sel.rangeCount > 0) {
-            return;
-        }
-
-        positionCaret();
-        CaretBrowsing.injectCaretStyles();
-        CaretBrowsing.toggle();
-        CaretBrowsing.initiated = true;
-        CaretBrowsing.selectionEnabled = false;
-    };
-
-    /**
-     * Try to set the window's selection to be between the given start and end
-     * cursors, and return whether or not it was successful.
-     * @param {Cursor} start The start position.
-     * @param {Cursor} end The end position.
-     * @return {boolean} True if the selection was successfully set.
-     */
-    CaretBrowsing.setAndValidateSelection = function(start, end) {
-        var sel = window.getSelection();
-        sel.setBaseAndExtent(start.node, start.index, end.node, end.index);
-
-        if (sel.rangeCount != 1) {
-            return false;
-        }
-
-        return (sel.anchorNode == start.node &&
-            sel.anchorOffset == start.index &&
-            sel.focusNode == end.node &&
-            sel.focusOffset == end.index);
-    };
-
-
-    CaretBrowsing.setFocusToNode = function(node) {
-        while (node && node != document.body) {
-            if (isFocusable(node) && node.constructor != HTMLIFrameElement) {
-                node.focus();
-                if (node.constructor == HTMLInputElement && node.select) {
-                    node.select();
-                }
-                return true;
-            }
-            node = node.parentNode;
-        }
-
-        return false;
-    };
-
-    /**
-     * Set the caret element's normal style, i.e. not when animating.
-     */
-    CaretBrowsing.setCaretElementNormalStyle = function() {
-        var element = CaretBrowsing.caretElement;
-        element.className = 'CaretBrowsing_Caret';
-        element.style.opacity = CaretBrowsing.isSelectionCollapsed ? '1.0' : '0.0';
-        element.style.left = CaretBrowsing.caretX + 'px';
-        element.style.top = CaretBrowsing.caretY + 'px';
-        element.style.width = CaretBrowsing.caretWidth + 'px';
-        element.style.height = CaretBrowsing.caretHeight + 'px';
-        element.style.color = CaretBrowsing.caretForeground;
-    };
-
-    /**
-     * Animate the caret element into the normal style.
-     */
-    CaretBrowsing.animateCaretElement = function() {
-        var element = CaretBrowsing.caretElement;
-        element.style.left = (CaretBrowsing.caretX - 50) + 'px';
-        element.style.top = (CaretBrowsing.caretY - 100) + 'px';
-        element.style.width = (CaretBrowsing.caretWidth + 100) + 'px';
-        element.style.height = (CaretBrowsing.caretHeight + 200) + 'px';
-        element.className = 'CaretBrowsing_AnimateCaret';
-
-        // Start the animation. The setTimeout is so that the old values will get
-        // applied first, so we can animate to the new values.
-        window.setTimeout(function() {
-            if (!CaretBrowsing.caretElement) {
-                return;
-            }
-            CaretBrowsing.setCaretElementNormalStyle();
-            element.style['transition'] = 'all 0.8s ease-in';
-            function listener() {
-                element.removeEventListener(
-                    'transitionend', listener, false);
-                element.style['transition'] = 'none';
-            }
-            element.addEventListener(
-                'transitionend', listener, false);
-        }, 0);
-    };
-
-    /**
-     * Quick flash and then show the normal caret style.
-     */
-    CaretBrowsing.flashCaretElement = function() {
-        var x = CaretBrowsing.caretX;
-        var y = CaretBrowsing.caretY;
-        var height = CaretBrowsing.caretHeight;
-
-        var vert = document.createElement('div');
-        vert.className = 'CaretBrowsing_FlashVert';
-        vert.style.left = (x - 6) + 'px';
-        vert.style.top = (y - 100) + 'px';
-        vert.style.width = '11px';
-        vert.style.height = (200) + 'px';
-        document.body.appendChild(vert);
-
-        window.setTimeout(function() {
-            document.body.removeChild(vert);
-            if (CaretBrowsing.caretElement) {
-                CaretBrowsing.setCaretElementNormalStyle();
-            }
-        }, 250);
-    };
-
-    /**
-     * Create the caret element. This assumes that caretX, caretY,
-     * caretWidth, and caretHeight have all been set. The caret is
-     * animated in so the user can find it when it first appears.
-     */
-    CaretBrowsing.createCaretElement = function() {
-        var element = document.createElement('div');
-        element.className = 'CaretBrowsing_Caret';
-        document.body.appendChild(element);
-        CaretBrowsing.caretElement = element;
-
-        if (CaretBrowsing.onEnable == 'anim') {
-            CaretBrowsing.animateCaretElement();
-        } else if (CaretBrowsing.onEnable == 'flash') {
-            CaretBrowsing.flashCaretElement();
-        } else {
-            CaretBrowsing.setCaretElementNormalStyle();
-        }
-    };
-
-    /**
-     * Recreate the caret element, triggering any intro animation.
-     */
-    CaretBrowsing.recreateCaretElement = function() {
-        if (CaretBrowsing.caretElement) {
-            window.clearInterval(CaretBrowsing.blinkFunctionId);
-            CaretBrowsing.caretElement.parentElement.removeChild(
-                CaretBrowsing.caretElement);
-            CaretBrowsing.caretElement = null;
-            CaretBrowsing.updateIsCaretVisible();
-        }
-    };
-
-    /**
-     * Get the rectangle for a cursor position. This is tricky because
-     * you can't get the bounding rectangle of an empty range, so this function
-     * computes the rect by trying a range including one character earlier or
-     * later than the cursor position.
-     * @param {Cursor} cursor A single cursor position.
-     * @return {{left: number, top: number, width: number, height: number}}
-     *     The bounding rectangle of the cursor.
-     */
-    CaretBrowsing.getCursorRect = function(cursor) {
-        var node = cursor.node;
-        var index = cursor.index;
-        var rect = {
-            left: 0,
-            top: 0,
-            width: 1,
-            height: 0
-        };
-        if (node.constructor == Text) {
-            var left = index;
-            var right = index;
-            var max = node.data.length;
-            var newRange = document.createRange();
-            while (left > 0 || right < max) {
-                if (left > 0) {
-                    left--;
-                    newRange.setStart(node, left);
-                    newRange.setEnd(node, index);
-                    var rangeRect = newRange.getBoundingClientRect();
-                    if (rangeRect && rangeRect.width && rangeRect.height) {
-                        rect.left = rangeRect.right;
-                        rect.top = rangeRect.top;
-                        rect.height = rangeRect.height;
-                        break;
-                    }
-                }
-                if (right < max) {
-                    right++;
-                    newRange.setStart(node, index);
-                    newRange.setEnd(node, right);
-                    var rangeRect = newRange.getBoundingClientRect();
-                    if (rangeRect && rangeRect.width && rangeRect.height) {
-                        rect.left = rangeRect.left;
-                        rect.top = rangeRect.top;
-                        rect.height = rangeRect.height;
-                        break;
-                    }
-                }
-            }
-        } else {
-            rect.height = node.offsetHeight;
-            while (node !== null) {
-                rect.left += node.offsetLeft;
-                rect.top += node.offsetTop;
-                node = node.offsetParent;
-            }
-        }
-        rect.left += window.pageXOffset;
-        rect.top += window.pageYOffset;
-        return rect;
-    };
-
-    /**
-     * Compute the new location of the caret or selection and update
-     * the element as needed.
-     * @param {boolean} scrollToSelection If true, will also scroll the page
-     *     to the caret / selection location.
-     */
-    CaretBrowsing.updateCaretOrSelection = function(scrollToSelection) {
-        var previousX = CaretBrowsing.caretX;
-        var previousY = CaretBrowsing.caretY;
-
-        var sel = window.getSelection();
-        if (sel.rangeCount == 0) {
-            if (CaretBrowsing.caretElement) {
-                CaretBrowsing.isSelectionCollapsed = false;
-                CaretBrowsing.caretElement.style.opacity = '0.0';
-            }
-            return;
-        }
-
-        var range = sel.getRangeAt(0);
-        if (!range) {
-            if (CaretBrowsing.caretElement) {
-                CaretBrowsing.isSelectionCollapsed = false;
-                CaretBrowsing.caretElement.style.opacity = '0.0';
-            }
-            return;
-        }
-
-        if (CaretBrowsing.isControlThatNeedsArrowKeys(document.activeElement)) {
-            var node = document.activeElement;
-            CaretBrowsing.caretWidth = node.offsetWidth;
-            CaretBrowsing.caretHeight = node.offsetHeight;
-            CaretBrowsing.caretX = 0;
-            CaretBrowsing.caretY = 0;
-            while (node.offsetParent) {
-                CaretBrowsing.caretX += node.offsetLeft;
-                CaretBrowsing.caretY += node.offsetTop;
-                node = node.offsetParent;
-            }
-            CaretBrowsing.isSelectionCollapsed = false;
-        } else if (range.startOffset != range.endOffset ||
-            range.startContainer != range.endContainer) {
-            var rect = range.getBoundingClientRect();
-            if (!rect) {
-                return;
-            }
-            CaretBrowsing.caretX = rect.left + window.pageXOffset;
-            CaretBrowsing.caretY = rect.top + window.pageYOffset;
-            CaretBrowsing.caretWidth = rect.width;
-            CaretBrowsing.caretHeight = rect.height;
-            CaretBrowsing.isSelectionCollapsed = false;
-        } else {
-            var rect = CaretBrowsing.getCursorRect(
-                new Cursor(range.startContainer,
-                    range.startOffset,
-                    TraverseUtil.getNodeText(range.startContainer)));
-            CaretBrowsing.caretX = rect.left;
-            CaretBrowsing.caretY = rect.top;
-            CaretBrowsing.caretWidth = rect.width;
-            CaretBrowsing.caretHeight = rect.height;
-            CaretBrowsing.isSelectionCollapsed = true;
-        }
-
-        if (!CaretBrowsing.caretElement) {
-            CaretBrowsing.createCaretElement();
-        } else {
-            var element = CaretBrowsing.caretElement;
-            if (CaretBrowsing.isSelectionCollapsed) {
-                element.style.opacity = '1.0';
-                element.style.left = CaretBrowsing.caretX + 'px';
-                element.style.top = CaretBrowsing.caretY + 'px';
-                element.style.width = CaretBrowsing.caretWidth + 'px';
-                element.style.height = CaretBrowsing.caretHeight + 'px';
-            } else {
-                element.style.opacity = '0.0';
-            }
-        }
-
-        var elem = range.startContainer;
-        if (elem.constructor == Text)
-            elem = elem.parentElement;
-        var style = window.getComputedStyle(elem);
-        var bg = axs.utils.getBgColor(style, elem);
-        var fg = axs.utils.getFgColor(style, elem, bg);
-        CaretBrowsing.caretBackground = axs.color.colorToString(bg);
-        CaretBrowsing.caretForeground = axs.color.colorToString(fg);
-
-        if (scrollToSelection) {
-            // Scroll just to the "focus" position of the selection,
-            // the part the user is manipulating.
-            var rect = CaretBrowsing.getCursorRect(
-                new Cursor(sel.focusNode, sel.focusOffset,
-                    TraverseUtil.getNodeText(sel.focusNode)));
-
-            var yscroll = window.pageYOffset;
-            var pageHeight = window.innerHeight;
-            var caretY = rect.top;
-            var caretHeight = Math.min(rect.height, 30);
-            if (yscroll + pageHeight < caretY + caretHeight) {
-                window.scroll(0, (caretY + caretHeight - pageHeight + 100));
-            } else if (caretY < yscroll) {
-                window.scroll(0, (caretY - 100));
-            }
-        }
-
-        if (Math.abs(previousX - CaretBrowsing.caretX) > 500 ||
-            Math.abs(previousY - CaretBrowsing.caretY) > 100) {
-            if (CaretBrowsing.onJump == 'anim') {
-                CaretBrowsing.animateCaretElement();
-            } else if (CaretBrowsing.onJump == 'flash') {
-                CaretBrowsing.flashCaretElement();
-            }
-        }
-    };
-
-    CaretBrowsing.move = function(direction, granularity) {
-        window
-            .getSelection()
-            .modify(
-                CaretBrowsing.selectionEnabled ? 'extend' : 'move', 
-                direction,
-                granularity);
-
-        window.setTimeout(function() {
-            CaretBrowsing.updateCaretOrSelection(true);
-        }, 0);
-    }
-
-    CaretBrowsing.moveToBlock = function(paragraph, boundary) {
-        window
-            .getSelection()
-            .modify(
-                CaretBrowsing.selectionEnabled ? 'extend' : 'move', 
-                paragraph, 
-                'paragraph');
-
-        window
-            .getSelection()
-            .modify(
-                CaretBrowsing.selectionEnabled ? 'extend' : 'move', 
-                boundary, 
-                'paragraphboundary');
-
-        window.setTimeout(function() {
-            CaretBrowsing.updateCaretOrSelection(true);
-        }, 0);
-
-    }
-
-    /**
-     * Toggle whether caret browsing is enabled or not.
-     */
-    CaretBrowsing.toggle = function() {
-        if (CaretBrowsing.forceEnabled) {
-            CaretBrowsing.recreateCaretElement();
-            return;
-        }
-
-        CaretBrowsing.isEnabled = !CaretBrowsing.isEnabled;
-        var obj = {};
-        obj['enabled'] = CaretBrowsing.isEnabled;
-        CaretBrowsing.updateIsCaretVisible();
-    };
-
-    /**
-     * Event handler, called when the mouse is clicked. Chrome already
-     * sets the selection when the mouse is clicked, all we need to do is
-     * update our cursor.
-     * @param {Event} evt The DOM event.
-     * @return {boolean} True if the default action should be performed.
-     */
-    CaretBrowsing.onClick = function(evt) {
-        if (!CaretBrowsing.isEnabled) {
-            return true;
-        }
-        window.setTimeout(function() {
-            CaretBrowsing.targetX = null;
-            CaretBrowsing.updateCaretOrSelection(false);
-        }, 0);
-        return true;
-    };
-
-    /**
-     * Called at a regular interval. Blink the cursor by changing its visibility.
-     */
-    CaretBrowsing.caretBlinkFunction = function() {
-        if (CaretBrowsing.caretElement) {
-            if (CaretBrowsing.blinkFlag) {
-                CaretBrowsing.caretElement.style.backgroundColor =
-                    CaretBrowsing.caretForeground;
-                CaretBrowsing.blinkFlag = false;
-            } else {
-                CaretBrowsing.caretElement.style.backgroundColor =
-                    CaretBrowsing.caretBackground;
-                CaretBrowsing.blinkFlag = true;
-            }
-        }
-    };
-
-    /**
-     * Update whether or not the caret is visible, based on whether caret browsing
-     * is enabled and whether this window / iframe has focus.
-     */
-    CaretBrowsing.updateIsCaretVisible = function() {
-        CaretBrowsing.isCaretVisible =
-            (CaretBrowsing.isEnabled && CaretBrowsing.isWindowFocused);
-        if (CaretBrowsing.isCaretVisible && !CaretBrowsing.caretElement) {
-            CaretBrowsing.setInitialCursor();
-            CaretBrowsing.updateCaretOrSelection(true);
-            if (CaretBrowsing.caretElement) {
-                CaretBrowsing.blinkFunctionId = window.setInterval(
-                    CaretBrowsing.caretBlinkFunction, 500);
-            }
-        } else if (!CaretBrowsing.isCaretVisible &&
-            CaretBrowsing.caretElement) {
-            window.clearInterval(CaretBrowsing.blinkFunctionId);
-            if (CaretBrowsing.caretElement) {
-                CaretBrowsing.isSelectionCollapsed = false;
-                CaretBrowsing.caretElement.parentElement.removeChild(
-                    CaretBrowsing.caretElement);
-                CaretBrowsing.caretElement = null;
-            }
-        }
-    };
-
-    /**
-     * Called when the prefs get updated.
-     */
-    /**
-     * Called when this window / iframe gains focus.
-     */
-    CaretBrowsing.onWindowFocus = function() {
-        CaretBrowsing.isWindowFocused = true;
-        CaretBrowsing.updateIsCaretVisible();
-    };
-
-    /**
-     * Called when this window / iframe loses focus.
-     */
-    CaretBrowsing.onWindowBlur = function() {
-        CaretBrowsing.isWindowFocused = false;
-        CaretBrowsing.updateIsCaretVisible();
-    };
-
-    /**
-     * Initializes caret browsing by adding event listeners and extension
-     * message listeners.
-     */
-    CaretBrowsing.init = function() {
-        CaretBrowsing.isWindowFocused = document.hasFocus();
-
-        document.addEventListener('click', CaretBrowsing.onClick, false);
-        window.addEventListener('focus', CaretBrowsing.onWindowFocus, false);
-        window.addEventListener('blur', CaretBrowsing.onWindowBlur, false);
-    };
-
-    window.setTimeout(function() {
-
-        // Make sure the script only loads once.
-        if (!window['caretBrowsingLoaded']) {
-            window['caretBrowsingLoaded'] = true;
-            CaretBrowsing.init();
-
-            if (document.body.getAttribute('caretbrowsing') == 'on') {
-                CaretBrowsing.forceEnabled = true;
-                CaretBrowsing.isEnabled = true;
-                CaretBrowsing.updateIsCaretVisible();
-            }
-
-        }
-
-    }, 0);
+"use strict"; // eslint-disable-line max-lines
 
+window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,max-len
     function isElementInViewport(node) {  // eslint-disable-line complexity
         let i;
         let boundingRect = (node.getClientRects()[0] ||
@@ -1138,19 +69,20 @@ window._qutebrowser.caret = (function() {
             }
         }
         if (el !== undefined) {
-            var start = new Cursor(el, 0, '');
-            var end = new Cursor(el, 0, '');
-            var nodesCrossed = [];
-            var result = TraverseUtil.getNextChar(start, end, nodesCrossed, true);
-            if (result == null) {
+            const start = new Cursor(el, 0, ""); // eslint-disable-line no-use-before-define,max-len
+            const end = new Cursor(el, 0, ""); // eslint-disable-line no-use-before-define,max-len
+            const nodesCrossed = [];
+            const result = TraverseUtil.getNextChar( // eslint-disable-line no-use-before-define,max-len
+                start, end, nodesCrossed, true);
+            if (result === null) {
                 return;
             }
-            CaretBrowsing.setAndValidateSelection(start, start);
+            CaretBrowsing.setAndValidateSelection(start, start); // eslint-disable-line no-use-before-define,max-len
         }
     }
 
     function isFocusable(targetNode) {
-        if (!targetNode || typeof(targetNode.tabIndex) != 'number') {
+        if (!targetNode || typeof (targetNode.tabIndex) !== "number") {
             return false;
         }
 
@@ -1159,104 +91,977 @@ window._qutebrowser.caret = (function() {
         }
 
         if (targetNode.hasAttribute &&
-            targetNode.hasAttribute('tabindex') &&
-            targetNode.getAttribute('tabindex') == '-1') {
+            targetNode.hasAttribute("tabindex") &&
+            targetNode.getAttribute("tabindex") === "-1") {
             return true;
         }
 
         return false;
     }
 
+    const axs = {};
+
+    axs.dom = {};
+
+    axs.color = {};
+
+    axs.utils = {};
+
+    axs.dom.parentElement = function(node) {
+        if (!node) {
+            return null;
+        }
+        const composedNode = axs.dom.composedParentNode(node);
+        if (!composedNode) {
+            return null;
+        }
+        switch (composedNode.nodeType) {
+        case Node.ELEMENT_NODE:
+            return composedNode;
+        default:
+            return axs.dom.parentElement(composedNode);
+        }
+    };
+
+    axs.dom.shadowHost = function(node) {
+        if ("host" in node) {
+            return node.host;
+        }
+        return null;
+    };
+
+    axs.dom.composedParentNode = function(node) {
+        if (!node) {
+            return null;
+        }
+        if (node.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
+            return axs.dom.shadowHost(node);
+        }
+        const parentNode = node.parentNode;
+        if (!parentNode) {
+            return null;
+        }
+        if (parentNode.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
+            return axs.dom.shadowHost(parentNode);
+        }
+        if (!parentNode.shadowRoot) {
+            return parentNode;
+        }
+        const points = node.getDestinationInsertionPoints();
+        if (points.length > 0) {
+            return axs.dom.composedParentNode(points[points.length - 1]);
+        }
+        return null;
+    };
+
+    axs.color.Color = function(red, green, blue, alpha) { // eslint-disable-line max-params,max-len
+        this.red = red;
+        this.green = green;
+        this.blue = blue;
+        this.alpha = alpha;
+    };
+
+    axs.color.parseColor = function(colorText) {
+        if (colorText === "transparent") {
+            return new axs.color.Color(0, 0, 0, 0);
+        }
+        let match = colorText.match(/^rgb\((\d+), (\d+), (\d+)\)$/);
+        if (match) {
+            const blue = parseInt(match[3], 10);
+            const green = parseInt(match[2], 10);
+            const red = parseInt(match[1], 10);
+            return new axs.color.Color(red, green, blue, 1);
+        }
+        match = colorText.match(/^rgba\((\d+), (\d+), (\d+), (\d*(\.\d+)?)\)/);
+        if (match) {
+            const red = parseInt(match[1], 10);
+            const green = parseInt(match[2], 10);
+            const blue = parseInt(match[3], 10);
+            const alpha = parseFloat(match[4]);
+            return new axs.color.Color(red, green, blue, alpha);
+        }
+        return null;
+    };
+
+    axs.color.flattenColors = function(color1, color2) {
+        const colorAlpha = color1.alpha;
+        return new axs.color.Color(
+            ((1 - colorAlpha) * color2.red) + (colorAlpha * color1.red),
+            ((1 - colorAlpha) * color2.green) + (colorAlpha * color1.green),
+            ((1 - colorAlpha) * color2.blue) + (colorAlpha * color2.blue),
+            color1.alpha + (color2.alpha * (1 - color1.alpha)));
+    };
+
+    axs.utils.getParentBgColor = function(_el) {
+        let el = _el;
+        let el2 = el;
+        let iter = null;
+        el = [];
+        for (iter = null; (el2 = axs.dom.parentElement(el2));) {
+            const style = window.getComputedStyle(el2, null);
+            if (style) {
+                const color = axs.color.parseColor(style.backgroundColor);
+                if (color &&
+                    (style.opacity < 1 &&
+                        (color.alpha *= style.opacity),
+                        color.alpha !== 0 &&
+                        (el.push(color), color.alpha === 1))) {
+                    iter = !0;
+                    break;
+                }
+            }
+        }
+        if (!iter) {
+            el.push(new axs.color.Color(255, 255, 255, 1));
+        }
+        for (el2 = el.pop(); el.length;) {
+            iter = el.pop();
+            el2 = axs.color.flattenColors(iter, el2);
+        }
+        return el2;
+    };
+
+    axs.utils.getFgColor = function(el, el2, color) {
+        let color2 = axs.color.parseColor(el.color);
+        if (!color2) {
+            return null;
+        }
+        if (color2.alpha < 1) {
+            color2 = axs.color.flattenColors(color2, color);
+        }
+        if (el.opacity < 1) {
+            const el3 = axs.utils.getParentBgColor(el2);
+            color2.alpha *= el.opacity;
+            color2 = axs.color.flattenColors(color2, el3);
+        }
+        return color2;
+    };
+
+    axs.utils.getBgColor = function(el, elParent) {
+        let color = axs.color.parseColor(el.backgroundColor);
+        if (!color) {
+            return null;
+        }
+        if (el.opacity < 1) {
+            color.alpha *= el.opacity;
+        }
+        if (color.alpha < 1) {
+            const bgColor = axs.utils.getParentBgColor(elParent);
+            if (bgColor === null) {
+                return null;
+            }
+            color = axs.color.flattenColors(color, bgColor);
+        }
+        return color;
+    };
+
+    axs.color.colorChannelToString = function(_color) {
+        const color = Math.round(_color);
+        if (color < 15) {
+            return `0${color.toString(16)}`;
+        }
+        return color.toString(16);
+    };
+
+    axs.color.colorToString = function(color) {
+        if (color.alpha === 1) {
+            const red = axs.color.colorChannelToString(color.red);
+            const green = axs.color.colorChannelToString(color.green);
+            const blue = axs.color.colorChannelToString(color.blue);
+            return `#${red}${green}${blue}`;
+        }
+        const arr = [color.red, color.green, color.blue, color.alpha].join();
+        return `rgba(${arr})`;
+    };
+
+    const Cursor = function(node, index, text) { // eslint-disable-line func-style,max-len
+        this.node = node;
+        this.index = index;
+        this.text = text;
+    };
+
+    Cursor.prototype.clone = function() {
+        return new Cursor(this.node, this.index, this.text);
+    };
+
+    Cursor.prototype.copyFrom = function(otherCursor) {
+        this.node = otherCursor.node;
+        this.index = otherCursor.index;
+        this.text = otherCursor.text;
+    };
+
+    const TraverseUtil = {};
+
+    TraverseUtil.getNodeText = function(node) {
+        if (node.constructor === Text) {
+            return node.data;
+        }
+        return "";
+    };
+
+    TraverseUtil.treatAsLeafNode = function(node) {
+        return node.childNodes.length === 0 ||
+            node.nodeName === "SELECT" ||
+            node.nodeName === "OBJECT";
+    };
+
+    TraverseUtil.isWhitespace = function(ch) {
+        return (ch === " " || ch === "\n" || ch === "\r" || ch === "\t");
+    };
+
+    TraverseUtil.isVisible = function(node) {
+        if (!node.style) {
+            return true;
+        }
+        const style = window.getComputedStyle(node, null);
+        return (Boolean(style) &&
+            style.display !== "none" &&
+            style.visibility !== "hidden");
+    };
+
+    TraverseUtil.isSkipped = function(_node) {
+        let node = _node;
+        if (node.constructor === Text) {
+            node = node.parentElement;
+        }
+        if (node.className === "CaretBrowsing_Caret" ||
+            node.className === "CaretBrowsing_AnimateCaret") {
+            return true;
+        }
+        return false;
+    };
+
+    TraverseUtil.forwardsChar = function(cursor, nodesCrossed) { // eslint-disable-line max-statements,max-len
+        for (;;) {
+            let childNode = null;
+            if (!TraverseUtil.treatAsLeafNode(cursor.node)) {
+                for (let i = cursor.index;
+                    i < cursor.node.childNodes.length;
+                    i++) {
+                    const node = cursor.node.childNodes[i];
+                    if (TraverseUtil.isSkipped(node)) {
+                        nodesCrossed.push(node);
+                    } else if (TraverseUtil.isVisible(node)) {
+                        childNode = node;
+                        break;
+                    }
+                }
+            }
+            if (childNode) {
+                cursor.node = childNode;
+                cursor.index = 0;
+                cursor.text = TraverseUtil.getNodeText(cursor.node);
+                if (cursor.node.constructor !== Text) {
+                    nodesCrossed.push(cursor.node);
+                }
+            } else {
+                if (cursor.index < cursor.text.length) {
+                    return cursor.text[cursor.index++];
+                }
+
+                while (cursor.node !== null) {
+                    let siblingNode = null;
+                    for (let node = cursor.node.nextSibling;
+                        node !== null;
+                        node = node.nextSibling) {
+                        if (TraverseUtil.isSkipped(node)) {
+                            nodesCrossed.push(node);
+                        } else if (TraverseUtil.isVisible(node)) {
+                            siblingNode = node;
+                            break;
+                        }
+                    }
+                    if (siblingNode) {
+                        cursor.node = siblingNode;
+                        cursor.text = TraverseUtil.getNodeText(siblingNode);
+                        cursor.index = 0;
+
+                        if (cursor.node.constructor !== Text) {
+                            nodesCrossed.push(cursor.node);
+                        }
+
+                        break;
+                    }
+
+                    const parentNode = cursor.node.parentNode;
+                    if (parentNode &&
+                        parentNode.constructor !== HTMLBodyElement) {
+                        cursor.node = cursor.node.parentNode;
+                        cursor.text = null;
+                        cursor.index = 0;
+                    } else {
+                        return null;
+                    }
+                }
+            }
+        }
+    };
+
+    TraverseUtil.getNextChar = function( // eslint-disable-line max-params
+        startCursor, endCursor, nodesCrossed, skipWhitespace) {
+        startCursor.copyFrom(endCursor);
+        let fChar = TraverseUtil.forwardsChar(endCursor, nodesCrossed);
+        if (fChar === null) {
+            return null;
+        }
+
+        const initialWhitespace = TraverseUtil.isWhitespace(fChar);
+
+        while ((TraverseUtil.isWhitespace(fChar)) ||
+            (TraverseUtil.isSkipped(endCursor.node))) {
+            fChar = TraverseUtil.forwardsChar(endCursor, nodesCrossed);
+            if (fChar === null) {
+                return null;
+            }
+        }
+        if (skipWhitespace || !initialWhitespace) {
+            startCursor.copyFrom(endCursor);
+            startCursor.index--;
+            return fChar;
+        }
+
+        for (let i = 0; i < nodesCrossed.length; i++) {
+            if (TraverseUtil.isSkipped(nodesCrossed[i])) {
+                endCursor.index--;
+                startCursor.copyFrom(endCursor);
+                startCursor.index--;
+                return " ";
+            }
+        }
+        endCursor.index--;
+        return " ";
+    };
+
+    const CaretBrowsing = {};
+
+    CaretBrowsing.isEnabled = false;
+
+    CaretBrowsing.forceEnabled = false;
+
+    CaretBrowsing.onEnable = undefined;
+
+    CaretBrowsing.onJump = undefined;
+
+    CaretBrowsing.isWindowFocused = false;
+
+    CaretBrowsing.isCaretVisible = false;
+
+    CaretBrowsing.caretElement = undefined;
+
+    CaretBrowsing.caretX = 0;
+
+    CaretBrowsing.caretY = 0;
+
+    CaretBrowsing.caretWidth = 0;
+
+    CaretBrowsing.caretHeight = 0;
+
+    CaretBrowsing.caretForeground = "#000";
+
+    CaretBrowsing.caretBackground = "#fff";
+
+    CaretBrowsing.isSelectionCollapsed = false;
+
+    CaretBrowsing.blinkFunctionId = null;
+
+    CaretBrowsing.targetX = null;
+
+    CaretBrowsing.blinkFlag = true;
+
+    CaretBrowsing.isControlThatNeedsArrowKeys = function(node) { // eslint-disable-line complexity,max-len
+        if (!node) {
+            return false;
+        }
+
+        if (node === document.body || node !== document.activeElement) {
+            return false;
+        }
+
+        if (node.constructor === HTMLSelectElement) {
+            return true;
+        }
+
+        if (node.constructor === HTMLInputElement) {
+            switch (node.type) { // eslint-disable-line default-case
+            case "email":
+            case "number":
+            case "password":
+            case "search":
+            case "text":
+            case "tel":
+            case "url":
+            case "":
+                return true;
+            case "datetime":
+            case "datetime-local":
+            case "date":
+            case "month":
+            case "radio":
+            case "range":
+            case "week":
+                return true;
+            }
+        }
+
+        if (node.getAttribute && isFocusable(node)) {
+            const role = node.getAttribute("role");
+            switch (role) { // eslint-disable-line default-case
+            case "combobox":
+            case "grid":
+            case "gridcell":
+            case "listbox":
+            case "menu":
+            case "menubar":
+            case "menuitem":
+            case "menuitemcheckbox":
+            case "menuitemradio":
+            case "option":
+            case "radiogroup":
+            case "scrollbar":
+            case "slider":
+            case "spinbutton":
+            case "tab":
+            case "tablist":
+            case "textbox":
+            case "tree":
+            case "treegrid":
+            case "treeitem":
+                return true;
+            }
+        }
+
+        return false;
+    };
+
+    CaretBrowsing.injectCaretStyles = function() {
+        const style = ".CaretBrowsing_Caret {" +
+            "  position: absolute;" +
+            "  z-index: 2147483647;" +
+            "  min-height: 10px;" +
+            "  background-color: #000;" +
+            "}" +
+            ".CaretBrowsing_AnimateCaret {" +
+            "  position: absolute;" +
+            "  z-index: 2147483647;" +
+            "  min-height: 10px;" +
+            "}" +
+            ".CaretBrowsing_FlashVert {" +
+            "  position: absolute;" +
+            "  z-index: 2147483647;" +
+            "  background: linear-gradient(" +
+            "      270deg," +
+            "      rgba(128, 128, 255, 0) 0%," +
+            "      rgba(128, 128, 255, 0.3) 45%," +
+            "      rgba(128, 128, 255, 0.8) 50%," +
+            "      rgba(128, 128, 255, 0.3) 65%," +
+            "      rgba(128, 128, 255, 0) 100%);" +
+            "}";
+        const node = document.createElement("style");
+        node.innerHTML = style;
+        document.body.appendChild(node);
+    };
+
+    CaretBrowsing.setInitialCursor = function() {
+        const sel = window.getSelection();
+        if (sel.rangeCount > 0) {
+            return;
+        }
+
+        positionCaret();
+        CaretBrowsing.injectCaretStyles();
+        CaretBrowsing.toggle();
+        CaretBrowsing.initiated = true;
+        CaretBrowsing.selectionEnabled = false;
+    };
+
+    CaretBrowsing.setAndValidateSelection = function(start, end) {
+        const sel = window.getSelection();
+        sel.setBaseAndExtent(start.node, start.index, end.node, end.index);
+
+        if (sel.rangeCount !== 1) {
+            return false;
+        }
+
+        return (sel.anchorNode === start.node &&
+            sel.anchorOffset === start.index &&
+            sel.focusNode === end.node &&
+            sel.focusOffset === end.index);
+    };
+
+    CaretBrowsing.setFocusToNode = function(nodeArg) {
+        let node = nodeArg;
+        while (node && node !== document.body) {
+            if (isFocusable(node) && node.constructor !== HTMLIFrameElement) {
+                node.focus();
+                if (node.constructor === HTMLInputElement && node.select) {
+                    node.select();
+                }
+                return true;
+            }
+            node = node.parentNode;
+        }
+
+        return false;
+    };
+
+    CaretBrowsing.setCaretElementNormalStyle = function() {
+        const element = CaretBrowsing.caretElement;
+        element.className = "CaretBrowsing_Caret";
+        if (CaretBrowsing.isSelectionCollapsed) {
+            element.style.opacity = "1.0";
+        } else {
+            element.style.opacity = "0.0";
+        }
+        element.style.left = `${CaretBrowsing.caretX}px`;
+        element.style.top = `${CaretBrowsing.caretY}px`;
+        element.style.width = `${CaretBrowsing.caretWidth}px`;
+        element.style.height = `${CaretBrowsing.caretHeight}px`;
+        element.style.color = CaretBrowsing.caretForeground;
+    };
+
+    CaretBrowsing.animateCaretElement = function() {
+        const element = CaretBrowsing.caretElement;
+        element.style.left = `${CaretBrowsing.caretX - 50}px`;
+        element.style.top = `${CaretBrowsing.caretY - 100}px`;
+        element.style.width = `${CaretBrowsing.caretWidth + 100}px`;
+        element.style.height = `${CaretBrowsing.caretHeight + 200}px`;
+        element.className = "CaretBrowsing_AnimateCaret";
+
+        window.setTimeout(() => {
+            if (!CaretBrowsing.caretElement) {
+                return;
+            }
+            CaretBrowsing.setCaretElementNormalStyle();
+            element.style.transition = "all 0.8s ease-in";
+            function listener() {
+                element.removeEventListener(
+                    "transitionend", listener, false);
+                element.style.transition = "none";
+            }
+            element.addEventListener(
+                "transitionend", listener, false);
+        }, 0);
+    };
+
+    CaretBrowsing.flashCaretElement = function() {
+        const x = CaretBrowsing.caretX;
+        const y = CaretBrowsing.caretY;
+
+        const vert = document.createElement("div");
+        vert.className = "CaretBrowsing_FlashVert";
+        vert.style.left = `${x - 6}px`;
+        vert.style.top = `${y - 100}px`;
+        vert.style.width = "11px";
+        vert.style.height = `${200}px`;
+        document.body.appendChild(vert);
+
+        window.setTimeout(() => {
+            document.body.removeChild(vert);
+            if (CaretBrowsing.caretElement) {
+                CaretBrowsing.setCaretElementNormalStyle();
+            }
+        }, 250);
+    };
+
+    CaretBrowsing.createCaretElement = function() {
+        const element = document.createElement("div");
+        element.className = "CaretBrowsing_Caret";
+        document.body.appendChild(element);
+        CaretBrowsing.caretElement = element;
+
+        if (CaretBrowsing.onEnable === "anim") {
+            CaretBrowsing.animateCaretElement();
+        } else if (CaretBrowsing.onEnable === "flash") {
+            CaretBrowsing.flashCaretElement();
+        } else {
+            CaretBrowsing.setCaretElementNormalStyle();
+        }
+    };
+
+    CaretBrowsing.recreateCaretElement = function() {
+        if (CaretBrowsing.caretElement) {
+            window.clearInterval(CaretBrowsing.blinkFunctionId);
+            CaretBrowsing.caretElement.parentElement.removeChild(
+                CaretBrowsing.caretElement);
+            CaretBrowsing.caretElement = null;
+            CaretBrowsing.updateIsCaretVisible();
+        }
+    };
+
+    CaretBrowsing.getCursorRect = function(cursor) { // eslint-disable-line max-statements,max-len
+        let node = cursor.node;
+        const index = cursor.index;
+        const rect = {
+            "left": 0,
+            "top": 0,
+            "width": 1,
+            "height": 0,
+        };
+        if (node.constructor === Text) {
+            let left = index;
+            let right = index;
+            const max = node.data.length;
+            const newRange = document.createRange();
+            while (left > 0 || right < max) {
+                if (left > 0) {
+                    left--;
+                    newRange.setStart(node, left);
+                    newRange.setEnd(node, index);
+                    const rangeRect = newRange.getBoundingClientRect();
+                    if (rangeRect && rangeRect.width && rangeRect.height) {
+                        rect.left = rangeRect.right;
+                        rect.top = rangeRect.top;
+                        rect.height = rangeRect.height;
+                        break;
+                    }
+                }
+                if (right < max) {
+                    right++;
+                    newRange.setStart(node, index);
+                    newRange.setEnd(node, right);
+                    const rangeRect = newRange.getBoundingClientRect();
+                    if (rangeRect && rangeRect.width && rangeRect.height) {
+                        rect.left = rangeRect.left;
+                        rect.top = rangeRect.top;
+                        rect.height = rangeRect.height;
+                        break;
+                    }
+                }
+            }
+        } else {
+            rect.height = node.offsetHeight;
+            while (node !== null) {
+                rect.left += node.offsetLeft;
+                rect.top += node.offsetTop;
+                node = node.offsetParent;
+            }
+        }
+        rect.left += window.pageXOffset;
+        rect.top += window.pageYOffset;
+        return rect;
+    };
+
+    CaretBrowsing.updateCaretOrSelection =
+        function(scrollToSelection) { // eslint-disable-line max-statements
+            const previousX = CaretBrowsing.caretX;
+            const previousY = CaretBrowsing.caretY;
+
+            const sel = window.getSelection();
+            if (sel.rangeCount === 0) {
+                if (CaretBrowsing.caretElement) {
+                    CaretBrowsing.isSelectionCollapsed = false;
+                    CaretBrowsing.caretElement.style.opacity = "0.0";
+                }
+                return;
+            }
+
+            const range = sel.getRangeAt(0);
+            if (!range) {
+                if (CaretBrowsing.caretElement) {
+                    CaretBrowsing.isSelectionCollapsed = false;
+                    CaretBrowsing.caretElement.style.opacity = "0.0";
+                }
+                return;
+            }
+
+            if (CaretBrowsing.isControlThatNeedsArrowKeys(
+                document.activeElement)) {
+                let node = document.activeElement;
+                CaretBrowsing.caretWidth = node.offsetWidth;
+                CaretBrowsing.caretHeight = node.offsetHeight;
+                CaretBrowsing.caretX = 0;
+                CaretBrowsing.caretY = 0;
+                while (node.offsetParent) {
+                    CaretBrowsing.caretX += node.offsetLeft;
+                    CaretBrowsing.caretY += node.offsetTop;
+                    node = node.offsetParent;
+                }
+                CaretBrowsing.isSelectionCollapsed = false;
+            } else if (range.startOffset !== range.endOffset ||
+                range.startContainer !== range.endContainer) {
+                const rect = range.getBoundingClientRect();
+                if (!rect) {
+                    return;
+                }
+                CaretBrowsing.caretX = rect.left + window.pageXOffset;
+                CaretBrowsing.caretY = rect.top + window.pageYOffset;
+                CaretBrowsing.caretWidth = rect.width;
+                CaretBrowsing.caretHeight = rect.height;
+                CaretBrowsing.isSelectionCollapsed = false;
+            } else {
+                const rect = CaretBrowsing.getCursorRect(
+                    new Cursor(range.startContainer,
+                        range.startOffset,
+                        TraverseUtil.getNodeText(range.startContainer)));
+                CaretBrowsing.caretX = rect.left;
+                CaretBrowsing.caretY = rect.top;
+                CaretBrowsing.caretWidth = rect.width;
+                CaretBrowsing.caretHeight = rect.height;
+                CaretBrowsing.isSelectionCollapsed = true;
+            }
+
+            if (CaretBrowsing.caretElement) {
+                const element = CaretBrowsing.caretElement;
+                if (CaretBrowsing.isSelectionCollapsed) {
+                    element.style.opacity = "1.0";
+                    element.style.left = `${CaretBrowsing.caretX}px`;
+                    element.style.top = `${CaretBrowsing.caretY}px`;
+                    element.style.width = `${CaretBrowsing.caretWidth}px`;
+                    element.style.height = `${CaretBrowsing.caretHeight}px`;
+                } else {
+                    element.style.opacity = "0.0";
+                }
+            } else {
+                CaretBrowsing.createCaretElement();
+            }
+
+            let elem = range.startContainer;
+            if (elem.constructor === Text) {
+                elem = elem.parentElement;
+            }
+            const style = window.getComputedStyle(elem);
+            const bg = axs.utils.getBgColor(style, elem);
+            const fg = axs.utils.getFgColor(style, elem, bg);
+            CaretBrowsing.caretBackground = axs.color.colorToString(bg);
+            CaretBrowsing.caretForeground = axs.color.colorToString(fg);
+
+            if (scrollToSelection) {
+                const rect = CaretBrowsing.getCursorRect(
+                    new Cursor(sel.focusNode, sel.focusOffset,
+                        TraverseUtil.getNodeText(sel.focusNode)));
+
+                const yscroll = window.pageYOffset;
+                const pageHeight = window.innerHeight;
+                const caretY = rect.top;
+                const caretHeight = Math.min(rect.height, 30);
+                if (yscroll + pageHeight < caretY + caretHeight) {
+                    window.scroll(0, (caretY + caretHeight - pageHeight + 100));
+                } else if (caretY < yscroll) {
+                    window.scroll(0, (caretY - 100));
+                }
+            }
+
+            if (Math.abs(previousX - CaretBrowsing.caretX) > 500 ||
+                Math.abs(previousY - CaretBrowsing.caretY) > 100) {
+                if (CaretBrowsing.onJump === "anim") {
+                    CaretBrowsing.animateCaretElement();
+                } else if (CaretBrowsing.onJump === "flash") {
+                    CaretBrowsing.flashCaretElement();
+                }
+            }
+        };
+
+    CaretBrowsing.move = function(direction, granularity) {
+        let action = "move";
+        if (CaretBrowsing.selectionEnabled) {
+            action = "extend";
+        }
+        window.
+            getSelection().
+            modify(action, direction, granularity);
+
+        window.setTimeout(() => {
+            CaretBrowsing.updateCaretOrSelection(true);
+        }, 0);
+    };
+
+    CaretBrowsing.moveToBlock = function(paragraph, boundary) {
+        let action = "move";
+        if (CaretBrowsing.selectionEnabled) {
+            action = "extend";
+        }
+        window.
+            getSelection().
+            modify(action, paragraph, "paragraph");
+
+        window.
+            getSelection().
+            modify(action, boundary, "paragraphboundary");
+
+        window.setTimeout(() => {
+            CaretBrowsing.updateCaretOrSelection(true);
+        }, 0);
+    };
+
+    CaretBrowsing.toggle = function() {
+        if (CaretBrowsing.forceEnabled) {
+            CaretBrowsing.recreateCaretElement();
+            return;
+        }
+
+        CaretBrowsing.isEnabled = !CaretBrowsing.isEnabled;
+        const obj = {};
+        obj.enabled = CaretBrowsing.isEnabled;
+        CaretBrowsing.updateIsCaretVisible();
+    };
+
+    CaretBrowsing.onClick = function() {
+        if (!CaretBrowsing.isEnabled) {
+            return true;
+        }
+        window.setTimeout(() => {
+            CaretBrowsing.targetX = null;
+            CaretBrowsing.updateCaretOrSelection(false);
+        }, 0);
+        return true;
+    };
+
+    CaretBrowsing.caretBlinkFunction = function() {
+        if (CaretBrowsing.caretElement) {
+            if (CaretBrowsing.blinkFlag) {
+                CaretBrowsing.caretElement.style.backgroundColor =
+                    CaretBrowsing.caretForeground;
+                CaretBrowsing.blinkFlag = false;
+            } else {
+                CaretBrowsing.caretElement.style.backgroundColor =
+                    CaretBrowsing.caretBackground;
+                CaretBrowsing.blinkFlag = true;
+            }
+        }
+    };
+
+    CaretBrowsing.updateIsCaretVisible = function() {
+        CaretBrowsing.isCaretVisible =
+            (CaretBrowsing.isEnabled && CaretBrowsing.isWindowFocused);
+        if (CaretBrowsing.isCaretVisible && !CaretBrowsing.caretElement) {
+            CaretBrowsing.setInitialCursor();
+            CaretBrowsing.updateCaretOrSelection(true);
+            if (CaretBrowsing.caretElement) {
+                CaretBrowsing.blinkFunctionId = window.setInterval(
+                    CaretBrowsing.caretBlinkFunction, 500);
+            }
+        } else if (!CaretBrowsing.isCaretVisible &&
+            CaretBrowsing.caretElement) {
+            window.clearInterval(CaretBrowsing.blinkFunctionId);
+            if (CaretBrowsing.caretElement) {
+                CaretBrowsing.isSelectionCollapsed = false;
+                CaretBrowsing.caretElement.parentElement.removeChild(
+                    CaretBrowsing.caretElement);
+                CaretBrowsing.caretElement = null;
+            }
+        }
+    };
+
+    CaretBrowsing.onWindowFocus = function() {
+        CaretBrowsing.isWindowFocused = true;
+        CaretBrowsing.updateIsCaretVisible();
+    };
+
+    CaretBrowsing.onWindowBlur = function() {
+        CaretBrowsing.isWindowFocused = false;
+        CaretBrowsing.updateIsCaretVisible();
+    };
+
+    CaretBrowsing.init = function() {
+        CaretBrowsing.isWindowFocused = document.hasFocus();
+
+        document.addEventListener("click", CaretBrowsing.onClick, false);
+        window.addEventListener("focus", CaretBrowsing.onWindowFocus, false);
+        window.addEventListener("blur", CaretBrowsing.onWindowBlur, false);
+    };
+
+    window.setTimeout(() => {
+        if (!window.caretBrowsingLoaded) {
+            window.caretBrowsingLoaded = true;
+            CaretBrowsing.init();
+
+            if (document.body.getAttribute("caretbrowsing") === "on") {
+                CaretBrowsing.forceEnabled = true;
+                CaretBrowsing.isEnabled = true;
+                CaretBrowsing.updateIsCaretVisible();
+            }
+        }
+    }, 0);
+
     const funcs = {};
 
     funcs.setInitialCursor = () => {
         if (!CaretBrowsing.initiated) {
             CaretBrowsing.setInitialCursor();
-        } else {
-            if (!window.getSelection().toString()) {
-                positionCaret();
-            }
-            CaretBrowsing.toggle();
+            return;
         }
-    }
+
+        if (!window.getSelection().toString()) {
+            positionCaret();
+        }
+        CaretBrowsing.toggle();
+    };
 
     funcs.toggle = () => {
         CaretBrowsing.toggle();
-    }
+    };
 
     funcs.moveRight = () => {
-        CaretBrowsing.move('right', 'character');
-    }
+        CaretBrowsing.move("right", "character");
+    };
 
     funcs.moveLeft = () => {
-        CaretBrowsing.move('left', 'character');
-    }
+        CaretBrowsing.move("left", "character");
+    };
 
     funcs.moveDown = () => {
-        CaretBrowsing.move('forward', 'line');
-    }
+        CaretBrowsing.move("forward", "line");
+    };
 
     funcs.moveUp = () => {
-        CaretBrowsing.move('backward', 'line');
-    }
+        CaretBrowsing.move("backward", "line");
+    };
 
     funcs.moveToEndOfWord = () => {
         funcs.moveToNextWord();
         funcs.moveLeft();
-    }
+    };
 
     funcs.moveToNextWord = () => {
-        CaretBrowsing.move('forward', 'word');
+        CaretBrowsing.move("forward", "word");
         funcs.moveRight();
-    }
+    };
 
     funcs.moveToPreviousWord = () => {
-        CaretBrowsing.move('backward', 'word');
-    }
+        CaretBrowsing.move("backward", "word");
+    };
 
     funcs.moveToStartOfLine = () => {
-        CaretBrowsing.move('left', 'lineboundary');
-    }
+        CaretBrowsing.move("left", "lineboundary");
+    };
 
     funcs.moveToEndOfLine = () => {
-        CaretBrowsing.move('right', 'lineboundary');
-    }
+        CaretBrowsing.move("right", "lineboundary");
+    };
 
     funcs.moveToStartOfNextBlock = () => {
-        CaretBrowsing.moveToBlock('forward', 'backward');
-    }
+        CaretBrowsing.moveToBlock("forward", "backward");
+    };
 
     funcs.moveToStartOfPrevBlock = () => {
-        CaretBrowsing.moveToBlock('backward', 'backward');
-    }
+        CaretBrowsing.moveToBlock("backward", "backward");
+    };
 
     funcs.moveToEndOfNextBlock = () => {
-        CaretBrowsing.moveToBlock('forward', 'forward');
-    }
+        CaretBrowsing.moveToBlock("forward", "forward");
+    };
 
     funcs.moveToEndOfPrevBlock = () => {
-        CaretBrowsing.moveToBlock('backward', 'forward');
-    }
+        CaretBrowsing.moveToBlock("backward", "forward");
+    };
 
     funcs.moveToStartOfDocument = () => {
-        CaretBrowsing.move('backward', 'documentboundary');
-    }
+        CaretBrowsing.move("backward", "documentboundary");
+    };
 
     funcs.moveToEndOfDocument = () => {
-        CaretBrowsing.move('forward', 'documentboundary');
-    }
+        CaretBrowsing.move("forward", "documentboundary");
+    };
 
     funcs.dropSelection = () => {
         window.getSelection().removeAllRanges();
-    }
+    };
 
-    funcs.getSelection = () => {
-        return window.getSelection().toString();
-    }
+    funcs.getSelection = () => window.getSelection().toString();
 
     funcs.toggleSelection = () => {
         CaretBrowsing.selectionEnabled = !CaretBrowsing.selectionEnabled;
-    }
+    };
 
     return funcs;
 })();

From 890e26b2b5fe39dd68f0117ab5d75103c2622d3e Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Wed, 6 Dec 2017 13:58:23 +0600
Subject: [PATCH 012/574] Additional fixes

---
 qutebrowser/browser/commands.py               | 3 +++
 qutebrowser/browser/webengine/webenginetab.py | 2 +-
 qutebrowser/browser/webkit/webkittab.py       | 3 ++-
 qutebrowser/javascript/webengine_caret.js     | 1 +
 tests/end2end/features/test_caret_bdd.py      | 2 +-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 476bf1693..09da845f0 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -65,6 +65,8 @@ class CommandDispatcher:
     def __init__(self, win_id, tabbed_browser):
         self._win_id = win_id
         self._tabbed_browser = tabbed_browser
+        self.yank_object = {}
+        self.userscript_object = {}
 
     def __repr__(self):
         return utils.get_repr(self)
@@ -883,6 +885,7 @@ class CommandDispatcher:
             message.info("{} {} yanked to {}".format(
                 len(s), "char" if len(s) == 1 else "chars", target))
             if not self.yank_object['keep']:
+                log.procs.debug(self.yank_object['keep'])
                 modeman.leave(self._win_id, KeyMode.caret, "yank selected",
                               maybe=True)
         self.yank_object = None
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 8f71d5b1c..977e3a2c1 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -184,6 +184,7 @@ class WebEngineCaret(browsertab.AbstractCaret):
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_left(self):
+        self.drop_selection()
         self._tab.run_js_async(
             javascript.assemble('caret', 'toggle'))
 
@@ -284,7 +285,6 @@ class WebEngineCaret(browsertab.AbstractCaret):
             # https://bugreports.qt.io/browse/QTBUG-53134
             self._tab.run_js_async(
                 'window.getSelection().toString()', callback)
-            self.drop_selection()
 
     def _follow_selected_cb(self, js_elem, tab=False):
         """Callback for javascript which clicks the selected element.
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index a1aeee698..fa77627f9 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -338,7 +338,8 @@ class WebKitCaret(browsertab.AbstractCaret):
     def selection(self, html=False, callback=False):
         if html:
             callback(self._widget.selectedHtml())
-        callback(self._widget.selectedText())
+        else:
+            callback(self._widget.selectedText())
 
     def follow_selected(self, *, tab=False):
         if not self.has_selection():
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index e6f71d44f..d4d7e5a96 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1051,6 +1051,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
 
     funcs.moveToEndOfDocument = () => {
         CaretBrowsing.move("forward", "documentboundary");
+        window.scrollTo(0, document.body.scrollHeight);
     };
 
     funcs.dropSelection = () => {
diff --git a/tests/end2end/features/test_caret_bdd.py b/tests/end2end/features/test_caret_bdd.py
index 97b18434b..ee6cda82c 100644
--- a/tests/end2end/features/test_caret_bdd.py
+++ b/tests/end2end/features/test_caret_bdd.py
@@ -17,10 +17,10 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
+# pylint: disable=unused-import
 import pytest
 import pytest_bdd as bdd
 
-# pylint: disable=unused-import
 from end2end.features.test_yankpaste_bdd import init_fake_clipboard
 
 bdd.scenarios('caret.feature')

From d4001a4a982d05af102cfa9a5a6427d19f91198e Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Wed, 6 Dec 2017 22:37:00 -0500
Subject: [PATCH 013/574] Add support for hinting elements from within
 same-origin frames

---
 qutebrowser/javascript/webelem.js    | 46 +++++++++++++++++++++++-----
 tests/end2end/features/hints.feature |  2 --
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index b5fd936b2..f8aed2983 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -40,7 +40,7 @@ window._qutebrowser.webelem = (function() {
     const funcs = {};
     const elements = [];
 
-    function serialize_elem(elem) {
+    function serialize_elem(elem, frame = null) {
         if (!elem) {
             return null;
         }
@@ -55,7 +55,7 @@ window._qutebrowser.webelem = (function() {
         try {
             caret_position = elem.selectionStart;
         } catch (err) {
-            if (err instanceof DOMException &&
+            if (err.constructor.name === "DOMException" &&
                     err.name === "InvalidStateError") {
                 // nothing to do, caret_position is already null
             } else {
@@ -102,15 +102,25 @@ window._qutebrowser.webelem = (function() {
         out.attributes = attributes;
 
         const client_rects = elem.getClientRects();
+
+        // Get location of frame and add it to element
+        // TODO How to generate a 0 object without this
+        let frame_offset_rect = null;
+        if (frame === null) {
+            frame_offset_rect = document.head.getBoundingClientRect();
+        } else {
+            frame_offset_rect = frame.getBoundingClientRect();
+        }
+
         for (let k = 0; k < client_rects.length; ++k) {
             const rect = client_rects[k];
             out.rects.push({
-                "top": rect.top,
-                "right": rect.right,
-                "bottom": rect.bottom,
-                "left": rect.left,
-                "height": rect.height,
-                "width": rect.width,
+                "top": rect.top + frame_offset_rect.top,
+                "right": rect.right + frame_offset_rect.right,
+                "bottom": rect.bottom + frame_offset_rect.bottom,
+                "left": rect.left + frame_offset_rect.left,
+                "height": rect.height + frame_offset_rect.height,
+                "width": rect.width + frame_offset_rect.width,
             });
         }
 
@@ -163,6 +173,7 @@ window._qutebrowser.webelem = (function() {
 
     funcs.find_css = (selector, only_visible) => {
         const elems = document.querySelectorAll(selector);
+        const subelem_frames = window.frames;
         const out = [];
 
         for (let i = 0; i < elems.length; ++i) {
@@ -171,6 +182,25 @@ window._qutebrowser.webelem = (function() {
             }
         }
 
+        // Recurse into frames and add them
+        for (let i = 0; i < subelem_frames.length; i++) {
+            try {
+                subelem_frames[i].document;
+            } catch (err) {
+                // If we have a cross-origin frame, skip it.
+                continue;
+            }
+
+            const subelems = subelem_frames[i].document.
+                querySelectorAll(selector);
+            const frame = subelem_frames[i].frameElement;
+            for (let elem_num = 0; elem_num < subelems.length; ++elem_num) {
+                if (!only_visible || is_visible(subelems[elem_num])) {
+                    out.push(serialize_elem(subelems[elem_num], frame));
+                }
+            }
+        }
+
         return out;
     };
 
diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature
index 0151a14ad..0f7868e31 100644
--- a/tests/end2end/features/hints.feature
+++ b/tests/end2end/features/hints.feature
@@ -204,8 +204,6 @@ Feature: Using hints
         Then the javascript message "contents: existingnew" should be logged
 
     ### iframes
-
-    @qtwebengine_todo: Hinting in iframes is not implemented yet
     Scenario: Using :follow-hint inside an iframe
         When I open data/hints/iframe.html
         And I hint with args "links normal" and follow a

From 5f1e0224a981e06e06d9611275b5b4b2f685f944 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 7 Dec 2017 17:30:32 +0600
Subject: [PATCH 014/574] Pass caret tests

---
 qutebrowser/browser/commands.py               | 1 -
 qutebrowser/browser/webengine/webenginetab.py | 2 +-
 qutebrowser/javascript/webengine_caret.js     | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 09da845f0..cb744b23d 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -885,7 +885,6 @@ class CommandDispatcher:
             message.info("{} {} yanked to {}".format(
                 len(s), "char" if len(s) == 1 else "chars", target))
             if not self.yank_object['keep']:
-                log.procs.debug(self.yank_object['keep'])
                 modeman.leave(self._win_id, KeyMode.caret, "yank selected",
                               maybe=True)
         self.yank_object = None
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 977e3a2c1..2e300296b 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -284,7 +284,7 @@ class WebEngineCaret(browsertab.AbstractCaret):
             # WORKAROUND for
             # https://bugreports.qt.io/browse/QTBUG-53134
             self._tab.run_js_async(
-                'window.getSelection().toString()', callback)
+                javascript.assemble('caret', 'getSelection'), callback)
 
     def _follow_selected_cb(self, js_elem, tab=False):
         """Callback for javascript which clicks the selected element.
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index d4d7e5a96..7235c9772 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1051,7 +1051,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
 
     funcs.moveToEndOfDocument = () => {
         CaretBrowsing.move("forward", "documentboundary");
-        window.scrollTo(0, document.body.scrollHeight);
+        funcs.moveLeft();
     };
 
     funcs.dropSelection = () => {

From a8d79fedf381b89114bafa78334971e6e432c2ec Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 7 Dec 2017 17:45:05 +0600
Subject: [PATCH 015/574] Fix fetching selection

---
 qutebrowser/browser/webkit/webkittab.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index fa77627f9..8c63c9ef8 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -160,7 +160,7 @@ class WebKitCaret(browsertab.AbstractCaret):
 
         settings = self._widget.settings()
         settings.setAttribute(QWebSettings.CaretBrowsingEnabled, True)
-        self.selection_enabled = bool(self.selection())
+        self.selection_enabled = bool(self._selection())
 
         if self._widget.isVisible():
             # Sometimes the caret isn't immediately visible, but unfocusing
@@ -173,7 +173,7 @@ class WebKitCaret(browsertab.AbstractCaret):
             #
             # Note: We can't use hasSelection() here, as that's always
             # true in caret mode.
-            if not self.selection():
+            if not self.selection_enabled:
                 self._widget.page().currentFrame().evaluateJavaScript(
                     utils.read_file('javascript/position_caret.js'))
 
@@ -336,10 +336,13 @@ class WebKitCaret(browsertab.AbstractCaret):
         return self._widget.hasSelection()
 
     def selection(self, html=False, callback=False):
+        callback(self._selection(html))
+
+    def _selection(self, html=False):
         if html:
-            callback(self._widget.selectedHtml())
+            return self._widget.selectedHtml()
         else:
-            callback(self._widget.selectedText())
+            return self._widget.selectedText()
 
     def follow_selected(self, *, tab=False):
         if not self.has_selection():
@@ -351,7 +354,7 @@ class WebKitCaret(browsertab.AbstractCaret):
             self._tab.run_js_async(
                 'window.getSelection().anchorNode.parentNode.click()')
         else:
-            selection = self.selection(html=True)
+            selection = self._selection(html=True)
             try:
                 selected_element = xml.etree.ElementTree.fromstring(
                     '<html>{}</html>'.format(selection)).find('a')

From c737d7ab2237f9fb768367fd55090e870ab1c22b Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Thu, 7 Dec 2017 12:47:51 -0500
Subject: [PATCH 016/574] Fix various js problems with frame support

---
 qutebrowser/javascript/webelem.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index f8aed2983..51005f882 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -55,7 +55,9 @@ window._qutebrowser.webelem = (function() {
         try {
             caret_position = elem.selectionStart;
         } catch (err) {
-            if (err.constructor.name === "DOMException" &&
+            if ((err instanceof DOMException ||
+                 (frame !== null &&
+                  err instanceof frame.DOMException)) &&
                     err.name === "InvalidStateError") {
                 // nothing to do, caret_position is already null
             } else {
@@ -107,9 +109,17 @@ window._qutebrowser.webelem = (function() {
         // TODO How to generate a 0 object without this
         let frame_offset_rect = null;
         if (frame === null) {
-            frame_offset_rect = document.head.getBoundingClientRect();
+            // Dummy object with zero offset
+            frame_offset_rect = {
+                "top": 0,
+                "right": 0,
+                "bottom": 0,
+                "left": 0,
+                "height": 0,
+                "width": 0,
+            };
         } else {
-            frame_offset_rect = frame.getBoundingClientRect();
+            frame_offset_rect = frame.frameElement.getBoundingClientRect();
         }
 
         for (let k = 0; k < client_rects.length; ++k) {
@@ -193,7 +203,7 @@ window._qutebrowser.webelem = (function() {
 
             const subelems = subelem_frames[i].document.
                 querySelectorAll(selector);
-            const frame = subelem_frames[i].frameElement;
+            const frame = subelem_frames[i];
             for (let elem_num = 0; elem_num < subelems.length; ++elem_num) {
                 if (!only_visible || is_visible(subelems[elem_num])) {
                     out.push(serialize_elem(subelems[elem_num], frame));

From 052823b74cacb06db9edd6c67be919801aa7640c Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Thu, 7 Dec 2017 13:03:06 -0500
Subject: [PATCH 017/574] Fix broken width and height location in frames

---
 qutebrowser/javascript/webelem.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index 51005f882..eeded152d 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -129,8 +129,8 @@ window._qutebrowser.webelem = (function() {
                 "right": rect.right + frame_offset_rect.right,
                 "bottom": rect.bottom + frame_offset_rect.bottom,
                 "left": rect.left + frame_offset_rect.left,
-                "height": rect.height + frame_offset_rect.height,
-                "width": rect.width + frame_offset_rect.width,
+                "height": rect.height,
+                "width": rect.width,
             });
         }
 

From 0fc99108bf57ce568d2dd91636779e0b133f2bb4 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Thu, 7 Dec 2017 14:21:44 -0500
Subject: [PATCH 018/574] Implement iframe support for clicking elements

---
 qutebrowser/javascript/webelem.js | 78 +++++++++++++++++++++++--------
 1 file changed, 58 insertions(+), 20 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index eeded152d..8fb5ae1ea 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -181,6 +181,17 @@ window._qutebrowser.webelem = (function() {
         return true;
     }
 
+    // Returns true if the iframe is accessible without
+    // cross domain errors, else false.
+    function iframe_same_domain(frame) {
+        try {
+            frame.document;
+            return true;
+        } catch (err) {
+            return false;
+        }
+    }
+
     funcs.find_css = (selector, only_visible) => {
         const elems = document.querySelectorAll(selector);
         const subelem_frames = window.frames;
@@ -194,19 +205,14 @@ window._qutebrowser.webelem = (function() {
 
         // Recurse into frames and add them
         for (let i = 0; i < subelem_frames.length; i++) {
-            try {
-                subelem_frames[i].document;
-            } catch (err) {
-                // If we have a cross-origin frame, skip it.
-                continue;
-            }
-
-            const subelems = subelem_frames[i].document.
-                querySelectorAll(selector);
-            const frame = subelem_frames[i];
-            for (let elem_num = 0; elem_num < subelems.length; ++elem_num) {
-                if (!only_visible || is_visible(subelems[elem_num])) {
-                    out.push(serialize_elem(subelems[elem_num], frame));
+            if (iframe_same_domain(subelem_frames[i])) {
+                const subelems = subelem_frames[i].document.
+                    querySelectorAll(selector);
+                const frame = subelem_frames[i];
+                for (let elem_num = 0; elem_num < subelems.length; ++elem_num) {
+                    if (!only_visible || is_visible(subelems[elem_num])) {
+                        out.push(serialize_elem(subelems[elem_num], frame));
+                    }
                 }
             }
         }
@@ -219,6 +225,20 @@ window._qutebrowser.webelem = (function() {
         return serialize_elem(elem);
     };
 
+    // Check if elem is an iframe, and if so, run func on it.
+    // If no iframes match, return null
+    function run_in_iframes(elem, func) {
+        for (let i = 0; i < window.frames.length; ++i) {
+            if (iframe_same_domain(window.frames[i])) {
+                const frame = window.frames[i];
+                if (frame.frameElement === elem) {
+                    return func(frame);
+                }
+            }
+        }
+        return null;
+    }
+
     funcs.find_focused = () => {
         const elem = document.activeElement;
 
@@ -228,17 +248,35 @@ window._qutebrowser.webelem = (function() {
             return null;
         }
 
-        return serialize_elem(elem);
+        // Check if we got an iframe, and if so, recurse inside of it
+        const frame_elem = run_in_iframes(elem,
+            (frame) => serialize_elem(frame.document.activeElement, frame));
+
+        if (frame_elem === null) {
+            return serialize_elem(elem);
+        }
+        return frame_elem;
     };
 
     funcs.find_at_pos = (x, y) => {
-        // FIXME:qtwebengine
-        // If the element at the specified point belongs to another document
-        // (for example, an iframe's subdocument), the subdocument's parent
-        // element is returned (the iframe itself).
-
         const elem = document.elementFromPoint(x, y);
-        return serialize_elem(elem);
+
+
+        // Check if we got an iframe, and if so, recurse inside of it
+        const frame_elem = run_in_iframes(elem,
+            (frame) => {
+                // Subtract offsets due to being in an iframe
+                const frame_offset_rect =
+                      frame.frameElement.getBoundingClientRect();
+                return serialize_elem(frame.document.
+                    elementFromPoint(x - frame_offset_rect.left,
+                        y - frame_offset_rect.top), frame);
+            });
+
+        if (frame_elem === null) {
+            return serialize_elem(elem);
+        }
+        return frame_elem;
     };
 
     // Function for returning a selection to python (so we can click it)

From 825939633a8482beb7dd89f69d9c8585f2906244 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Thu, 7 Dec 2017 14:46:18 -0500
Subject: [PATCH 019/574] Implement follow_selected in frames

---
 qutebrowser/javascript/webelem.js | 38 ++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index 8fb5ae1ea..8ce59d5e6 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -227,7 +227,7 @@ window._qutebrowser.webelem = (function() {
 
     // Check if elem is an iframe, and if so, run func on it.
     // If no iframes match, return null
-    function run_in_iframes(elem, func) {
+    function replace_elem_frame(elem, func) {
         for (let i = 0; i < window.frames.length; ++i) {
             if (iframe_same_domain(window.frames[i])) {
                 const frame = window.frames[i];
@@ -239,6 +239,20 @@ window._qutebrowser.webelem = (function() {
         return null;
     }
 
+    // Runs a function in a frame until the result is not null, then return
+    function run_frames(func) {
+        for (let i = 0; i < window.frames.length; ++i) {
+            if (iframe_same_domain(window.frames[i])) {
+                const frame = window.frames[i];
+                const result = func(frame);
+                if (result) {
+                    return result;
+                }
+            }
+        }
+        return null;
+    }
+
     funcs.find_focused = () => {
         const elem = document.activeElement;
 
@@ -249,7 +263,7 @@ window._qutebrowser.webelem = (function() {
         }
 
         // Check if we got an iframe, and if so, recurse inside of it
-        const frame_elem = run_in_iframes(elem,
+        const frame_elem = replace_elem_frame(elem,
             (frame) => serialize_elem(frame.document.activeElement, frame));
 
         if (frame_elem === null) {
@@ -263,7 +277,7 @@ window._qutebrowser.webelem = (function() {
 
 
         // Check if we got an iframe, and if so, recurse inside of it
-        const frame_elem = run_in_iframes(elem,
+        const frame_elem = replace_elem_frame(elem,
             (frame) => {
                 // Subtract offsets due to being in an iframe
                 const frame_offset_rect =
@@ -282,10 +296,22 @@ window._qutebrowser.webelem = (function() {
     // Function for returning a selection to python (so we can click it)
     funcs.find_selected_link = () => {
         const elem = window.getSelection().anchorNode;
-        if (!elem) {
-            return null;
+        if (elem) {
+            return serialize_elem(elem.parentNode);
         }
-        return serialize_elem(elem.parentNode);
+
+        const serialized_frame_elem = run_frames((frame) => {
+            const node = frame.window.getSelection().anchorNode;
+            if (node) {
+                return serialize_elem(node.parentNode, frame);
+            }
+            return null;
+        });
+
+        if (serialized_frame_elem) {
+            return serialized_frame_elem;
+        }
+        return null;
     };
 
     funcs.set_value = (id, value) => {

From 5c5f9928219f1d72942ed7ddd55c7a2e1549e406 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Thu, 7 Dec 2017 14:53:15 -0500
Subject: [PATCH 020/574] Implement find_id inside frames

Fixes :click-element
---
 qutebrowser/javascript/webelem.js | 46 +++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index 8ce59d5e6..167634721 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -220,9 +220,39 @@ window._qutebrowser.webelem = (function() {
         return out;
     };
 
+    // Runs a function in a frame until the result is not null, then return
+    function run_frames(func) {
+        for (let i = 0; i < window.frames.length; ++i) {
+            if (iframe_same_domain(window.frames[i])) {
+                const frame = window.frames[i];
+                const result = func(frame);
+                if (result) {
+                    return result;
+                }
+            }
+        }
+        return null;
+    }
+
     funcs.find_id = (id) => {
         const elem = document.getElementById(id);
-        return serialize_elem(elem);
+        if (elem) {
+            return serialize_elem(elem);
+        }
+
+        const serialized_elem = run_frames((frame) => {
+            const element = frame.window.document.getElementById(id);
+            if (element) {
+                return serialize_elem(element, frame);
+            }
+            return null;
+        });
+
+        if (serialized_elem) {
+            return serialized_elem;
+        }
+
+        return null;
     };
 
     // Check if elem is an iframe, and if so, run func on it.
@@ -239,20 +269,6 @@ window._qutebrowser.webelem = (function() {
         return null;
     }
 
-    // Runs a function in a frame until the result is not null, then return
-    function run_frames(func) {
-        for (let i = 0; i < window.frames.length; ++i) {
-            if (iframe_same_domain(window.frames[i])) {
-                const frame = window.frames[i];
-                const result = func(frame);
-                if (result) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
     funcs.find_focused = () => {
         const elem = document.activeElement;
 

From 2898c416aa974eaed08da3af9d0f84b03c58b8b1 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Fri, 15 Dec 2017 15:16:18 -0500
Subject: [PATCH 021/574] Simplify and clean up frame logic

---
 qutebrowser/javascript/webelem.js | 34 ++++++++++++-------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index 167634721..ae2e2ca5c 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -105,8 +105,7 @@ window._qutebrowser.webelem = (function() {
 
         const client_rects = elem.getClientRects();
 
-        // Get location of frame and add it to element
-        // TODO How to generate a 0 object without this
+        // Get location of frame if it exists and add it to element
         let frame_offset_rect = null;
         if (frame === null) {
             // Dummy object with zero offset
@@ -206,9 +205,9 @@ window._qutebrowser.webelem = (function() {
         // Recurse into frames and add them
         for (let i = 0; i < subelem_frames.length; i++) {
             if (iframe_same_domain(subelem_frames[i])) {
-                const subelems = subelem_frames[i].document.
-                    querySelectorAll(selector);
                 const frame = subelem_frames[i];
+                const subelems = frame.document.
+                    querySelectorAll(selector);
                 for (let elem_num = 0; elem_num < subelems.length; ++elem_num) {
                     if (!only_visible || is_visible(subelems[elem_num])) {
                         out.push(serialize_elem(subelems[elem_num], frame));
@@ -223,8 +222,8 @@ window._qutebrowser.webelem = (function() {
     // Runs a function in a frame until the result is not null, then return
     function run_frames(func) {
         for (let i = 0; i < window.frames.length; ++i) {
-            if (iframe_same_domain(window.frames[i])) {
-                const frame = window.frames[i];
+            const frame = window.frames[i];
+            if (iframe_same_domain(frame)) {
                 const result = func(frame);
                 if (result) {
                     return result;
@@ -242,10 +241,7 @@ window._qutebrowser.webelem = (function() {
 
         const serialized_elem = run_frames((frame) => {
             const element = frame.window.document.getElementById(id);
-            if (element) {
-                return serialize_elem(element, frame);
-            }
-            return null;
+            return serialize_elem(element, frame);
         });
 
         if (serialized_elem) {
@@ -255,12 +251,12 @@ window._qutebrowser.webelem = (function() {
         return null;
     };
 
-    // Check if elem is an iframe, and if so, run func on it.
+    // Check if elem is an iframe, and if so, return the result of func on it.
     // If no iframes match, return null
-    function replace_elem_frame(elem, func) {
+    function call_if_frame(elem, func) {
         for (let i = 0; i < window.frames.length; ++i) {
-            if (iframe_same_domain(window.frames[i])) {
-                const frame = window.frames[i];
+            const frame = window.frames[i];
+            if (iframe_same_domain(frame)) {
                 if (frame.frameElement === elem) {
                     return func(frame);
                 }
@@ -279,7 +275,7 @@ window._qutebrowser.webelem = (function() {
         }
 
         // Check if we got an iframe, and if so, recurse inside of it
-        const frame_elem = replace_elem_frame(elem,
+        const frame_elem = call_if_frame(elem,
             (frame) => serialize_elem(frame.document.activeElement, frame));
 
         if (frame_elem === null) {
@@ -293,7 +289,7 @@ window._qutebrowser.webelem = (function() {
 
 
         // Check if we got an iframe, and if so, recurse inside of it
-        const frame_elem = replace_elem_frame(elem,
+        const frame_elem = call_if_frame(elem,
             (frame) => {
                 // Subtract offsets due to being in an iframe
                 const frame_offset_rect =
@@ -323,11 +319,7 @@ window._qutebrowser.webelem = (function() {
             }
             return null;
         });
-
-        if (serialized_frame_elem) {
-            return serialized_frame_elem;
-        }
-        return null;
+        return serialized_frame_elem;
     };
 
     funcs.set_value = (id, value) => {

From 7f9d4888fd3370628b5038f8591424f8d822daf7 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Fri, 15 Dec 2017 15:42:48 -0500
Subject: [PATCH 022/574] Fix a couple eslint errors

Restructure serialize_elem into a bunch of smaller functions
---
 qutebrowser/javascript/.eslintrc.yaml |  1 +
 qutebrowser/javascript/webelem.js     | 73 ++++++++++++++-------------
 2 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/qutebrowser/javascript/.eslintrc.yaml b/qutebrowser/javascript/.eslintrc.yaml
index b29deaa75..d46fec8ee 100644
--- a/qutebrowser/javascript/.eslintrc.yaml
+++ b/qutebrowser/javascript/.eslintrc.yaml
@@ -42,3 +42,4 @@ rules:
      function-paren-newline: "off"
      multiline-comment-style: "off"
      no-bitwise: "off"
+     no-ternary: "off"
diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index ae2e2ca5c..12459f148 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -40,6 +40,41 @@ window._qutebrowser.webelem = (function() {
     const funcs = {};
     const elements = [];
 
+    function get_frame_offset(frame) {
+        if (frame === null) {
+            // Dummy object with zero offset
+            return {
+                "top": 0,
+                "right": 0,
+                "bottom": 0,
+                "left": 0,
+                "height": 0,
+                "width": 0,
+            };
+        }
+        return frame.frameElement.getBoundingClientRect();
+    }
+
+    function get_caret_position(elem, frame) {
+        // With older Chromium versions (and QtWebKit), InvalidStateError will
+        // be thrown if elem doesn't have selectionStart.
+        // With newer Chromium versions (>= Qt 5.10), we get null.
+        try {
+            return elem.selectionStart;
+        } catch (err) {
+            if (err instanceof (frame
+                ? frame.DOMException
+                : DOMException) &&
+                err.name === "InvalidStateError") {
+                // nothing to do, caret_position is already null
+            } else {
+                // not the droid we're looking for
+                throw err;
+            }
+        }
+        return null;
+    }
+
     function serialize_elem(elem, frame = null) {
         if (!elem) {
             return null;
@@ -48,23 +83,7 @@ window._qutebrowser.webelem = (function() {
         const id = elements.length;
         elements[id] = elem;
 
-        // With older Chromium versions (and QtWebKit), InvalidStateError will
-        // be thrown if elem doesn't have selectionStart.
-        // With newer Chromium versions (>= Qt 5.10), we get null.
-        let caret_position = null;
-        try {
-            caret_position = elem.selectionStart;
-        } catch (err) {
-            if ((err instanceof DOMException ||
-                 (frame !== null &&
-                  err instanceof frame.DOMException)) &&
-                    err.name === "InvalidStateError") {
-                // nothing to do, caret_position is already null
-            } else {
-                // not the droid we're looking for
-                throw err;
-            }
-        }
+        const caret_position = get_caret_position(elem, frame);
 
         const out = {
             "id": id,
@@ -73,7 +92,6 @@ window._qutebrowser.webelem = (function() {
             "rects": [],  // Gets filled up later
             "caret_position": caret_position,
         };
-
         // https://github.com/qutebrowser/qutebrowser/issues/2569
         if (typeof elem.tagName === "string") {
             out.tag_name = elem.tagName;
@@ -104,22 +122,7 @@ window._qutebrowser.webelem = (function() {
         out.attributes = attributes;
 
         const client_rects = elem.getClientRects();
-
-        // Get location of frame if it exists and add it to element
-        let frame_offset_rect = null;
-        if (frame === null) {
-            // Dummy object with zero offset
-            frame_offset_rect = {
-                "top": 0,
-                "right": 0,
-                "bottom": 0,
-                "left": 0,
-                "height": 0,
-                "width": 0,
-            };
-        } else {
-            frame_offset_rect = frame.frameElement.getBoundingClientRect();
-        }
+        const frame_offset_rect = get_frame_offset(frame);
 
         for (let k = 0; k < client_rects.length; ++k) {
             const rect = client_rects[k];
@@ -184,7 +187,7 @@ window._qutebrowser.webelem = (function() {
     // cross domain errors, else false.
     function iframe_same_domain(frame) {
         try {
-            frame.document;
+            frame.document; // eslint-disable-line no-unused-expressions
             return true;
         } catch (err) {
             return false;

From 6433096611cd99477f730312282da4711bc8b6e3 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Fri, 15 Dec 2017 21:30:08 -0500
Subject: [PATCH 023/574] Disable max-lines in eslint

---
 qutebrowser/javascript/.eslintrc.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qutebrowser/javascript/.eslintrc.yaml b/qutebrowser/javascript/.eslintrc.yaml
index d46fec8ee..5382f053e 100644
--- a/qutebrowser/javascript/.eslintrc.yaml
+++ b/qutebrowser/javascript/.eslintrc.yaml
@@ -43,3 +43,4 @@ rules:
      multiline-comment-style: "off"
      no-bitwise: "off"
      no-ternary: "off"
+     max-lines: "off"

From 344ebed6ad2894b7152b0fc4f71a7c4eda00a0db Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Mon, 18 Dec 2017 11:00:03 -0800
Subject: [PATCH 024/574] Add iframe tests for insert on click and
 follow-selected

---
 tests/end2end/data/hints/html/wrapped.html    |  1 -
 .../data/hints/html/wrapped_button.html       | 23 +++++++++++++++++++
 tests/end2end/data/hints/iframe_button.html   | 11 +++++++++
 tests/end2end/data/hints/iframe_input.html    | 11 +++++++++
 tests/end2end/data/iframe_search.html         | 11 +++++++++
 tests/end2end/features/hints.feature          | 14 ++++++++++-
 tests/end2end/features/search.feature         | 19 +++++++++++++++
 7 files changed, 88 insertions(+), 2 deletions(-)
 create mode 100644 tests/end2end/data/hints/html/wrapped_button.html
 create mode 100644 tests/end2end/data/hints/iframe_button.html
 create mode 100644 tests/end2end/data/hints/iframe_input.html
 create mode 100644 tests/end2end/data/iframe_search.html

diff --git a/tests/end2end/data/hints/html/wrapped.html b/tests/end2end/data/hints/html/wrapped.html
index 2ebde1a24..2af1a28c1 100644
--- a/tests/end2end/data/hints/html/wrapped.html
+++ b/tests/end2end/data/hints/html/wrapped.html
@@ -2,7 +2,6 @@
 
 <!--
 target: hello.txt
-qtwebengine_todo: Doesn't seem to work?
 -->
 
 <html>
diff --git a/tests/end2end/data/hints/html/wrapped_button.html b/tests/end2end/data/hints/html/wrapped_button.html
new file mode 100644
index 000000000..dc96bd1d5
--- /dev/null
+++ b/tests/end2end/data/hints/html/wrapped_button.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+
+<!--
+target: hello.txt
+-->
+
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>Link wrapped across multiple lines</title>
+    </head>
+    <body>
+        <div style="width: 20em;">
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis <button id="myButton" class="float-left submit-button" >nostrud exercitation</button> ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+        </div>
+
+        <script type="text/javascript">
+            document.getElementById("myButton").onclick = function () {
+                location.href = "/data/hello.txt";
+            };
+        </script>
+    </body>
+</html>
diff --git a/tests/end2end/data/hints/iframe_button.html b/tests/end2end/data/hints/iframe_button.html
new file mode 100644
index 000000000..cd7bf203c
--- /dev/null
+++ b/tests/end2end/data/hints/iframe_button.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>Hinting inside an iframe</title>
+    </head>
+    <body>
+        <iframe style="margin: 50px;" src="/data/hints/html/wrapped_button.html"></iframe>
+    </body>
+</html>
diff --git a/tests/end2end/data/hints/iframe_input.html b/tests/end2end/data/hints/iframe_input.html
new file mode 100644
index 000000000..143577747
--- /dev/null
+++ b/tests/end2end/data/hints/iframe_input.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>Hinting inside an iframe</title>
+    </head>
+    <body>
+        <iframe style="margin: 50px;" src="/data/hints/input.html"></iframe>
+    </body>
+</html>
diff --git a/tests/end2end/data/iframe_search.html b/tests/end2end/data/iframe_search.html
new file mode 100644
index 000000000..a06c0ef3e
--- /dev/null
+++ b/tests/end2end/data/iframe_search.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>Hinting inside an iframe</title>
+    </head>
+    <body>
+        <iframe style="margin: 50px;" src="/data/search.html"></iframe>
+    </body>
+</html>
diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature
index 0f7868e31..f575d0423 100644
--- a/tests/end2end/features/hints.feature
+++ b/tests/end2end/features/hints.feature
@@ -209,6 +209,19 @@ Feature: Using hints
         And I hint with args "links normal" and follow a
         Then "navigation request: url http://localhost:*/data/hello.txt, type NavigationTypeLinkClicked, *" should be logged
 
+    Scenario: Using :follow-hint inside an iframe button
+        When I open data/hints/iframe_button.html
+        And I hint with args "all normal" and follow s
+        Then "navigation request: url http://localhost:*/data/hello.txt, type NavigationTypeLinkClicked, *" should be logged
+
+    Scenario: Hinting inputs in an iframe without type
+        When I open data/hints/iframe_input.html
+        And I hint with args "inputs" and follow a
+        And I wait for "Entering mode KeyMode.insert (reason: clicking input)" in the log
+        And I run :leave-mode
+        # The actual check is already done above
+        Then no crash should happen
+
     ### FIXME currenly skipped, see https://github.com/qutebrowser/qutebrowser/issues/1525
     @xfail_norun
     Scenario: Using :follow-hint inside a scrolled iframe
@@ -218,7 +231,6 @@ Feature: Using hints
         And I hint wht args "links normal" and follow a
         Then "navigation request: url http://localhost:*/data/hello2.txt, type NavigationTypeLinkClicked, *" should be logged
 
-    @qtwebengine_skip: Opens in new tab due to Chromium bug
     Scenario: Opening a link inside a specific iframe
         When I open data/hints/iframe_target.html
         And I hint with args "links normal" and follow a
diff --git a/tests/end2end/features/search.feature b/tests/end2end/features/search.feature
index 3778f963d..483bcc29f 100644
--- a/tests/end2end/features/search.feature
+++ b/tests/end2end/features/search.feature
@@ -238,3 +238,22 @@ Feature: Searching on a page
         Then the following tabs should be open:
             - data/search.html
             - data/hello.txt (active)
+
+    Scenario: Follow a searched link in an iframe
+        When I open data/iframe_search.html
+        And I run :tab-only
+        And I run :search follow
+        And I wait for "search found follow" in the log
+        And I run :follow-selected
+        Then "navigation request: url http://localhost:*/data/hello.txt, type NavigationTypeLinkClicked, is_main_frame False" should be logged
+
+    Scenario: Follow a tabbed searched link in an iframe
+        When I open data/iframe_search.html
+        And I run :tab-only
+        And I run :search follow
+        And I wait for "search found follow" in the log
+        And I run :follow-selected -t
+        And I wait until data/hello.txt is loaded
+        Then the following tabs should be open:
+            - data/iframe_search.html
+            - data/hello.txt (active)

From b87f0b6f65d5ca7d05426ee3397fb724e667834a Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Mon, 18 Dec 2017 17:04:50 -0800
Subject: [PATCH 025/574] Add support for non-link buttons to test_hints

---
 tests/end2end/test_hints_html.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/end2end/test_hints_html.py b/tests/end2end/test_hints_html.py
index abc106505..ff4837020 100644
--- a/tests/end2end/test_hints_html.py
+++ b/tests/end2end/test_hints_html.py
@@ -106,7 +106,11 @@ def test_hints(test_name, zoom_text_only, zoom_level, find_implementation,
         quteproc.set_setting('hints.find_implementation', find_implementation)
     quteproc.send_cmd(':zoom {}'.format(zoom_level))
     # follow hint
-    quteproc.send_cmd(':hint links normal')
+    if 'button' in test_name:
+        # We are hinting buttons, link hinting will not work
+        quteproc.send_cmd(':hint all normal')
+    else:
+        quteproc.send_cmd(':hint links normal')
     quteproc.wait_for(message='hints: a', category='hints')
     quteproc.send_cmd(':follow-hint a')
     quteproc.wait_for_load_finished('data/' + parsed.target)

From 012e63520f5ba90b9ab8c91754aa160010825954 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Mon, 18 Dec 2017 18:20:25 -0800
Subject: [PATCH 026/574] Blacklist non-implemented qtwebkit frame features

---
 tests/end2end/features/hints.feature  | 3 ++-
 tests/end2end/features/search.feature | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature
index f575d0423..5da03a085 100644
--- a/tests/end2end/features/hints.feature
+++ b/tests/end2end/features/hints.feature
@@ -212,7 +212,7 @@ Feature: Using hints
     Scenario: Using :follow-hint inside an iframe button
         When I open data/hints/iframe_button.html
         And I hint with args "all normal" and follow s
-        Then "navigation request: url http://localhost:*/data/hello.txt, type NavigationTypeLinkClicked, *" should be logged
+        Then "navigation request: url http://localhost:*/data/hello.txt, *" should be logged
 
     Scenario: Hinting inputs in an iframe without type
         When I open data/hints/iframe_input.html
@@ -241,6 +241,7 @@ Feature: Using hints
         And I run :tab-only
         And I hint with args "links tab" and follow a
         And I wait until data/hello.txt is loaded
+        And I wait 0.5s
         Then the following tabs should be open:
             - data/hints/iframe_target.html
             - data/hello.txt (active)
diff --git a/tests/end2end/features/search.feature b/tests/end2end/features/search.feature
index 483bcc29f..7779ff28e 100644
--- a/tests/end2end/features/search.feature
+++ b/tests/end2end/features/search.feature
@@ -239,6 +239,7 @@ Feature: Searching on a page
             - data/search.html
             - data/hello.txt (active)
 
+    @qtwebkit_skip: Not supported in qtwebkit
     Scenario: Follow a searched link in an iframe
         When I open data/iframe_search.html
         And I run :tab-only
@@ -247,6 +248,7 @@ Feature: Searching on a page
         And I run :follow-selected
         Then "navigation request: url http://localhost:*/data/hello.txt, type NavigationTypeLinkClicked, is_main_frame False" should be logged
 
+    @qtwebkit_skip: Not supported in qtwebkit
     Scenario: Follow a tabbed searched link in an iframe
         When I open data/iframe_search.html
         And I run :tab-only

From c8ae405bfe7dd3a0b583013ed1b894c71186e4c7 Mon Sep 17 00:00:00 2001
From: seebye <seebye@users.noreply.github.com>
Date: Wed, 20 Dec 2017 00:10:21 +0100
Subject: [PATCH 027/574] fix #3396

---
 qutebrowser/browser/history.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py
index ecab730ae..e82e6970d 100644
--- a/qutebrowser/browser/history.py
+++ b/qutebrowser/browser/history.py
@@ -171,7 +171,9 @@ class WebHistory(sql.SqlTable):
     @pyqtSlot(QUrl, QUrl, str)
     def add_from_tab(self, url, requested_url, title):
         """Add a new history entry as slot, called from a BrowserTab."""
-        if url.scheme() == 'data' or requested_url.scheme() == 'data':
+        if any(url.scheme() == 'data' or
+               ('qute', 'back') == (url.scheme(), url.host())
+                for url in (url, requested_url)):
             return
         if url.isEmpty():
             # things set via setHtml

From 801b6b90ce43b78d0a202f018833621b486cc7f7 Mon Sep 17 00:00:00 2001
From: seebye <seebye@users.noreply.github.com>
Date: Wed, 20 Dec 2017 01:15:12 +0100
Subject: [PATCH 028/574] pylint adjustments

---
 qutebrowser/browser/history.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py
index e82e6970d..e800ac0b2 100644
--- a/qutebrowser/browser/history.py
+++ b/qutebrowser/browser/history.py
@@ -173,7 +173,7 @@ class WebHistory(sql.SqlTable):
         """Add a new history entry as slot, called from a BrowserTab."""
         if any(url.scheme() == 'data' or
                ('qute', 'back') == (url.scheme(), url.host())
-                for url in (url, requested_url)):
+               for url in (url, requested_url)):
             return
         if url.isEmpty():
             # things set via setHtml

From 125af531cb8519916a29ff79733dd4fb5a660826 Mon Sep 17 00:00:00 2001
From: seebye <seebye@users.noreply.github.com>
Date: Fri, 22 Dec 2017 15:44:42 +0100
Subject: [PATCH 029/574] database qute://back

---
 qutebrowser/browser/history.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py
index e800ac0b2..04bc1be15 100644
--- a/qutebrowser/browser/history.py
+++ b/qutebrowser/browser/history.py
@@ -32,7 +32,7 @@ from qutebrowser.misc import objects, sql
 
 
 # increment to indicate that HistoryCompletion must be regenerated
-_USER_VERSION = 1
+_USER_VERSION = 2
 
 
 class CompletionHistory(sql.SqlTable):
@@ -102,7 +102,8 @@ class WebHistory(sql.SqlTable):
         data = {'url': [], 'title': [], 'last_atime': []}
         # select the latest entry for each url
         q = sql.Query('SELECT url, title, max(atime) AS atime FROM History '
-                      'WHERE NOT redirect GROUP BY url ORDER BY atime asc')
+                      'WHERE NOT redirect and url NOT LIKE "qute://back%" '
+                      'GROUP BY url ORDER BY atime asc')
         for entry in q.run():
             data['url'].append(self._format_completion_url(QUrl(entry.url)))
             data['title'].append(entry.title)
@@ -172,7 +173,7 @@ class WebHistory(sql.SqlTable):
     def add_from_tab(self, url, requested_url, title):
         """Add a new history entry as slot, called from a BrowserTab."""
         if any(url.scheme() == 'data' or
-               ('qute', 'back') == (url.scheme(), url.host())
+               (url.scheme(), url.host()) == ('qute', 'back')
                for url in (url, requested_url)):
             return
         if url.isEmpty():

From d9b00acdc665e88d41d96bdba199f5f69c2302d8 Mon Sep 17 00:00:00 2001
From: RyanJenkins <rjenkins@mail.sfsu.edu>
Date: Sat, 23 Dec 2017 23:59:02 -0800
Subject: [PATCH 030/574] Return focus to qutebrowser when external editor
 finishes.

---
 qutebrowser/browser/commands.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 92a841d72..a912842f6 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1639,6 +1639,7 @@ class CommandDispatcher:
         """
         try:
             elem.set_value(text)
+            mainwindow.raise_window(objreg.last_focused_window())
         except webelem.OrphanedError as e:
             message.error('Edited element vanished')
         except webelem.Error as e:

From 9cb25e0c76e80b311898fd5aace7c27ac2169bdc Mon Sep 17 00:00:00 2001
From: RyanJenkins <rjenkins@mail.sfsu.edu>
Date: Tue, 26 Dec 2017 20:19:39 -0800
Subject: [PATCH 031/574] Raise browser window after editor closes regardless
 of outcome of inserting text and avoid calling
 QApplication.instance().alert() in this scenario.

---
 qutebrowser/browser/commands.py      | 3 ++-
 qutebrowser/mainwindow/mainwindow.py | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index a912842f6..3fffbcfb7 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1639,12 +1639,13 @@ class CommandDispatcher:
         """
         try:
             elem.set_value(text)
-            mainwindow.raise_window(objreg.last_focused_window())
         except webelem.OrphanedError as e:
             message.error('Edited element vanished')
         except webelem.Error as e:
             raise cmdexc.CommandError(str(e))
 
+        mainwindow.raise_window(objreg.last_focused_window(), alert=False)
+
     @cmdutils.register(instance='command-dispatcher', maxsplit=0,
                        scope='window')
     def insert_text(self, text):
diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index 3adce7567..9d288b565 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -94,13 +94,15 @@ def get_window(via_ipc, force_window=False, force_tab=False,
     return window.win_id
 
 
-def raise_window(window):
+def raise_window(window, alert=False):
     """Raise the given MainWindow object."""
     window.setWindowState(window.windowState() & ~Qt.WindowMinimized)
     window.setWindowState(window.windowState() | Qt.WindowActive)
     window.raise_()
     window.activateWindow()
-    QApplication.instance().alert(window)
+
+    if alert:
+        QApplication.instance().alert(window)
 
 
 # WORKAROUND for https://github.com/PyCQA/pylint/issues/1770

From 53575aaeed5a1e8389bbf0980fed757e85c34349 Mon Sep 17 00:00:00 2001
From: RyanJenkins <rjenkins@mail.sfsu.edu>
Date: Wed, 27 Dec 2017 12:40:55 -0800
Subject: [PATCH 032/574] Default raise_windows() alert param to True to
 preserve existing behavior

---
 qutebrowser/mainwindow/mainwindow.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index 9d288b565..dff465c41 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -94,7 +94,7 @@ def get_window(via_ipc, force_window=False, force_tab=False,
     return window.win_id
 
 
-def raise_window(window, alert=False):
+def raise_window(window, alert=True):
     """Raise the given MainWindow object."""
     window.setWindowState(window.windowState() & ~Qt.WindowMinimized)
     window.setWindowState(window.windowState() | Qt.WindowActive)

From 2a7423a515181001c7a0f2c8b4f9f19c82aec95d Mon Sep 17 00:00:00 2001
From: Manuel Seelaus <manuel.seelaus@zoho.com>
Date: Wed, 27 Dec 2017 18:00:02 -0700
Subject: [PATCH 033/574] filter out records with None in any field.

---
 scripts/hist_importer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/hist_importer.py b/scripts/hist_importer.py
index 84fada560..526a752e2 100755
--- a/scripts/hist_importer.py
+++ b/scripts/hist_importer.py
@@ -107,7 +107,7 @@ def clean(history):
     Args:
         history: List of records (datetime, url, title) from source database.
     """
-    nulls = [record for record in history if record[0] is None]
+    nulls = [record for record in history if None in record]
     for null_datetime in nulls:
         history.remove(null_datetime)
     history = [list(record) for record in history]

From a01566ed15f3f93ff034810e3d74d36d0d3657a1 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 28 Dec 2017 19:17:25 +0600
Subject: [PATCH 034/574] Fix loosed variable

---
 qutebrowser/browser/commands.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index cb744b23d..5c051a3ff 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -862,6 +862,7 @@ class CommandDispatcher:
         else:  # pragma: no cover
             raise ValueError("Invalid value {!r} for `what'.".format(what))
 
+        self.yank_object['what'] = what
         self._yank_to_target(s)
 
     def _yank_callback(self, s):

From 9728e90401a884a45de7f1bd72441f7ee5a63f37 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 28 Dec 2017 20:05:10 +0600
Subject: [PATCH 035/574] Enable test in webengine

---
 tests/end2end/features/editor.feature | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/end2end/features/editor.feature b/tests/end2end/features/editor.feature
index d3c634b0d..f1b53e90d 100644
--- a/tests/end2end/features/editor.feature
+++ b/tests/end2end/features/editor.feature
@@ -115,7 +115,6 @@ Feature: Opening external editors
         And I run :click-element id qute-button
         Then the javascript message "text: foobar" should be logged
 
-    @qtwebengine_todo: Caret mode is not implemented yet
     Scenario: Spawning an editor in caret mode
         When I set up a fake editor returning "foobar"
         And I open data/editor.html

From 63658d3a1e618e81687827d68961e7829aa3bd7b Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 28 Dec 2017 20:40:37 +0600
Subject: [PATCH 036/574] Catch userscript exception and show error message

---
 qutebrowser/browser/commands.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 5c051a3ff..53fb03830 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1247,7 +1247,10 @@ class CommandDispatcher:
         self.openurl(config.val.url.start_pages[0])
 
     def _selection_callback(self, s):
-        self._run_userscript(s)
+        try:
+            self._run_userscript(s)
+        except cmdexc.CommandError as e:
+            message.error(str(e))
 
     def _run_userscript(self, selection):
         """Run a userscript given as argument.

From 83f8d840128248231a98cd3776d4436c4e58cfbf Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 28 Dec 2017 22:27:47 +0600
Subject: [PATCH 037/574] Finally enable webengine test

---
 tests/end2end/features/editor.feature | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/end2end/features/editor.feature b/tests/end2end/features/editor.feature
index 15da4a6cd..d01e3d229 100644
--- a/tests/end2end/features/editor.feature
+++ b/tests/end2end/features/editor.feature
@@ -129,7 +129,6 @@ Feature: Opening external editors
         And I kill the waiting editor
         Then the error "Edited element vanished" should be shown
 
-    @qtwebengine_todo: Caret mode is not implemented yet
     Scenario: Spawning an editor in caret mode
         When I set up a fake editor returning "foobar"
         And I open data/editor.html

From 7d181ee4b53edb6064778802f427b52fe91004d5 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 28 Dec 2017 23:04:04 +0600
Subject: [PATCH 038/574] Check if document body exists

---
 qutebrowser/javascript/webengine_caret.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 7235c9772..af381f529 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -965,7 +965,8 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
             window.caretBrowsingLoaded = true;
             CaretBrowsing.init();
 
-            if (document.body.getAttribute("caretbrowsing") === "on") {
+            if (document.body && 
+                document.body.getAttribute("caretbrowsing") === "on") {
                 CaretBrowsing.forceEnabled = true;
                 CaretBrowsing.isEnabled = true;
                 CaretBrowsing.updateIsCaretVisible();

From 3b836d34836e90d4cdf7ddbadc91c89c27ea51fa Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 29 Dec 2017 17:56:16 +0600
Subject: [PATCH 039/574] Fix lint warnings

---
 qutebrowser/browser/commands.py           | 6 ++++--
 qutebrowser/javascript/webengine_caret.js | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index d3f865a52..653d70014 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1293,9 +1293,11 @@ class CommandDispatcher:
             env['QUTE_URL'] = url.toString(QUrl.FullyEncoded)
 
         try:
+            args = self.userscript_object['args']
+            verbose = self.userscript_object['verbose']
             userscripts.run_async(tab, self.userscript_object['cmd'],
-                *self.userscript_object['args'], win_id=self._win_id,
-                env=env, verbose=self.userscript_object['verbose'])
+                                  *args, win_id=self._win_id,
+                                  env=env, verbose=verbose)
         except userscripts.Error as e:
             raise cmdexc.CommandError(e)
         finally:
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index af381f529..be0d6eaa5 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -965,7 +965,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
             window.caretBrowsingLoaded = true;
             CaretBrowsing.init();
 
-            if (document.body && 
+            if (document.body &&
                 document.body.getAttribute("caretbrowsing") === "on") {
                 CaretBrowsing.forceEnabled = true;
                 CaretBrowsing.isEnabled = true;

From db16a87e68ca10cac2fcf17e8d4481b7999e7a26 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 29 Dec 2017 18:39:29 +0600
Subject: [PATCH 040/574] Removed unused import

---
 qutebrowser/keyinput/modeman.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py
index 719d29863..2c21908de 100644
--- a/qutebrowser/keyinput/modeman.py
+++ b/qutebrowser/keyinput/modeman.py
@@ -29,7 +29,6 @@ from qutebrowser.keyinput import modeparsers, keyparser
 from qutebrowser.config import config
 from qutebrowser.commands import cmdexc, cmdutils
 from qutebrowser.utils import usertypes, log, objreg, utils
-from qutebrowser.misc import objects
 
 
 @attr.s(frozen=True)

From 882beab3f244ef67742fb8285905af880444cf37 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 29 Dec 2017 19:01:12 +0600
Subject: [PATCH 041/574] Try to fix Windows caret ussues

---
 qutebrowser/javascript/webengine_caret.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index be0d6eaa5..4c2771451 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -468,6 +468,9 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
 
     CaretBrowsing.blinkFlag = true;
 
+    CaretBrowsing.isWindows =
+        window.navigator.userAgent.indexOf("Windows") !== -1;
+
     CaretBrowsing.isControlThatNeedsArrowKeys = function(node) { // eslint-disable-line complexity,max-len
         if (!node) {
             return false;
@@ -860,9 +863,15 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
             getSelection().
             modify(action, direction, granularity);
 
-        window.setTimeout(() => {
-            CaretBrowsing.updateCaretOrSelection(true);
-        }, 0);
+        if (CaretBrowsing.isWindows &&
+                (direction === "forward" ||
+                    direction === "right")) {
+            CaretBrowsing.move("left", "character");
+        } else {
+            window.setTimeout(() => {
+                CaretBrowsing.updateCaretOrSelection(true);
+            }, 0);
+        }
     };
 
     CaretBrowsing.moveToBlock = function(paragraph, boundary) {

From d04a087c2bd9132603b704ed0c5edfefe3f43e02 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 29 Dec 2017 20:10:18 +0600
Subject: [PATCH 042/574] Try fix Windows caret issues 2

---
 qutebrowser/javascript/webengine_caret.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 4c2771451..79fb01dcb 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -865,7 +865,8 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
 
         if (CaretBrowsing.isWindows &&
                 (direction === "forward" ||
-                    direction === "right")) {
+                    direction === "right") &&
+                granularity === "word") {
             CaretBrowsing.move("left", "character");
         } else {
             window.setTimeout(() => {

From e254ea2fa7e617432c656ad7f9055c72af64e2bc Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 29 Dec 2017 23:43:39 +0600
Subject: [PATCH 043/574] Add license and description

---
 qutebrowser/javascript/webengine_caret.js | 25 +++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 79fb01dcb..e7075cd33 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1,3 +1,28 @@
+/**
+ * Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+ *
+ * This file is part of qutebrowser.
+ *
+ * qutebrowser is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * qutebrowser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Ported chrome-caretbrowsing extension.
+ * Create and control div caret, which listen commands from qutebrowser,
+ * change document selection model and div caret position.
+ */
+
 "use strict"; // eslint-disable-line max-lines
 
 window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,max-len

From a6adbdf167b657e02979559ac5fc5923b2caf7af Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 29 Dec 2017 19:10:33 +0100
Subject: [PATCH 044/574] Clean up testbrowser scripts

---
 .gitignore                                    | 16 +++---
 .../cpp}/webengine/main.cpp                   |  0
 .../cpp}/webengine/testbrowser.pro            |  0
 .../cpp}/webkit/main.cpp                      |  0
 .../cpp}/webkit/testbrowser.pro               |  0
 scripts/testbrowser/testbrowser_webengine.py  | 50 +++++++++++++++++
 scripts/testbrowser/testbrowser_webkit.py     | 56 +++++++++++++++++++
 7 files changed, 114 insertions(+), 8 deletions(-)
 rename scripts/{testbrowser_cpp => testbrowser/cpp}/webengine/main.cpp (100%)
 rename scripts/{testbrowser_cpp => testbrowser/cpp}/webengine/testbrowser.pro (100%)
 rename scripts/{testbrowser_cpp => testbrowser/cpp}/webkit/main.cpp (100%)
 rename scripts/{testbrowser_cpp => testbrowser/cpp}/webkit/testbrowser.pro (100%)
 create mode 100755 scripts/testbrowser/testbrowser_webengine.py
 create mode 100755 scripts/testbrowser/testbrowser_webkit.py

diff --git a/.gitignore b/.gitignore
index cb244557b..54a0dcae6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,12 +31,12 @@ __pycache__
 /prof
 /venv
 TODO
-/scripts/testbrowser_cpp/webkit/Makefile
-/scripts/testbrowser_cpp/webkit/main.o
-/scripts/testbrowser_cpp/webkit/testbrowser
-/scripts/testbrowser_cpp/webkit/.qmake.stash
-/scripts/testbrowser_cpp/webengine/Makefile
-/scripts/testbrowser_cpp/webengine/main.o
-/scripts/testbrowser_cpp/webengine/testbrowser
-/scripts/testbrowser_cpp/webengine/.qmake.stash
+/scripts/testbrowser/cpp/webkit/Makefile
+/scripts/testbrowser/cpp/webkit/main.o
+/scripts/testbrowser/cpp/webkit/testbrowser
+/scripts/testbrowser/cpp/webkit/.qmake.stash
+/scripts/testbrowser/cpp/webengine/Makefile
+/scripts/testbrowser/cpp/webengine/main.o
+/scripts/testbrowser/cpp/webengine/testbrowser
+/scripts/testbrowser/cpp/webengine/.qmake.stash
 /scripts/dev/pylint_checkers/qute_pylint.egg-info
diff --git a/scripts/testbrowser_cpp/webengine/main.cpp b/scripts/testbrowser/cpp/webengine/main.cpp
similarity index 100%
rename from scripts/testbrowser_cpp/webengine/main.cpp
rename to scripts/testbrowser/cpp/webengine/main.cpp
diff --git a/scripts/testbrowser_cpp/webengine/testbrowser.pro b/scripts/testbrowser/cpp/webengine/testbrowser.pro
similarity index 100%
rename from scripts/testbrowser_cpp/webengine/testbrowser.pro
rename to scripts/testbrowser/cpp/webengine/testbrowser.pro
diff --git a/scripts/testbrowser_cpp/webkit/main.cpp b/scripts/testbrowser/cpp/webkit/main.cpp
similarity index 100%
rename from scripts/testbrowser_cpp/webkit/main.cpp
rename to scripts/testbrowser/cpp/webkit/main.cpp
diff --git a/scripts/testbrowser_cpp/webkit/testbrowser.pro b/scripts/testbrowser/cpp/webkit/testbrowser.pro
similarity index 100%
rename from scripts/testbrowser_cpp/webkit/testbrowser.pro
rename to scripts/testbrowser/cpp/webkit/testbrowser.pro
diff --git a/scripts/testbrowser/testbrowser_webengine.py b/scripts/testbrowser/testbrowser_webengine.py
new file mode 100755
index 000000000..e6353dc23
--- /dev/null
+++ b/scripts/testbrowser/testbrowser_webengine.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Very simple browser for testing purposes."""
+
+import sys
+import argparse
+
+from PyQt5.QtCore import QUrl
+from PyQt5.QtWidgets import QApplication
+from PyQt5.QtWebEngineWidgets import QWebEngineView
+
+
+def parse_args():
+    """Parse commandline arguments."""
+    parser = argparse.ArgumentParser()
+    parser.add_argument('url', help='The URL to open')
+    return parser.parse_known_args()[0]
+
+
+if __name__ == '__main__':
+    args = parse_args()
+    app = QApplication(sys.argv)
+    wv = QWebEngineView()
+
+    wv.loadStarted.connect(lambda: print("Loading started"))
+    wv.loadProgress.connect(lambda p: print("Loading progress: {}%".format(p)))
+    wv.loadFinished.connect(lambda: print("Loading finished"))
+
+    wv.load(QUrl.fromUserInput(args.url))
+    wv.show()
+
+    app.exec_()
diff --git a/scripts/testbrowser/testbrowser_webkit.py b/scripts/testbrowser/testbrowser_webkit.py
new file mode 100755
index 000000000..7c7081f18
--- /dev/null
+++ b/scripts/testbrowser/testbrowser_webkit.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python3
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Very simple browser for testing purposes."""
+
+import sys
+import argparse
+
+from PyQt5.QtCore import QUrl
+from PyQt5.QtWidgets import QApplication
+from PyQt5.QtWebKit import QWebSettings
+from PyQt5.QtWebKitWidgets import QWebView
+
+
+def parse_args():
+    """Parse commandline arguments."""
+    parser = argparse.ArgumentParser()
+    parser.add_argument('url', help='The URL to open')
+    parser.add_argument('--plugins', '-p', help='Enable plugins',
+                        default=False, action='store_true')
+    return parser.parse_known_args()[0]
+
+
+if __name__ == '__main__':
+    args = parse_args()
+    app = QApplication(sys.argv)
+    wv = QWebView()
+
+    wv.loadStarted.connect(lambda: print("Loading started"))
+    wv.loadProgress.connect(lambda p: print("Loading progress: {}%".format(p)))
+    wv.loadFinished.connect(lambda: print("Loading finished"))
+
+    if args.plugins:
+        wv.settings().setAttribute(QWebSettings.PluginsEnabled, True)
+
+    wv.load(QUrl.fromUserInput(args.url))
+    wv.show()
+
+    app.exec_()

From e7af961be243ff443cd118a1683650180e66f1ca Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 29 Dec 2017 19:36:52 +0100
Subject: [PATCH 045/574] Remove filtering of mouse events

This was needed for the hide-mouse-cursor setting. However, this setting was
removed in 2223a285ef4a49adabe735d558db9ab7b65ff78a, so this code has been dead
since then.
---
 qutebrowser/app.py | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index a2d768923..e3d06391d 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -872,10 +872,6 @@ class EventFilter(QObject):
         super().__init__(parent)
         self._activated = True
         self._handlers = {
-            QEvent.MouseButtonDblClick: self._handle_mouse_event,
-            QEvent.MouseButtonPress: self._handle_mouse_event,
-            QEvent.MouseButtonRelease: self._handle_mouse_event,
-            QEvent.MouseMove: self._handle_mouse_event,
             QEvent.KeyPress: self._handle_key_event,
             QEvent.KeyRelease: self._handle_key_event,
         }
@@ -900,19 +896,6 @@ class EventFilter(QObject):
             # No window available yet, or not a MainWindow
             return False
 
-    def _handle_mouse_event(self, _event):
-        """Handle a mouse event.
-
-        Args:
-            _event: The QEvent which is about to be delivered.
-
-        Return:
-            True if the event should be filtered, False if it's passed through.
-        """
-        # Mouse cursor shown (overrideCursor None) -> don't filter event
-        # Mouse cursor hidden (overrideCursor not None) -> filter event
-        return qApp.overrideCursor() is not None
-
     def eventFilter(self, obj, event):
         """Handle an event.
 

From 28889cf099091a8fb261019bad33c77ef306dbca Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 29 Dec 2017 20:36:55 +0100
Subject: [PATCH 046/574] Use a dict for ModeManager.eventFilter

---
 qutebrowser/keyinput/modeman.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py
index ad9bd06ee..b8c46476f 100644
--- a/qutebrowser/keyinput/modeman.py
+++ b/qutebrowser/keyinput/modeman.py
@@ -322,10 +322,13 @@ class ModeManager(QObject):
         if self.mode is None:
             # We got events before mode is set, so just pass them through.
             return False
-        if event.type() == QEvent.KeyPress:
-            return self._eventFilter_keypress(event)
-        else:
-            return self._eventFilter_keyrelease(event)
+
+        handlers = {
+            QEvent.KeyPress: self._eventFilter_keypress,
+            QEvent.KeyRelease: self._eventFilter_keyrelease,
+        }
+        handler = handlers[event.type()]
+        return handler(event)
 
     @cmdutils.register(instance='mode-manager', scope='window')
     def clear_keychain(self):

From 25436e2544d8224e3422efb7952180e732de122e Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Sat, 30 Dec 2017 09:43:16 +0600
Subject: [PATCH 047/574] Fix eslint warnings

---
 qutebrowser/javascript/webengine_caret.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index e7075cd33..001afa8a7 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1,3 +1,4 @@
+// eslint-disable-line max-lines
 /**
  * Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
  *
@@ -23,7 +24,7 @@
  * change document selection model and div caret position.
  */
 
-"use strict"; // eslint-disable-line max-lines
+"use strict";
 
 window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,max-len
     function isElementInViewport(node) {  // eslint-disable-line complexity

From 981f5fd09b93a194f2e768697e6d260dfa078ece Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Sat, 30 Dec 2017 23:20:29 +0600
Subject: [PATCH 048/574] Remove unused import

---
 tests/end2end/features/test_caret_bdd.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/end2end/features/test_caret_bdd.py b/tests/end2end/features/test_caret_bdd.py
index ee6cda82c..abd1821d8 100644
--- a/tests/end2end/features/test_caret_bdd.py
+++ b/tests/end2end/features/test_caret_bdd.py
@@ -17,8 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
-# pylint: disable=unused-import
-import pytest
 import pytest_bdd as bdd
 
 from end2end.features.test_yankpaste_bdd import init_fake_clipboard

From f5edd4941e9f1bf5e42d3b88eb770777a32fb6a6 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 30 Dec 2017 18:33:15 +0100
Subject: [PATCH 049/574] Fix MANIFEST.in for testbrowser

---
 MANIFEST.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 54bb613f3..b20c2bc77 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -23,7 +23,7 @@ include qutebrowser/config/configdata.yml
 
 prune www
 prune scripts/dev
-prune scripts/testbrowser_cpp
+prune scripts/testbrowser/cpp
 prune .github
 exclude scripts/asciidoc2html.py
 exclude doc/notes

From 6dc31087477e496d3be9b4cf8fc7d6b81adb994b Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Sat, 30 Dec 2017 23:35:12 +0600
Subject: [PATCH 050/574] Get OS name using python

---
 qutebrowser/browser/webengine/webenginetab.py |  3 ++-
 qutebrowser/javascript/webengine_caret.js     | 15 ++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index b816e8f2a..42cbc3d2a 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -21,6 +21,7 @@
 
 import math
 import functools
+import platform
 import html as html_utils
 
 import sip
@@ -202,7 +203,7 @@ class WebEngineCaret(browsertab.AbstractCaret):
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_entered(self, mode):
         self._tab.run_js_async(
-            javascript.assemble('caret', 'setInitialCursor'))
+            javascript.assemble('caret', 'setInitialCursor', platform.platform()))
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_left(self):
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 001afa8a7..89eb9969f 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -494,9 +494,6 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
 
     CaretBrowsing.blinkFlag = true;
 
-    CaretBrowsing.isWindows =
-        window.navigator.userAgent.indexOf("Windows") !== -1;
-
     CaretBrowsing.isControlThatNeedsArrowKeys = function(node) { // eslint-disable-line complexity,max-len
         if (!node) {
             return false;
@@ -590,9 +587,9 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
         document.body.appendChild(node);
     };
 
-    CaretBrowsing.setInitialCursor = function() {
-        const sel = window.getSelection();
-        if (sel.rangeCount > 0) {
+    CaretBrowsing.setInitialCursor = function(platform) {
+        CaretBrowsing.isWindows = platform === "Windows";
+        if (window.getSelection().rangeCount > 0) {
             return;
         }
 
@@ -960,7 +957,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
         CaretBrowsing.isCaretVisible =
             (CaretBrowsing.isEnabled && CaretBrowsing.isWindowFocused);
         if (CaretBrowsing.isCaretVisible && !CaretBrowsing.caretElement) {
-            CaretBrowsing.setInitialCursor();
+            CaretBrowsing.setInitialCursor(CaretBrowsing.isWindows);
             CaretBrowsing.updateCaretOrSelection(true);
             if (CaretBrowsing.caretElement) {
                 CaretBrowsing.blinkFunctionId = window.setInterval(
@@ -1012,9 +1009,9 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
 
     const funcs = {};
 
-    funcs.setInitialCursor = () => {
+    funcs.setInitialCursor = (platform) => {
         if (!CaretBrowsing.initiated) {
-            CaretBrowsing.setInitialCursor();
+            CaretBrowsing.setInitialCursor(platform);
             return;
         }
 

From fe4eb19ecfa43badf9c39cdeebff1ddbe0a38058 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Sat, 30 Dec 2017 23:37:17 +0600
Subject: [PATCH 051/574] Add link to chrome-caretbrowsing extension

---
 qutebrowser/javascript/webengine_caret.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 89eb9969f..9e217fe36 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -20,6 +20,8 @@
 
 /**
  * Ported chrome-caretbrowsing extension.
+ * https://cs.chromium.org/chromium/src/ui/accessibility/extensions/caretbrowsing/
+ *
  * Create and control div caret, which listen commands from qutebrowser,
  * change document selection model and div caret position.
  */

From e22dc1b5c6cd8720fde7bfd60762988a157c196a Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Sat, 30 Dec 2017 23:37:57 +0600
Subject: [PATCH 052/574] Update copyright year

---
 qutebrowser/javascript/webengine_caret.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 9e217fe36..99f6bd76a 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1,6 +1,6 @@
 // eslint-disable-line max-lines
 /**
- * Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+ * Copyright 2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
  *
  * This file is part of qutebrowser.
  *

From 695f7341429b2b4e68b8aeb08051363f0261af82 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Sat, 30 Dec 2017 23:46:04 +0600
Subject: [PATCH 053/574] Extract js call method

---
 qutebrowser/browser/webengine/webenginetab.py | 58 +++++++------------
 1 file changed, 22 insertions(+), 36 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 42cbc3d2a..38a16b323 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -208,87 +208,69 @@ class WebEngineCaret(browsertab.AbstractCaret):
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_left(self):
         self.drop_selection()
-        self._tab.run_js_async(
-            javascript.assemble('caret', 'toggle'))
+        self._js_call('toggle')
 
     def move_to_next_line(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveDown'))
+            self._js_call('moveDown')
 
     def move_to_prev_line(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveUp'))
+            self._js_call('moveUp')
 
     def move_to_next_char(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveRight'))
+            self._js_call('moveRight')
 
     def move_to_prev_char(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveLeft'))
+            self._js_call('moveLeft')
 
     def move_to_end_of_word(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToEndOfWord'))
+            self._js_call('moveToEndOfWord')
 
     def move_to_next_word(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToNextWord'))
+            self._js_call('moveToNextWord')
 
     def move_to_prev_word(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToPreviousWord'))
+            self._js_call('moveToPreviousWord')
 
     def move_to_start_of_line(self):
-        self._tab.run_js_async(
-            javascript.assemble('caret', 'moveToStartOfLine'))
+        self._js_call('moveToStartOfLine')
 
     def move_to_end_of_line(self):
-        self._tab.run_js_async(
-            javascript.assemble('caret', 'moveToEndOfLine'))
+        self._js_call('moveToEndOfLine')
 
     def move_to_start_of_next_block(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToStartOfNextBlock'))
+            self._js_call('moveToStartOfNextBlock')
 
     def move_to_start_of_prev_block(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToStartOfPrevBlock'))
+            self._js_call('moveToStartOfPrevBlock')
 
     def move_to_end_of_next_block(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToEndOfNextBlock'))
+            self._js_call('moveToEndOfNextBlock')
 
     def move_to_end_of_prev_block(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToEndOfPrevBlock'))
+            self._js_call('moveToEndOfPrevBlock')
 
     def move_to_start_of_document(self):
-        self._tab.run_js_async(
-            javascript.assemble('caret', 'moveToStartOfDocument'))
+        self._js_call('moveToStartOfDocument')
 
     def move_to_end_of_document(self):
-        self._tab.run_js_async(
-            javascript.assemble('caret', 'moveToEndOfDocument'))
+        self._js_call('moveToEndOfDocument')
 
     def toggle_selection(self):
-        self._tab.run_js_async(
-            javascript.assemble('caret', 'toggleSelection'))
+        self._js_call('toggleSelection')
 
     def drop_selection(self):
-        self._tab.run_js_async(
-            javascript.assemble('caret', 'dropSelection'))
+        self._js_call('dropSelection')
 
     def has_selection(self):
         if qtutils.version_check('5.10'):
@@ -351,6 +333,10 @@ class WebEngineCaret(browsertab.AbstractCaret):
             self._tab.run_js_async(js_code, lambda jsret:
                                    self._follow_selected_cb(jsret, tab))
 
+    def _js_call(self, command):
+        self._tab.run_js_async(
+            javascript.assemble('caret', command))
+
 
 class WebEngineScroller(browsertab.AbstractScroller):
 

From e989d948edd81a7e6afd45592fe6764d35124ae0 Mon Sep 17 00:00:00 2001
From: Slackhead <slackhead@gmail.com>
Date: Sun, 31 Dec 2017 14:47:42 +0000
Subject: [PATCH 054/574] Add cycle-inputs.js to userscripts

---
 misc/userscripts/cycle-inputs.js | 43 ++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 misc/userscripts/cycle-inputs.js

diff --git a/misc/userscripts/cycle-inputs.js b/misc/userscripts/cycle-inputs.js
new file mode 100644
index 000000000..c395f6de2
--- /dev/null
+++ b/misc/userscripts/cycle-inputs.js
@@ -0,0 +1,43 @@
+/* Cycle <input> text boxes.
+ * works with the types defined in 'types'.
+ * Note: Does not work for <textarea>.
+ * 
+ * Example keybind: 
+ * CYCLE_INPUTS = "jseval -q -f ~/.config/qutebrowser/cycle-inputs.js"
+ * config.bind('gi', CYCLE_INPUTS)
+ *
+ * By dive on freenode <dave@dawoodfall.net>
+ */
+
+var inputs = document.getElementsByTagName("input");
+var found = false;
+var types = /text|password|date|email|month|number|range|search|tel|time|url|week/;
+var hidden = /hidden/;
+
+function ishidden(el) {
+	return hidden.test(el.attributes.value) || el.offsetParent === null;
+}
+
+for (var i = 0; i < inputs.length; i++) {
+	if (inputs[i] == document.activeElement) {
+		for (var j = i+1; j < inputs.length; j++) {
+			if (! ishidden(inputs[j]) && types.test(inputs[j].type)) {
+				inputs[j].focus();
+				found = true;
+				break;
+			}
+		}
+		break;
+	}
+}
+
+if (! found) {
+	for (i = 0; i < inputs.length; i++) {
+		if (! ishidden(inputs[i]) && types.test(inputs[i].type)) {
+			inputs[i].focus();
+			break;
+		}
+	}
+}
+
+// vim: tw=0

From 7aecebf028413750004b2e7bb3952f6aee66ca0d Mon Sep 17 00:00:00 2001
From: Slackhead <slackhead@gmail.com>
Date: Sun, 31 Dec 2017 15:08:36 +0000
Subject: [PATCH 055/574] Add cycle-inputs.js to scripts

---
 {misc/userscripts => scripts}/cycle-inputs.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {misc/userscripts => scripts}/cycle-inputs.js (100%)

diff --git a/misc/userscripts/cycle-inputs.js b/scripts/cycle-inputs.js
similarity index 100%
rename from misc/userscripts/cycle-inputs.js
rename to scripts/cycle-inputs.js

From 26bbd109529c2b5ac77b34150679175d69020007 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 1 Jan 2018 16:34:10 +0100
Subject: [PATCH 056/574] Update attrs from 17.3.0 to 17.4.0

---
 misc/requirements/requirements-flake8.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index bf7a02389..ccc5852cc 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -1,6 +1,6 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-attrs==17.3.0
+attrs==17.4.0
 flake8==3.5.0
 flake8-bugbear==17.12.0
 flake8-builtins==1.0.post0

From 9c256740c6e4a354675d0807717345607cad39f8 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 1 Jan 2018 16:34:12 +0100
Subject: [PATCH 057/574] Update attrs from 17.3.0 to 17.4.0

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 90b60df47..bef11554d 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -1,6 +1,6 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-attrs==17.3.0
+attrs==17.4.0
 beautifulsoup4==4.6.0
 cheroot==6.0.0
 click==6.7

From 8cec185e4b31803ddff78041510dc7d4e098030e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 1 Jan 2018 16:34:13 +0100
Subject: [PATCH 058/574] Update attrs from 17.3.0 to 17.4.0

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 8d95759b2..0d2652698 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-attrs==17.3.0
+attrs==17.4.0
 colorama==0.3.9
 cssutils==1.0.2
 Jinja2==2.10

From a98cd16ff37ad779e7137a21a040a06452577f4f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 1 Jan 2018 16:34:15 +0100
Subject: [PATCH 059/574] Update flake8-polyfill from 1.0.1 to 1.0.2

---
 misc/requirements/requirements-flake8.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index ccc5852cc..f73294005 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -12,7 +12,7 @@ flake8-docstrings==1.1.0
 flake8-future-import==0.4.3
 flake8-mock==0.3
 flake8-per-file-ignores==0.4
-flake8-polyfill==1.0.1
+flake8-polyfill==1.0.2
 flake8-string-format==0.2.3
 flake8-tidy-imports==1.1.0
 flake8-tuple==0.2.13

From 673919451e6a518fd5cfaa18f3602355da696e5a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 1 Jan 2018 16:34:16 +0100
Subject: [PATCH 060/574] Update werkzeug from 0.13 to 0.14.1

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index bef11554d..3e900fe0d 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -36,4 +36,4 @@ pytest-xvfb==1.0.0
 PyVirtualDisplay==0.2.1
 six==1.11.0
 vulture==0.26
-Werkzeug==0.13
+Werkzeug==0.14.1

From 9363bc3f24f0fd330afa7f94e956f2c9056996f1 Mon Sep 17 00:00:00 2001
From: Manuel Seelaus <manuel.seelaus@zoho.com>
Date: Tue, 2 Jan 2018 20:06:29 -0700
Subject: [PATCH 061/574] replace empty titles with an empty string.
 https://github.com/qutebrowser/qutebrowser/pull/3445#issuecomment-354840724

---
 scripts/hist_importer.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/scripts/hist_importer.py b/scripts/hist_importer.py
index 526a752e2..7b594a580 100755
--- a/scripts/hist_importer.py
+++ b/scripts/hist_importer.py
@@ -100,16 +100,23 @@ def clean(history):
     """Clean up records from source database.
 
     Receives a list of record and sanityze them in order for them to be
-    properly imported to qutebrowser. Sanitation requires addiing a 4th
+    properly imported to qutebrowser. Sanitation requires adding a 4th
     attribute 'redirect' which is filled with '0's, and also purging all
     records that have a NULL/None datetime attribute.
 
     Args:
         history: List of records (datetime, url, title) from source database.
     """
+    # replace missing titles with an empty string
+    for index, record in enumerate(history):
+        if record[1] is None:
+            cleaned = list(record)
+            cleaned[1] = ''
+            history[index] = tuple(cleaned)
+
     nulls = [record for record in history if None in record]
-    for null_datetime in nulls:
-        history.remove(null_datetime)
+    for null_record in nulls:
+        history.remove(null_record)
     history = [list(record) for record in history]
     for record in history:
         record.append('0')

From c3bcb1d9ba6ab244c2004e2b73fad3de40b77b2d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 3 Jan 2018 10:15:00 +0100
Subject: [PATCH 062/574] Remove old testbrowser.py

---
 scripts/testbrowser.py | 84 ------------------------------------------
 1 file changed, 84 deletions(-)
 delete mode 100755 scripts/testbrowser.py

diff --git a/scripts/testbrowser.py b/scripts/testbrowser.py
deleted file mode 100755
index fbe48c451..000000000
--- a/scripts/testbrowser.py
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/usr/bin/env python3
-# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
-#
-# This file is part of qutebrowser.
-#
-# qutebrowser is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# qutebrowser is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Very simple browser for testing purposes."""
-
-import sys
-import argparse
-
-from PyQt5.QtCore import QUrl
-from PyQt5.QtWidgets import QApplication
-
-try:
-    from PyQt5.QtWebKitWidgets import QWebView
-except ImportError:
-    QWebView = None
-
-try:
-    from PyQt5.QtWebEngineWidgets import QWebEngineView
-except ImportError:
-    QWebEngineView = None
-
-
-def parse_args():
-    """Parse commandline arguments."""
-    parser = argparse.ArgumentParser()
-    parser.add_argument('url', help='The URL to open')
-    parser.add_argument('--plugins', '-p', help='Enable plugins',
-                        default=False, action='store_true')
-    if QWebEngineView is not None:
-        parser.add_argument('--webengine', help='Use QtWebEngine',
-                            default=False, action='store_true')
-    return parser.parse_known_args()[0]
-
-
-if __name__ == '__main__':
-    args = parse_args()
-    app = QApplication(sys.argv)
-
-    if QWebView is None and QWebEngineView is None:
-        print("Found no suitable backend to run with!")
-        sys.exit(1)
-    elif QWebView is None and not args.webengine:
-        print("Using QtWebEngine because QtWebKit is unavailable")
-        wv = QWebEngineView()
-        using_webengine = True
-    elif args.webengine:
-        if QWebEngineView is None:
-            print("Requested QtWebEngine, but it could not be imported!")
-            sys.exit(1)
-        wv = QWebEngineView()
-        using_webengine = True
-    else:
-        wv = QWebView()
-        using_webengine = False
-
-    wv.loadStarted.connect(lambda: print("Loading started"))
-    wv.loadProgress.connect(lambda p: print("Loading progress: {}%".format(p)))
-    wv.loadFinished.connect(lambda: print("Loading finished"))
-
-    if args.plugins and not using_webengine:
-        from PyQt5.QtWebKit import QWebSettings
-        wv.settings().setAttribute(QWebSettings.PluginsEnabled, True)
-
-    wv.load(QUrl.fromUserInput(args.url))
-    wv.show()
-
-    app.exec_()

From c290b3f80f41b255a5b46480990d692425a6c253 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Thu, 4 Jan 2018 12:27:19 -0500
Subject: [PATCH 063/574] Don't attempt completion if input starts with flag.

Always interpret the first word in the command string as the command to
offer completions for, even if that word looks like a flag.

Fixes #3460, where the command string `:-w open` would attempt to offer
completions for `open` but crash because the parsing was thrown off.
By moving the flag-stripping logic to _after_ we determine the command,
`:-w open` interprets `:-w` as the command. Since that is not a valid
command, we won't offer any completions.
---
 qutebrowser/completion/completer.py     | 5 +++--
 tests/unit/completion/test_completer.py | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/completion/completer.py b/qutebrowser/completion/completer.py
index 30a180554..4e187750d 100644
--- a/qutebrowser/completion/completer.py
+++ b/qutebrowser/completion/completer.py
@@ -87,8 +87,6 @@ class Completer(QObject):
             # cursor on a flag or after an explicit split (--)
             return None
         log.completion.debug("Before removing flags: {}".format(before_cursor))
-        before_cursor = [x for x in before_cursor if not x.startswith('-')]
-        log.completion.debug("After removing flags: {}".format(before_cursor))
         if not before_cursor:
             # '|' or 'set|'
             log.completion.debug('Starting command completion')
@@ -99,6 +97,9 @@ class Completer(QObject):
             log.completion.debug("No completion for unknown command: {}"
                                  .format(before_cursor[0]))
             return None
+
+        before_cursor = [x for x in before_cursor if not x.startswith('-')]
+        log.completion.debug("After removing flags: {}".format(before_cursor))
         argpos = len(before_cursor) - 1
         try:
             func = cmd.get_pos_arg_info(argpos).completion
diff --git a/tests/unit/completion/test_completer.py b/tests/unit/completion/test_completer.py
index e25d4e5d1..4b39b7032 100644
--- a/tests/unit/completion/test_completer.py
+++ b/tests/unit/completion/test_completer.py
@@ -190,6 +190,7 @@ def _set_cmd_prompt(cmd, txt):
     (':gibberish nonesense |', None, '', []),
     ('/:help|', None, '', []),
     ('::bind|', 'command', ':bind', []),
+    (':-w open |', None, '', []),
 ])
 def test_update_completion(txt, kind, pattern, pos_args, status_command_stub,
                            completer_obj, completion_widget_stub, config_stub,

From 16fb9bc80e56c8c3088736a1ab2b9e5fd9fc6ef7 Mon Sep 17 00:00:00 2001
From: Andrea Scarpino <scarpino@kde.org>
Date: Thu, 4 Jan 2018 19:46:18 +0100
Subject: [PATCH 064/574] scripts: filter history records

We don't need to import history records about `moz-extensions`, `about` pages, `dactyl` and so on...
---
 scripts/hist_importer.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/hist_importer.py b/scripts/hist_importer.py
index 84fada560..07731e61d 100755
--- a/scripts/hist_importer.py
+++ b/scripts/hist_importer.py
@@ -142,7 +142,8 @@ def run():
     source, dest = args.source, args.dest
     query = {
         'firefox': 'select url,title,last_visit_date/1000000 as date '
-                   'from moz_places',
+                   'from moz_places where url like "http%" or url '
+                   'like "ftp%" or url like "file://%"',
         'chrome': 'select url,title,last_visit_time/10000000 as date '
                   'from urls',
     }

From 3d508be9ff624a9669e101281cae60d28e973a84 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Thu, 4 Jan 2018 18:13:31 -0800
Subject: [PATCH 065/574] Clear unpinned tabs before prompting user with
 :tab-only

---
 qutebrowser/browser/commands.py         | 29 ++++++++++++++-----------
 qutebrowser/mainwindow/tabbedbrowser.py |  6 +++--
 tests/end2end/features/tabs.feature     |  4 ++--
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 92a841d72..97c09b1f7 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -953,22 +953,25 @@ class CommandDispatcher:
                         (prev and i < cur_idx) or
                         (next_ and i > cur_idx))
 
-        # Check to see if we are closing any pinned tabs
-        if not force:
-            for i, tab in enumerate(self._tabbed_browser.widgets()):
-                if _to_close(i) and tab.data.pinned:
-                    self._tabbed_browser.tab_close_prompt_if_pinned(
-                        tab,
-                        force,
-                        lambda: self.tab_only(
-                            prev=prev, next_=next_, force=True))
-                    return
-
+        # close as many tabs as we can
         first_tab = True
+        pinned_tabs_cleanup = False
         for i, tab in enumerate(self._tabbed_browser.widgets()):
             if _to_close(i):
-                self._tabbed_browser.close_tab(tab, new_undo=first_tab)
-                first_tab = False
+                if force or not tab.data.pinned:
+                    self._tabbed_browser.close_tab(tab, new_undo=first_tab)
+                    first_tab = False
+                else:
+                    pinned_tabs_cleanup = tab
+
+        # Check to see if we would like to close any pinned tabs
+        if pinned_tabs_cleanup:
+            self._tabbed_browser.tab_close_prompt_if_pinned(
+                pinned_tabs_cleanup,
+                force,
+                lambda: self.tab_only(
+                    prev=prev, next_=next_, force=True),
+                text="Are you sure you want to close pinned tabs?")
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     def undo(self):
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index c51a7aaff..d8056d853 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -256,7 +256,9 @@ class TabbedBrowser(tabwidget.TabWidget):
         for tab in self.widgets():
             self._remove_tab(tab)
 
-    def tab_close_prompt_if_pinned(self, tab, force, yes_action):
+    def tab_close_prompt_if_pinned(
+            self, tab, force, yes_action,
+            text="Are you sure you want to close a pinned tab?"):
         """Helper method for tab_close.
 
         If tab is pinned, prompt. If not, run yes_action.
@@ -265,7 +267,7 @@ class TabbedBrowser(tabwidget.TabWidget):
         if tab.data.pinned and not force:
             message.confirm_async(
                 title='Pinned Tab',
-                text="Are you sure you want to close a pinned tab?",
+                text=text,
                 yes_action=yes_action, default=False, abort_on=[tab.destroyed])
         else:
             yes_action()
diff --git a/tests/end2end/features/tabs.feature b/tests/end2end/features/tabs.feature
index b38d87a6e..1c670878e 100644
--- a/tests/end2end/features/tabs.feature
+++ b/tests/end2end/features/tabs.feature
@@ -1183,7 +1183,7 @@ Feature: Tab management
         And I run :tab-pin
         And I run :tab-next
         And I run :tab-only
-        And I wait for "*want to close a pinned tab*" in the log
+        And I wait for "*want to close pinned tabs*" in the log
         And I run :prompt-accept yes
         Then the following tabs should be open:
             - data/numbers/1.txt (active) (pinned)
@@ -1195,7 +1195,7 @@ Feature: Tab management
         And I run :tab-pin
         And I run :tab-next
         And I run :tab-only
-        And I wait for "*want to close a pinned tab*" in the log
+        And I wait for "*want to close pinned tabs*" in the log
         And I run :prompt-accept no
         Then the following tabs should be open:
             - data/numbers/1.txt (active) (pinned)

From a90730bea71a35059be6f203f74dfdbd2475cf24 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 5 Jan 2018 11:36:26 +0100
Subject: [PATCH 066/574] Pin pytest to 3.3.1 for now

See https://github.com/pytest-dev/pytest-bdd/issues/229
---
 misc/requirements/requirements-tests.txt     | 2 +-
 misc/requirements/requirements-tests.txt-raw | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 90b60df47..d11af3bfc 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -21,7 +21,7 @@ parse-type==0.4.2
 pluggy==0.6.0
 py==1.5.2
 py-cpuinfo==3.3.0
-pytest==3.3.1
+pytest==3.3.1  # rq.filter: != 3.3.2
 pytest-bdd==2.19.0
 pytest-benchmark==3.1.1
 pytest-cov==2.5.1
diff --git a/misc/requirements/requirements-tests.txt-raw b/misc/requirements/requirements-tests.txt-raw
index 121689980..174eeb7df 100644
--- a/misc/requirements/requirements-tests.txt-raw
+++ b/misc/requirements/requirements-tests.txt-raw
@@ -4,7 +4,7 @@ coverage
 Flask
 hunter
 hypothesis
-pytest
+pytest==3.3.1
 pytest-bdd
 pytest-benchmark
 pytest-cov
@@ -19,3 +19,4 @@ pytest-xvfb
 vulture
 
 #@ ignore: Jinja2, MarkupSafe, colorama
+#@ filter: pytest != 3.3.2

From b6662fd243c1180ac3f920b5e9f4e43365586f9e Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 5 Jan 2018 18:31:53 +0600
Subject: [PATCH 067/574] Use inner functions for callbacks

---
 qutebrowser/browser/commands.py | 68 ++++++++++++---------------------
 1 file changed, 24 insertions(+), 44 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 653d70014..724699c0b 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -65,8 +65,6 @@ class CommandDispatcher:
     def __init__(self, win_id, tabbed_browser):
         self._win_id = win_id
         self._tabbed_browser = tabbed_browser
-        self.yank_object = {}
-        self.userscript_object = {}
 
     def __repr__(self):
         return utils.get_repr(self)
@@ -840,11 +838,6 @@ class CommandDispatcher:
             sel: Use the primary selection instead of the clipboard.
             keep: Stay in visual mode after yanking the selection.
         """
-        self.yank_object = {
-            'sel': sel,
-            'what': what,
-            'keep': keep
-        }
         if what == 'title':
             s = self._tabbed_browser.page_title(self._current_index())
         elif what == 'domain':
@@ -856,39 +849,36 @@ class CommandDispatcher:
             s = self._yank_url(what)
             what = 'URL'  # For printing
         elif what == 'selection':
+            def yank_callback(s):
+                if not self._current_widget().caret.has_selection() or not s:
+                    message.info("Nothing to yank")
+                    return
+                self._yank_to_target(s, sel, what, keep)
+
             caret = self._current_widget().caret
-            caret.selection(False, self._yank_callback)
+            caret.selection(callback=yank_callback)
             return
         else:  # pragma: no cover
             raise ValueError("Invalid value {!r} for `what'.".format(what))
 
-        self.yank_object['what'] = what
-        self._yank_to_target(s)
+        self._yank_to_target(s, sel, what, keep)
 
-    def _yank_callback(self, s):
-        if not self._current_widget().caret.has_selection() or not s:
-            message.info("Nothing to yank")
-            return
-        self._yank_to_target(s)
-
-    def _yank_to_target(self, s):
-        if self.yank_object['sel'] and utils.supports_selection():
+    def _yank_to_target(self, s, sel, what, keep):
+        if sel and utils.supports_selection():
             target = "primary selection"
         else:
-            self.yank_object['sel'] = False
+            sel = False
             target = "clipboard"
 
-        utils.set_clipboard(s, selection=self.yank_object['sel'])
-        if self.yank_object['what'] != 'selection':
-            message.info("Yanked {} to {}: {}".format(
-                self.yank_object['what'], target, s))
+        utils.set_clipboard(s, selection=sel)
+        if what != 'selection':
+            message.info("Yanked {} to {}: {}".format(what, target, s))
         else:
             message.info("{} {} yanked to {}".format(
                 len(s), "char" if len(s) == 1 else "chars", target))
-            if not self.yank_object['keep']:
+            if not keep:
                 modeman.leave(self._win_id, KeyMode.caret, "yank selected",
                               maybe=True)
-        self.yank_object = None
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     @cmdutils.argument('count', count=True)
@@ -1222,18 +1212,19 @@ class CommandDispatcher:
         log.procs.debug("Executing {} with args {}, userscript={}".format(
             cmd, args, userscript))
         if userscript:
+            def selection_callback(s):
+                try:
+                    self._run_userscript(s, cmd, args, verbose)
+                except cmdexc.CommandError as e:
+                    message.error(str(e))
+
             # ~ expansion is handled by the userscript module.
             # dirty hack for async call because of:
             # https://bugreports.qt.io/browse/QTBUG-53134
             # until it fixed or blocked async call implemented:
             # https://github.com/qutebrowser/qutebrowser/issues/3327
-            self.userscript_object = {
-                'cmd': cmd,
-                'args': args,
-                'verbose': verbose
-            }
             caret = self._current_widget().caret
-            caret.selection(False, self._selection_callback)
+            caret.selection(callback=selection_callback)
         else:
             cmd = os.path.expanduser(cmd)
             proc = guiprocess.GUIProcess(what='command', verbose=verbose,
@@ -1253,13 +1244,7 @@ class CommandDispatcher:
         """Open main startpage in current tab."""
         self.openurl(config.val.url.start_pages[0])
 
-    def _selection_callback(self, s):
-        try:
-            self._run_userscript(s)
-        except cmdexc.CommandError as e:
-            message.error(str(e))
-
-    def _run_userscript(self, selection):
+    def _run_userscript(self, selection, cmd, args, verbose):
         """Run a userscript given as argument.
 
         Args:
@@ -1293,15 +1278,10 @@ class CommandDispatcher:
             env['QUTE_URL'] = url.toString(QUrl.FullyEncoded)
 
         try:
-            args = self.userscript_object['args']
-            verbose = self.userscript_object['verbose']
-            userscripts.run_async(tab, self.userscript_object['cmd'],
-                                  *args, win_id=self._win_id,
+            userscripts.run_async(tab, cmd, *args, win_id=self._win_id,
                                   env=env, verbose=verbose)
         except userscripts.Error as e:
             raise cmdexc.CommandError(e)
-        finally:
-            self.userscript_object = None
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     def quickmark_save(self):

From 8268c1d7ffb2640410718e08eeb08ae29f5ef053 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 5 Jan 2018 19:02:19 +0600
Subject: [PATCH 068/574] Disable eslint rules globally

---
 qutebrowser/javascript/webengine_caret.js | 35 ++++++++++++-----------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 99f6bd76a..dc9b8194f 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1,4 +1,4 @@
-// eslint-disable-line max-lines
+/* eslint-disable max-lines, max-len, max-statements, complexity, max-params, default-case */
 /**
  * Copyright 2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
  *
@@ -28,8 +28,8 @@
 
 "use strict";
 
-window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,max-len
-    function isElementInViewport(node) {  // eslint-disable-line complexity
+window._qutebrowser.caret = (function() {
+    function isElementInViewport(node) {
         let i;
         let boundingRect = (node.getClientRects()[0] ||
             node.getBoundingClientRect());
@@ -97,15 +97,17 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
             }
         }
         if (el !== undefined) {
-            const start = new Cursor(el, 0, ""); // eslint-disable-line no-use-before-define,max-len
-            const end = new Cursor(el, 0, ""); // eslint-disable-line no-use-before-define,max-len
+            /* eslint-disable no-use-before-define */
+            const start = new Cursor(el, 0, "");
+            const end = new Cursor(el, 0, "");
             const nodesCrossed = [];
-            const result = TraverseUtil.getNextChar( // eslint-disable-line no-use-before-define,max-len
+            const result = TraverseUtil.getNextChar(
                 start, end, nodesCrossed, true);
             if (result === null) {
                 return;
             }
-            CaretBrowsing.setAndValidateSelection(start, start); // eslint-disable-line no-use-before-define,max-len
+            CaretBrowsing.setAndValidateSelection(start, start);
+            /* eslint-enable no-use-before-define */
         }
     }
 
@@ -182,7 +184,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
         return null;
     };
 
-    axs.color.Color = function(red, green, blue, alpha) { // eslint-disable-line max-params,max-len
+    axs.color.Color = function(red, green, blue, alpha) {
         this.red = red;
         this.green = green;
         this.blue = blue;
@@ -302,7 +304,8 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
         return `rgba(${arr})`;
     };
 
-    const Cursor = function(node, index, text) { // eslint-disable-line func-style,max-len
+    // eslint-disable-next-line func-style
+    const Cursor = function(node, index, text) {
         this.node = node;
         this.index = index;
         this.text = text;
@@ -359,7 +362,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
         return false;
     };
 
-    TraverseUtil.forwardsChar = function(cursor, nodesCrossed) { // eslint-disable-line max-statements,max-len
+    TraverseUtil.forwardsChar = function(cursor, nodesCrossed) {
         for (;;) {
             let childNode = null;
             if (!TraverseUtil.treatAsLeafNode(cursor.node)) {
@@ -425,7 +428,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
         }
     };
 
-    TraverseUtil.getNextChar = function( // eslint-disable-line max-params
+    TraverseUtil.getNextChar = function(
         startCursor, endCursor, nodesCrossed, skipWhitespace) {
         startCursor.copyFrom(endCursor);
         let fChar = TraverseUtil.forwardsChar(endCursor, nodesCrossed);
@@ -496,7 +499,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
 
     CaretBrowsing.blinkFlag = true;
 
-    CaretBrowsing.isControlThatNeedsArrowKeys = function(node) { // eslint-disable-line complexity,max-len
+    CaretBrowsing.isControlThatNeedsArrowKeys = function(node) {
         if (!node) {
             return false;
         }
@@ -510,7 +513,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
         }
 
         if (node.constructor === HTMLInputElement) {
-            switch (node.type) { // eslint-disable-line default-case
+            switch (node.type) {
             case "email":
             case "number":
             case "password":
@@ -533,7 +536,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
 
         if (node.getAttribute && isFocusable(node)) {
             const role = node.getAttribute("role");
-            switch (role) { // eslint-disable-line default-case
+            switch (role) {
             case "combobox":
             case "grid":
             case "gridcell":
@@ -716,7 +719,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
         }
     };
 
-    CaretBrowsing.getCursorRect = function(cursor) { // eslint-disable-line max-statements,max-len
+    CaretBrowsing.getCursorRect = function(cursor) {
         let node = cursor.node;
         const index = cursor.index;
         const rect = {
@@ -770,7 +773,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
     };
 
     CaretBrowsing.updateCaretOrSelection =
-        function(scrollToSelection) { // eslint-disable-line max-statements
+        function(scrollToSelection) {
             const previousX = CaretBrowsing.caretX;
             const previousY = CaretBrowsing.caretY;
 

From 5553e64a75c835c27b637e1e86f0431ce5b4b9b7 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 5 Jan 2018 19:21:55 +0600
Subject: [PATCH 069/574] Restore chrome-caretbrowsing extension comments

---
 qutebrowser/javascript/webengine_caret.js | 292 +++++++++++++++++++++-
 1 file changed, 289 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index dc9b8194f..aeca235c9 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1,4 +1,5 @@
-/* eslint-disable max-lines, max-len, max-statements, complexity, max-params, default-case */
+/* eslint-disable max-lines, max-len, max-statements, complexity,
+max-params, default-case, valid-jsdoc */
 /**
  * Copyright 2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
  *
@@ -111,6 +112,19 @@ window._qutebrowser.caret = (function() {
         }
     }
 
+    /**
+     * Return whether a node is focusable. This includes nodes whose tabindex
+     * attribute is set to "-1" explicitly - these nodes are not in the tab
+     * order, but they should still be focused if the user navigates to them
+     * using linear or smart DOM navigation.
+     *
+     * Note that when the tabIndex property of an Element is -1, that doesn't
+     * tell us whether the tabIndex attribute is missing or set to "-1" explicitly,
+     * so we have to check the attribute.
+     *
+     * @param {Object} targetNode The node to check if it's focusable.
+     * @return {boolean} True if the node is focusable.
+     */
     function isFocusable(targetNode) {
         if (!targetNode || typeof (targetNode.tabIndex) !== "number") {
             return false;
@@ -304,6 +318,21 @@ window._qutebrowser.caret = (function() {
         return `rgba(${arr})`;
     };
 
+    /**
+     * A class to represent a cursor location in the document,
+     * like the start position or end position of a selection range.
+     *
+     * Later this may be extended to support "virtual text" for an object,
+     * like the ALT text for an image.
+     *
+     * Note: we cache the text of a particular node at the time we
+     * traverse into it. Later we should add support for dynamically
+     * reloading it.
+     * @param {Node} node The DOM node.
+     * @param {number} index The index of the character within the node.
+     * @param {string} text The cached text contents of the node.
+     * @constructor
+     */
     // eslint-disable-next-line func-style
     const Cursor = function(node, index, text) {
         this.node = node;
@@ -311,18 +340,35 @@ window._qutebrowser.caret = (function() {
         this.text = text;
     };
 
+    /**
+     * @return {Cursor} A new cursor pointing to the same location.
+     */
     Cursor.prototype.clone = function() {
         return new Cursor(this.node, this.index, this.text);
     };
 
+    /**
+     * Modify this cursor to point to the location that another cursor points to.
+     * @param {Cursor} otherCursor The cursor to copy from.
+     */
     Cursor.prototype.copyFrom = function(otherCursor) {
         this.node = otherCursor.node;
         this.index = otherCursor.index;
         this.text = otherCursor.text;
     };
 
+    /**
+     * Utility functions for stateless DOM traversal.
+     * @constructor
+     */
     const TraverseUtil = {};
 
+    /**
+     * Gets the text representation of a node. This allows us to substitute
+     * alt text, names, or titles for html elements that provide them.
+     * @param {Node} node A DOM node.
+     * @return {string} A text string representation of the node.
+     */
     TraverseUtil.getNodeText = function(node) {
         if (node.constructor === Text) {
             return node.data;
@@ -330,16 +376,45 @@ window._qutebrowser.caret = (function() {
         return "";
     };
 
+    /**
+     * Return true if a node should be treated as a leaf node, because
+     * its children are properties of the object that shouldn't be traversed.
+     *
+     * TODO(dmazzoni): replace this with a predicate that detects nodes with
+     * ARIA roles and other objects that have their own description.
+     * For now we just detect a couple of common cases.
+     *
+     * @param {Node} node A DOM node.
+     * @return {boolean} True if the node should be treated as a leaf node.
+     */
     TraverseUtil.treatAsLeafNode = function(node) {
         return node.childNodes.length === 0 ||
             node.nodeName === "SELECT" ||
             node.nodeName === "OBJECT";
     };
 
+    /**
+     * Return true only if a single character is whitespace.
+     * From https://developer.mozilla.org/en/Whitespace_in_the_DOM,
+     * whitespace is defined as one of the characters
+     *  "\t" TAB \u0009
+     *  "\n" LF  \u000A
+     *  "\r" CR  \u000D
+     *  " "  SPC \u0020.
+     *
+     * @param {string} c A string containing a single character.
+     * @return {boolean} True if the character is whitespace, otherwise false.
+     */
     TraverseUtil.isWhitespace = function(ch) {
         return (ch === " " || ch === "\n" || ch === "\r" || ch === "\t");
     };
 
+    /**
+     * Use the computed CSS style to figure out if this DOM node is currently
+     * visible.
+     * @param {Node} node A HTML DOM node.
+     * @return {boolean} Whether or not the html node is visible.
+     */
     TraverseUtil.isVisible = function(node) {
         if (!node.style) {
             return true;
@@ -350,6 +425,11 @@ window._qutebrowser.caret = (function() {
             style.visibility !== "hidden");
     };
 
+    /**
+     * Use the class name to figure out if this DOM node should be traversed.
+     * @param {Node} node A HTML DOM node.
+     * @return {boolean} Whether or not the html node should be traversed.
+     */
     TraverseUtil.isSkipped = function(_node) {
         let node = _node;
         if (node.constructor === Text) {
@@ -362,6 +442,16 @@ window._qutebrowser.caret = (function() {
         return false;
     };
 
+    /**
+     * Moves the cursor forwards until it has crossed exactly one character.
+     * @param {Cursor} cursor The cursor location where the search should start.
+     *     On exit, the cursor will be immediately to the right of the
+     *     character returned.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @return {?string} The character found, or null if the bottom of the
+     *     document has been reached.
+     */
     TraverseUtil.forwardsChar = function(cursor, nodesCrossed) {
         for (;;) {
             let childNode = null;
@@ -386,11 +476,14 @@ window._qutebrowser.caret = (function() {
                     nodesCrossed.push(cursor.node);
                 }
             } else {
+                // Return the next character from this leaf node.
                 if (cursor.index < cursor.text.length) {
                     return cursor.text[cursor.index++];
                 }
 
+                // Move to the next sibling, going up the tree as necessary.
                 while (cursor.node !== null) {
+                    // Try to move to the next sibling.
                     let siblingNode = null;
                     for (let node = cursor.node.nextSibling;
                         node !== null;
@@ -414,6 +507,7 @@ window._qutebrowser.caret = (function() {
                         break;
                     }
 
+                    // Otherwise, move to the parent.
                     const parentNode = cursor.node.parentNode;
                     if (parentNode &&
                         parentNode.constructor !== HTMLBodyElement) {
@@ -428,16 +522,36 @@ window._qutebrowser.caret = (function() {
         }
     };
 
+    /**
+     * Finds the next character, starting from endCursor.  Upon exit, startCursor
+     * and endCursor will surround the next character. If skipWhitespace is
+     * true, will skip until a real character is found. Otherwise, it will
+     * attempt to select all of the whitespace between the initial position
+     * of endCursor and the next non-whitespace character.
+     * @param {Cursor} startCursor On exit, points to the position before
+     *     the char.
+     * @param {Cursor} endCursor The position to start searching for the next
+     *     char.  On exit, will point to the position past the char.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @param {boolean} skipWhitespace If true, will keep scanning until a
+     *     non-whitespace character is found.
+     * @return {?string} The next char, or null if the bottom of the
+     *     document has been reached.
+     */
     TraverseUtil.getNextChar = function(
         startCursor, endCursor, nodesCrossed, skipWhitespace) {
+        // Save the starting position and get the first character.
         startCursor.copyFrom(endCursor);
         let fChar = TraverseUtil.forwardsChar(endCursor, nodesCrossed);
         if (fChar === null) {
             return null;
         }
 
+        // Keep track of whether the first character was whitespace.
         const initialWhitespace = TraverseUtil.isWhitespace(fChar);
 
+        // Keep scanning until we find a non-whitespace or non-skipped character.
         while ((TraverseUtil.isWhitespace(fChar)) ||
             (TraverseUtil.isSkipped(endCursor.node))) {
             fChar = TraverseUtil.forwardsChar(endCursor, nodesCrossed);
@@ -446,6 +560,8 @@ window._qutebrowser.caret = (function() {
             }
         }
         if (skipWhitespace || !initialWhitespace) {
+            // If skipWhitepace is true, or if the first character we encountered
+            // was not whitespace, return that non-whitespace character.
             startCursor.copyFrom(endCursor);
             startCursor.index--;
             return fChar;
@@ -453,52 +569,153 @@ window._qutebrowser.caret = (function() {
 
         for (let i = 0; i < nodesCrossed.length; i++) {
             if (TraverseUtil.isSkipped(nodesCrossed[i])) {
+                // We need to make sure that startCursor and endCursor aren't
+                // surrounding a skippable node.
                 endCursor.index--;
                 startCursor.copyFrom(endCursor);
                 startCursor.index--;
                 return " ";
             }
         }
+        // Otherwise, return all of the whitespace before that last character.
         endCursor.index--;
         return " ";
     };
 
+    /**
+     * The class handling the Caret Browsing implementation in the page.
+     * Sets up communication with the background page, and then when caret
+     * browsing is enabled, response to various key events to move the caret
+     * or selection within the text content of the document. Uses the native
+     * Chrome selection wherever possible, but displays its own flashing
+     * caret using a DIV because there's no native caret available.
+     * @constructor
+     */
     const CaretBrowsing = {};
 
+    /**
+     * Is caret browsing enabled?
+     * @type {boolean}
+     */
     CaretBrowsing.isEnabled = false;
 
+    /**
+     * Keep it enabled even when flipped off (for the options page)?
+     * @type {boolean}
+     */
     CaretBrowsing.forceEnabled = false;
 
+    /**
+     * What to do when the caret appears?
+     * @type {string}
+     */
     CaretBrowsing.onEnable = undefined;
 
+    /**
+     * What to do when the caret jumps?
+     * @type {string}
+     */
     CaretBrowsing.onJump = undefined;
 
+    /**
+     * Is this window / iframe focused? We won't show the caret if not,
+     * especially so that carets aren't shown in two iframes of the same
+     * tab.
+     * @type {boolean}
+     */
     CaretBrowsing.isWindowFocused = false;
 
+    /**
+     * Is the caret actually visible? This is true only if isEnabled and
+     * isWindowFocused are both true.
+     * @type {boolean}
+     */
     CaretBrowsing.isCaretVisible = false;
 
+    /**
+     * The actual caret element, an absolute-positioned flashing line.
+     * @type {Element}
+     */
     CaretBrowsing.caretElement = undefined;
 
+    /**
+     * The x-position of the caret, in absolute pixels.
+     * @type {number}
+     */
     CaretBrowsing.caretX = 0;
 
+    /**
+     * The y-position of the caret, in absolute pixels.
+     * @type {number}
+     */
     CaretBrowsing.caretY = 0;
 
+    /**
+     * The width of the caret in pixels.
+     * @type {number}
+     */
     CaretBrowsing.caretWidth = 0;
 
+    /**
+     * The height of the caret in pixels.
+     * @type {number}
+     */
     CaretBrowsing.caretHeight = 0;
 
+    /**
+     * The foregroundc color.
+     * @type {string}
+     */
     CaretBrowsing.caretForeground = "#000";
 
+    /**
+     * The backgroundc color.
+     * @type {string}
+     */
     CaretBrowsing.caretBackground = "#fff";
 
+    /**
+     * Is the selection collapsed, i.e. are the start and end locations
+     * the same? If so, our blinking caret image is shown; otherwise
+     * the Chrome selection is shown.
+     * @type {boolean}
+     */
     CaretBrowsing.isSelectionCollapsed = false;
 
+    /**
+     * The id returned by window.setInterval for our blink function, so
+     * we can cancel it when caret browsing is disabled.
+     * @type {number?}
+     */
     CaretBrowsing.blinkFunctionId = null;
 
+    /**
+     * The desired x-coordinate to match when moving the caret up and down.
+     * To match the behavior as documented in Mozilla's caret browsing spec
+     * (http://www.mozilla.org/access/keyboard/proposal), we keep track of the
+     * initial x position when the user starts moving the caret up and down,
+     * so that the x position doesn't drift as you move throughout lines, but
+     * stays as close as possible to the initial position. This is reset when
+     * moving left or right or clicking.
+     * @type {number?}
+     */
     CaretBrowsing.targetX = null;
 
+    /**
+     * A flag that flips on or off as the caret blinks.
+     * @type {boolean}
+     */
     CaretBrowsing.blinkFlag = true;
 
+    /**
+     * Check if a node is a control that normally allows the user to interact
+     * with it using arrow keys. We won't override the arrow keys when such a
+     * control has focus, the user must press Escape to do caret browsing outside
+     * that control.
+     * @param {Node} node A node to check.
+     * @return {boolean} True if this node is a control that the user can
+     *     interact with using arrow keys.
+     */
     CaretBrowsing.isControlThatNeedsArrowKeys = function(node) {
         if (!node) {
             return false;
@@ -522,7 +739,7 @@ window._qutebrowser.caret = (function() {
             case "tel":
             case "url":
             case "":
-                return true;
+                return true;  // All of these are text boxes.
             case "datetime":
             case "datetime-local":
             case "date":
@@ -530,10 +747,11 @@ window._qutebrowser.caret = (function() {
             case "radio":
             case "range":
             case "week":
-                return true;
+                return true;  // These are other input elements that use arrows.
             }
         }
 
+        // Handle focusable ARIA controls.
         if (node.getAttribute && isFocusable(node)) {
             const role = node.getAttribute("role");
             switch (role) {
@@ -592,6 +810,10 @@ window._qutebrowser.caret = (function() {
         document.body.appendChild(node);
     };
 
+    /**
+     * If there's no initial selection, set the cursor just before the
+     * first text character in the document.
+     */
     CaretBrowsing.setInitialCursor = function(platform) {
         CaretBrowsing.isWindows = platform === "Windows";
         if (window.getSelection().rangeCount > 0) {
@@ -605,6 +827,13 @@ window._qutebrowser.caret = (function() {
         CaretBrowsing.selectionEnabled = false;
     };
 
+    /**
+     * Try to set the window's selection to be between the given start and end
+     * cursors, and return whether or not it was successful.
+     * @param {Cursor} start The start position.
+     * @param {Cursor} end The end position.
+     * @return {boolean} True if the selection was successfully set.
+     */
     CaretBrowsing.setAndValidateSelection = function(start, end) {
         const sel = window.getSelection();
         sel.setBaseAndExtent(start.node, start.index, end.node, end.index);
@@ -619,6 +848,13 @@ window._qutebrowser.caret = (function() {
             sel.focusOffset === end.index);
     };
 
+    /**
+     * Set focus to a node if it's focusable. If it's an input element,
+     * select the text, otherwise it doesn't appear focused to the user.
+     * Every other control behaves normally if you just call focus() on it.
+     * @param {Node} node The node to focus.
+     * @return {boolean} True if the node was focused.
+     */
     CaretBrowsing.setFocusToNode = function(nodeArg) {
         let node = nodeArg;
         while (node && node !== document.body) {
@@ -635,6 +871,9 @@ window._qutebrowser.caret = (function() {
         return false;
     };
 
+    /**
+     * Set the caret element's normal style, i.e. not when animating.
+     */
     CaretBrowsing.setCaretElementNormalStyle = function() {
         const element = CaretBrowsing.caretElement;
         element.className = "CaretBrowsing_Caret";
@@ -650,6 +889,9 @@ window._qutebrowser.caret = (function() {
         element.style.color = CaretBrowsing.caretForeground;
     };
 
+    /**
+     * Animate the caret element into the normal style.
+     */
     CaretBrowsing.animateCaretElement = function() {
         const element = CaretBrowsing.caretElement;
         element.style.left = `${CaretBrowsing.caretX - 50}px`;
@@ -658,6 +900,8 @@ window._qutebrowser.caret = (function() {
         element.style.height = `${CaretBrowsing.caretHeight + 200}px`;
         element.className = "CaretBrowsing_AnimateCaret";
 
+        // Start the animation. The setTimeout is so that the old values will get
+        // applied first, so we can animate to the new values.
         window.setTimeout(() => {
             if (!CaretBrowsing.caretElement) {
                 return;
@@ -674,6 +918,9 @@ window._qutebrowser.caret = (function() {
         }, 0);
     };
 
+    /**
+     * Quick flash and then show the normal caret style.
+     */
     CaretBrowsing.flashCaretElement = function() {
         const x = CaretBrowsing.caretX;
         const y = CaretBrowsing.caretY;
@@ -694,6 +941,11 @@ window._qutebrowser.caret = (function() {
         }, 250);
     };
 
+    /**
+     * Create the caret element. This assumes that caretX, caretY,
+     * caretWidth, and caretHeight have all been set. The caret is
+     * animated in so the user can find it when it first appears.
+     */
     CaretBrowsing.createCaretElement = function() {
         const element = document.createElement("div");
         element.className = "CaretBrowsing_Caret";
@@ -709,6 +961,9 @@ window._qutebrowser.caret = (function() {
         }
     };
 
+    /**
+     * Recreate the caret element, triggering any intro animation.
+     */
     CaretBrowsing.recreateCaretElement = function() {
         if (CaretBrowsing.caretElement) {
             window.clearInterval(CaretBrowsing.blinkFunctionId);
@@ -719,6 +974,15 @@ window._qutebrowser.caret = (function() {
         }
     };
 
+    /**
+     * Get the rectangle for a cursor position. This is tricky because
+     * you can't get the bounding rectangle of an empty range, so this function
+     * computes the rect by trying a range including one character earlier or
+     * later than the cursor position.
+     * @param {Cursor} cursor A single cursor position.
+     * @return {{left: number, top: number, width: number, height: number}}
+     *     The bounding rectangle of the cursor.
+     */
     CaretBrowsing.getCursorRect = function(cursor) {
         let node = cursor.node;
         const index = cursor.index;
@@ -772,6 +1036,12 @@ window._qutebrowser.caret = (function() {
         return rect;
     };
 
+    /**
+     * Compute the new location of the caret or selection and update
+     * the element as needed.
+     * @param {boolean} scrollToSelection If true, will also scroll the page
+     *     to the caret / selection location.
+     */
     CaretBrowsing.updateCaretOrSelection =
         function(scrollToSelection) {
             const previousX = CaretBrowsing.caretX;
@@ -857,6 +1127,8 @@ window._qutebrowser.caret = (function() {
             CaretBrowsing.caretForeground = axs.color.colorToString(fg);
 
             if (scrollToSelection) {
+                // Scroll just to the "focus" position of the selection,
+                // the part the user is manipulating.
                 const rect = CaretBrowsing.getCursorRect(
                     new Cursor(sel.focusNode, sel.focusOffset,
                         TraverseUtil.getNodeText(sel.focusNode)));
@@ -933,6 +1205,13 @@ window._qutebrowser.caret = (function() {
         CaretBrowsing.updateIsCaretVisible();
     };
 
+    /**
+     * Event handler, called when the mouse is clicked. Chrome already
+     * sets the selection when the mouse is clicked, all we need to do is
+     * update our cursor.
+     * @param {Event} evt The DOM event.
+     * @return {boolean} True if the default action should be performed.
+     */
     CaretBrowsing.onClick = function() {
         if (!CaretBrowsing.isEnabled) {
             return true;
@@ -944,6 +1223,9 @@ window._qutebrowser.caret = (function() {
         return true;
     };
 
+    /**
+     * Called at a regular interval. Blink the cursor by changing its visibility.
+     */
     CaretBrowsing.caretBlinkFunction = function() {
         if (CaretBrowsing.caretElement) {
             if (CaretBrowsing.blinkFlag) {
@@ -958,6 +1240,10 @@ window._qutebrowser.caret = (function() {
         }
     };
 
+    /**
+     * Update whether or not the caret is visible, based on whether caret browsing
+     * is enabled and whether this window / iframe has focus.
+     */
     CaretBrowsing.updateIsCaretVisible = function() {
         CaretBrowsing.isCaretVisible =
             (CaretBrowsing.isEnabled && CaretBrowsing.isWindowFocused);

From dc8c919c30b52427ffdd2796d449eca9fbf7e1f9 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 5 Jan 2018 22:44:07 +0600
Subject: [PATCH 070/574] Fix pylint warnings

---
 qutebrowser/browser/commands.py               |  8 +++----
 qutebrowser/browser/webengine/webenginetab.py |  5 ++--
 qutebrowser/javascript/webengine_caret.js     | 24 ++++++++++++-------
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 724699c0b..3fa6fd772 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -849,14 +849,14 @@ class CommandDispatcher:
             s = self._yank_url(what)
             what = 'URL'  # For printing
         elif what == 'selection':
-            def yank_callback(s):
+            def _selection_callback(s):
                 if not self._current_widget().caret.has_selection() or not s:
                     message.info("Nothing to yank")
                     return
                 self._yank_to_target(s, sel, what, keep)
 
             caret = self._current_widget().caret
-            caret.selection(callback=yank_callback)
+            caret.selection(callback=_selection_callback)
             return
         else:  # pragma: no cover
             raise ValueError("Invalid value {!r} for `what'.".format(what))
@@ -1212,7 +1212,7 @@ class CommandDispatcher:
         log.procs.debug("Executing {} with args {}, userscript={}".format(
             cmd, args, userscript))
         if userscript:
-            def selection_callback(s):
+            def _selection_callback(s):
                 try:
                     self._run_userscript(s, cmd, args, verbose)
                 except cmdexc.CommandError as e:
@@ -1224,7 +1224,7 @@ class CommandDispatcher:
             # until it fixed or blocked async call implemented:
             # https://github.com/qutebrowser/qutebrowser/issues/3327
             caret = self._current_widget().caret
-            caret.selection(callback=selection_callback)
+            caret.selection(callback=_selection_callback)
         else:
             cmd = os.path.expanduser(cmd)
             proc = guiprocess.GUIProcess(what='command', verbose=verbose,
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 38a16b323..efc4c3035 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -203,12 +203,13 @@ class WebEngineCaret(browsertab.AbstractCaret):
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_entered(self, mode):
         self._tab.run_js_async(
-            javascript.assemble('caret', 'setInitialCursor', platform.platform()))
+            javascript.assemble('caret', 'setInitialCursor',
+                                platform.platform()))
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_left(self):
         self.drop_selection()
-        self._js_call('toggle')
+        self._js_call('disableCaret')
 
     def move_to_next_line(self, count=1):
         for _ in range(count):
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index aeca235c9..5daa4aae4 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -816,15 +816,15 @@ window._qutebrowser.caret = (function() {
      */
     CaretBrowsing.setInitialCursor = function(platform) {
         CaretBrowsing.isWindows = platform === "Windows";
-        if (window.getSelection().rangeCount > 0) {
-            return;
+        const selectionRange = window.getSelection().toString().length;
+        if (selectionRange === 0) {
+            positionCaret();
         }
 
-        positionCaret();
         CaretBrowsing.injectCaretStyles();
         CaretBrowsing.toggle();
         CaretBrowsing.initiated = true;
-        CaretBrowsing.selectionEnabled = false;
+        CaretBrowsing.selectionEnabled = selectionRange > 0;
     };
 
     /**
@@ -1193,15 +1193,17 @@ window._qutebrowser.caret = (function() {
         }, 0);
     };
 
-    CaretBrowsing.toggle = function() {
+    CaretBrowsing.toggle = function(value) {
         if (CaretBrowsing.forceEnabled) {
             CaretBrowsing.recreateCaretElement();
             return;
         }
 
-        CaretBrowsing.isEnabled = !CaretBrowsing.isEnabled;
-        const obj = {};
-        obj.enabled = CaretBrowsing.isEnabled;
+        if (value === undefined) {
+            CaretBrowsing.isEnabled = !CaretBrowsing.isEnabled;
+        } else {
+            CaretBrowsing.isEnabled = value;
+        }
         CaretBrowsing.updateIsCaretVisible();
     };
 
@@ -1306,12 +1308,16 @@ window._qutebrowser.caret = (function() {
             return;
         }
 
-        if (!window.getSelection().toString()) {
+        if (window.getSelection().toString().length === 0) {
             positionCaret();
         }
         CaretBrowsing.toggle();
     };
 
+    funcs.disableCaret = () => {
+        CaretBrowsing.toggle(false);
+    };
+
     funcs.toggle = () => {
         CaretBrowsing.toggle();
     };

From c4e50369e7a08f113f1ad6df64180ec7983aba16 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Sat, 6 Jan 2018 22:43:39 +0600
Subject: [PATCH 071/574] Enable caret only when mode is 'caret'

---
 qutebrowser/browser/webengine/webenginetab.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index efc4c3035..ea646cda3 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -202,6 +202,9 @@ class WebEngineCaret(browsertab.AbstractCaret):
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_entered(self, mode):
+        if mode != usertypes.KeyMode.caret:
+            return
+
         self._tab.run_js_async(
             javascript.assemble('caret', 'setInitialCursor',
                                 platform.platform()))

From aebd59247d85938aabce7848ceefdf33836545a0 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Sat, 6 Jan 2018 22:45:53 +0600
Subject: [PATCH 072/574] Check `platform` variable

---
 qutebrowser/javascript/webengine_caret.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 5daa4aae4..052d3a4c1 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -815,7 +815,9 @@ window._qutebrowser.caret = (function() {
      * first text character in the document.
      */
     CaretBrowsing.setInitialCursor = function(platform) {
-        CaretBrowsing.isWindows = platform === "Windows";
+        if (platform) {
+            CaretBrowsing.isWindows = platform.indexOf("Windows") !== -1;
+        }
         const selectionRange = window.getSelection().toString().length;
         if (selectionRange === 0) {
             positionCaret();

From 555f43c8546c50dbc4e7a9b995e8389ced697d4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nemanja=20Nedeljkovi=C4=87?= <nemanjan00@gmail.com>
Date: Sat, 6 Jan 2018 19:18:17 +0100
Subject: [PATCH 073/574] Add ng-click for hinting to Angular 1.x links

---
 qutebrowser/browser/webelem.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/webelem.py b/qutebrowser/browser/webelem.py
index 4a1cc02b5..bcea5aeb0 100644
--- a/qutebrowser/browser/webelem.py
+++ b/qutebrowser/browser/webelem.py
@@ -42,7 +42,7 @@ Group = enum.Enum('Group', ['all', 'links', 'images', 'url', 'inputs'])
 SELECTORS = {
     Group.all: ('a, area, textarea, select, input:not([type=hidden]), button, '
                 'frame, iframe, link, [onclick], [onmousedown], [role=link], '
-                '[role=option], [role=button], img'),
+                '[role=option], [role=button], img, [ng-click]'),
     Group.links: 'a[href], area[href], link[href], [role=link][href]',
     Group.images: 'img',
     Group.url: '[src], [href]',

From 8500509532133a55130f4f40ca1baace0f6a97f7 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Sat, 6 Jan 2018 11:13:54 -0800
Subject: [PATCH 074/574] Implement is_visible for same-origin frames

---
 qutebrowser/javascript/webelem.js | 33 +++++++++++++++++++------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index 12459f148..c236a5b0a 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -55,6 +55,18 @@ window._qutebrowser.webelem = (function() {
         return frame.frameElement.getBoundingClientRect();
     }
 
+    // Add an offset rect to a base rect, for use with frames
+    function add_offset_rect(base, offset) {
+        return {
+            "top": base.top + offset.top,
+            "left": base.left + offset.left,
+            "bottom": base.bottom + offset.top,
+            "right": base.right + offset.left,
+            "height": base.height,
+            "width": base.width,
+        };
+    }
+
     function get_caret_position(elem, frame) {
         // With older Chromium versions (and QtWebKit), InvalidStateError will
         // be thrown if elem doesn't have selectionStart.
@@ -126,14 +138,9 @@ window._qutebrowser.webelem = (function() {
 
         for (let k = 0; k < client_rects.length; ++k) {
             const rect = client_rects[k];
-            out.rects.push({
-                "top": rect.top + frame_offset_rect.top,
-                "right": rect.right + frame_offset_rect.right,
-                "bottom": rect.bottom + frame_offset_rect.bottom,
-                "left": rect.left + frame_offset_rect.left,
-                "height": rect.height,
-                "width": rect.width,
-            });
+            out.rects.push(
+                add_offset_rect(rect, frame_offset_rect)
+            );
         }
 
         // console.log(JSON.stringify(out));
@@ -141,9 +148,7 @@ window._qutebrowser.webelem = (function() {
         return out;
     }
 
-    function is_visible(elem) {
-        // FIXME:qtwebengine Handle frames and iframes
-
+    function is_visible(elem, frame = null) {
         // Adopted from vimperator:
         // https://github.com/vimperator/vimperator-labs/blob/vimperator-3.14.0/common/content/hints.js#L259-L285
         // FIXME:qtwebengine we might need something more sophisticated like
@@ -151,7 +156,8 @@ window._qutebrowser.webelem = (function() {
         // https://github.com/1995eaton/chromium-vim/blob/1.2.85/content_scripts/dom.js#L74-L134
 
         const win = elem.ownerDocument.defaultView;
-        let rect = elem.getBoundingClientRect();
+        const offset_rect = get_frame_offset(frame);
+        let rect = add_offset_rect(elem.getBoundingClientRect(), offset_rect);
 
         if (!rect ||
                 rect.top > window.innerHeight ||
@@ -212,7 +218,8 @@ window._qutebrowser.webelem = (function() {
                 const subelems = frame.document.
                     querySelectorAll(selector);
                 for (let elem_num = 0; elem_num < subelems.length; ++elem_num) {
-                    if (!only_visible || is_visible(subelems[elem_num])) {
+                    if (!only_visible ||
+                        is_visible(subelems[elem_num], frame)) {
                         out.push(serialize_elem(subelems[elem_num], frame));
                     }
                 }

From f64af6b64a0554eada2ab3c32f18b1101c8372f0 Mon Sep 17 00:00:00 2001
From: Nemanja Nedeljkovic <nemanjan00@gmail.com>
Date: Sat, 6 Jan 2018 20:45:13 +0100
Subject: [PATCH 075/574] Angular 1 test

---
 tests/end2end/data/hints/html/angular1.html | 25 +++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 tests/end2end/data/hints/html/angular1.html

diff --git a/tests/end2end/data/hints/html/angular1.html b/tests/end2end/data/hints/html/angular1.html
new file mode 100644
index 000000000..9bf365ecb
--- /dev/null
+++ b/tests/end2end/data/hints/html/angular1.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular.min.js"></script>
+<body ng-app="myApp">
+
+<!-- target: hello.txt -->
+
+<div ng-controller="myCtrl">
+	<p>Click the button to run a function:</p>
+	<p ng-click="myFunc()">OK</p>
+	<p>The button has been clicked {{count}} times.</p>
+</div>
+
+<script>
+angular.module('myApp', [])
+	.controller('myCtrl', ['$scope', function($scope) {
+		$scope.count = 0;
+		$scope.myFunc = function() {
+			$scope.count++;
+			window.location = "hello.txt";
+		};
+	}]);
+</script>
+</body>
+</html>

From 22725beede1dd6a61afb65e336baf8832255ce08 Mon Sep 17 00:00:00 2001
From: Nemanja Nedeljkovic <nemanjan00@gmail.com>
Date: Sat, 6 Jan 2018 21:22:12 +0100
Subject: [PATCH 076/574] Maybe fix?

---
 tests/end2end/data/hints/html/angular1.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/end2end/data/hints/html/angular1.html b/tests/end2end/data/hints/html/angular1.html
index 9bf365ecb..95f28a746 100644
--- a/tests/end2end/data/hints/html/angular1.html
+++ b/tests/end2end/data/hints/html/angular1.html
@@ -7,7 +7,7 @@
 
 <div ng-controller="myCtrl">
 	<p>Click the button to run a function:</p>
-	<p ng-click="myFunc()">OK</p>
+	<p id="link" ng-click="myFunc()">OK</p>
 	<p>The button has been clicked {{count}} times.</p>
 </div>
 

From 9bb6ba0823ada12df1d31ea89fc2abc9dd8ed3dc Mon Sep 17 00:00:00 2001
From: Nemanja Nedeljkovic <nemanjan00@gmail.com>
Date: Sat, 6 Jan 2018 22:09:17 +0100
Subject: [PATCH 077/574] Fix

---
 tests/end2end/data/hints/html/angular1.html | 39 +++++++++++----------
 tests/end2end/test_hints_html.py            |  2 +-
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/tests/end2end/data/hints/html/angular1.html b/tests/end2end/data/hints/html/angular1.html
index 95f28a746..de7712c0b 100644
--- a/tests/end2end/data/hints/html/angular1.html
+++ b/tests/end2end/data/hints/html/angular1.html
@@ -1,25 +1,26 @@
 <!DOCTYPE html>
-<html>
-<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular.min.js"></script>
-<body ng-app="myApp">
 
 <!-- target: hello.txt -->
 
-<div ng-controller="myCtrl">
-	<p>Click the button to run a function:</p>
-	<p id="link" ng-click="myFunc()">OK</p>
-	<p>The button has been clicked {{count}} times.</p>
-</div>
+<html>
+	<body ng-app="myApp">
 
-<script>
-angular.module('myApp', [])
-	.controller('myCtrl', ['$scope', function($scope) {
-		$scope.count = 0;
-		$scope.myFunc = function() {
-			$scope.count++;
-			window.location = "hello.txt";
-		};
-	}]);
-</script>
-</body>
+		<div ng-controller="myCtrl">
+			<p>Click the button to run a function:</p>
+			<p id="link" ng-click="myFunc()">OK</p>
+			<p>The button has been clicked {{count}} times.</p>
+		</div>
+
+		<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular.min.js"></script>
+		<script>
+			angular.module('myApp', [])
+			.controller('myCtrl', ['$scope', function($scope) {
+				$scope.count = 0;
+				$scope.myFunc = function() {
+					$scope.count++;
+					window.location = "/data/hello.txt";
+				};
+			}]);
+		</script>
+	</body>
 </html>
diff --git a/tests/end2end/test_hints_html.py b/tests/end2end/test_hints_html.py
index 6654e1388..fb30abefe 100644
--- a/tests/end2end/test_hints_html.py
+++ b/tests/end2end/test_hints_html.py
@@ -106,7 +106,7 @@ def test_hints(test_name, zoom_text_only, zoom_level, find_implementation,
         quteproc.set_setting('hints.find_implementation', find_implementation)
     quteproc.send_cmd(':zoom {}'.format(zoom_level))
     # follow hint
-    quteproc.send_cmd(':hint links normal')
+    quteproc.send_cmd(':hint all normal')
     quteproc.wait_for(message='hints: a', category='hints')
     quteproc.send_cmd(':follow-hint a')
     quteproc.wait_for_load_finished('data/' + parsed.target)

From 81a9ea58d6eedc24ab849f655adccfb15c65b457 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Sun, 7 Jan 2018 09:25:29 +0600
Subject: [PATCH 078/574] Restore pylint rule

---
 tests/end2end/features/test_caret_bdd.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/end2end/features/test_caret_bdd.py b/tests/end2end/features/test_caret_bdd.py
index abd1821d8..ec9506859 100644
--- a/tests/end2end/features/test_caret_bdd.py
+++ b/tests/end2end/features/test_caret_bdd.py
@@ -19,6 +19,7 @@
 
 import pytest_bdd as bdd
 
+# pylint: disable=unused-import
 from end2end.features.test_yankpaste_bdd import init_fake_clipboard
 
 bdd.scenarios('caret.feature')

From 64dac66259564f72c58a51a22fc9b82a07c58725 Mon Sep 17 00:00:00 2001
From: Nemanja Nedeljkovic <nemanjan00@gmail.com>
Date: Sun, 7 Jan 2018 11:22:46 +0100
Subject: [PATCH 079/574] local angular

---
 .../data/hints/angular1/angular.min.js        | 332 ++++++++++++++++++
 .../html/{angular1.html => angular.html}      |   2 +-
 2 files changed, 333 insertions(+), 1 deletion(-)
 create mode 100644 tests/end2end/data/hints/angular1/angular.min.js
 rename tests/end2end/data/hints/html/{angular1.html => angular.html} (84%)

diff --git a/tests/end2end/data/hints/angular1/angular.min.js b/tests/end2end/data/hints/angular1/angular.min.js
new file mode 100644
index 000000000..c4bf158ec
--- /dev/null
+++ b/tests/end2end/data/hints/angular1/angular.min.js
@@ -0,0 +1,332 @@
+/*
+ AngularJS v1.6.4
+ (c) 2010-2017 Google, Inc. http://angularjs.org
+ License: MIT
+*/
+(function(x){'use strict';function L(a,b){b=b||Error;return function(){var d=arguments[0],c;c="["+(a?a+":":"")+d+"] http://errors.angularjs.org/1.6.4/"+(a?a+"/":"")+d;for(d=1;d<arguments.length;d++){c=c+(1==d?"?":"&")+"p"+(d-1)+"=";var e=encodeURIComponent,f;f=arguments[d];f="function"==typeof f?f.toString().replace(/ \{[\s\S]*$/,""):"undefined"==typeof f?"undefined":"string"!=typeof f?JSON.stringify(f):f;c+=e(f)}return new b(c)}}function me(a){if(C(a))u(a.objectMaxDepth)&&(Ic.objectMaxDepth=Sb(a.objectMaxDepth)?
+a.objectMaxDepth:NaN);else return Ic}function Sb(a){return ba(a)&&0<a}function qa(a){if(null==a||Wa(a))return!1;if(H(a)||F(a)||B&&a instanceof B)return!0;var b="length"in Object(a)&&a.length;return ba(b)&&(0<=b&&(b-1 in a||a instanceof Array)||"function"===typeof a.item)}function q(a,b,d){var c,e;if(a)if(D(a))for(c in a)"prototype"!==c&&"length"!==c&&"name"!==c&&a.hasOwnProperty(c)&&b.call(d,a[c],c,a);else if(H(a)||qa(a)){var f="object"!==typeof a;c=0;for(e=a.length;c<e;c++)(f||c in a)&&b.call(d,
+a[c],c,a)}else if(a.forEach&&a.forEach!==q)a.forEach(b,d,a);else if(Jc(a))for(c in a)b.call(d,a[c],c,a);else if("function"===typeof a.hasOwnProperty)for(c in a)a.hasOwnProperty(c)&&b.call(d,a[c],c,a);else for(c in a)ua.call(a,c)&&b.call(d,a[c],c,a);return a}function Kc(a,b,d){for(var c=Object.keys(a).sort(),e=0;e<c.length;e++)b.call(d,a[c[e]],c[e]);return c}function Lc(a){return function(b,d){a(d,b)}}function ne(){return++qb}function Tb(a,b,d){for(var c=a.$$hashKey,e=0,f=b.length;e<f;++e){var g=b[e];
+if(C(g)||D(g))for(var h=Object.keys(g),k=0,l=h.length;k<l;k++){var m=h[k],n=g[m];d&&C(n)?ga(n)?a[m]=new Date(n.valueOf()):Xa(n)?a[m]=new RegExp(n):n.nodeName?a[m]=n.cloneNode(!0):Ub(n)?a[m]=n.clone():(C(a[m])||(a[m]=H(n)?[]:{}),Tb(a[m],[n],!0)):a[m]=n}}c?a.$$hashKey=c:delete a.$$hashKey;return a}function S(a){return Tb(a,va.call(arguments,1),!1)}function oe(a){return Tb(a,va.call(arguments,1),!0)}function Z(a){return parseInt(a,10)}function Vb(a,b){return S(Object.create(a),b)}function z(){}function Ya(a){return a}
+function la(a){return function(){return a}}function Wb(a){return D(a.toString)&&a.toString!==ma}function w(a){return"undefined"===typeof a}function u(a){return"undefined"!==typeof a}function C(a){return null!==a&&"object"===typeof a}function Jc(a){return null!==a&&"object"===typeof a&&!Mc(a)}function F(a){return"string"===typeof a}function ba(a){return"number"===typeof a}function ga(a){return"[object Date]"===ma.call(a)}function D(a){return"function"===typeof a}function Xa(a){return"[object RegExp]"===
+ma.call(a)}function Wa(a){return a&&a.window===a}function Za(a){return a&&a.$evalAsync&&a.$watch}function Ha(a){return"boolean"===typeof a}function pe(a){return a&&ba(a.length)&&qe.test(ma.call(a))}function Ub(a){return!(!a||!(a.nodeName||a.prop&&a.attr&&a.find))}function re(a){var b={};a=a.split(",");var d;for(d=0;d<a.length;d++)b[a[d]]=!0;return b}function wa(a){return Q(a.nodeName||a[0]&&a[0].nodeName)}function $a(a,b){var d=a.indexOf(b);0<=d&&a.splice(d,1);return d}function ra(a,b,d){function c(a,
+b,c){c--;if(0>c)return"...";var d=b.$$hashKey,f;if(H(a)){f=0;for(var g=a.length;f<g;f++)b.push(e(a[f],c))}else if(Jc(a))for(f in a)b[f]=e(a[f],c);else if(a&&"function"===typeof a.hasOwnProperty)for(f in a)a.hasOwnProperty(f)&&(b[f]=e(a[f],c));else for(f in a)ua.call(a,f)&&(b[f]=e(a[f],c));d?b.$$hashKey=d:delete b.$$hashKey;return b}function e(a,b){if(!C(a))return a;var d=g.indexOf(a);if(-1!==d)return h[d];if(Wa(a)||Za(a))throw Fa("cpws");var d=!1,e=f(a);void 0===e&&(e=H(a)?[]:Object.create(Mc(a)),
+d=!0);g.push(a);h.push(e);return d?c(a,e,b):e}function f(a){switch(ma.call(a)){case "[object Int8Array]":case "[object Int16Array]":case "[object Int32Array]":case "[object Float32Array]":case "[object Float64Array]":case "[object Uint8Array]":case "[object Uint8ClampedArray]":case "[object Uint16Array]":case "[object Uint32Array]":return new a.constructor(e(a.buffer),a.byteOffset,a.length);case "[object ArrayBuffer]":if(!a.slice){var b=new ArrayBuffer(a.byteLength);(new Uint8Array(b)).set(new Uint8Array(a));
+return b}return a.slice(0);case "[object Boolean]":case "[object Number]":case "[object String]":case "[object Date]":return new a.constructor(a.valueOf());case "[object RegExp]":return b=new RegExp(a.source,a.toString().match(/[^/]*$/)[0]),b.lastIndex=a.lastIndex,b;case "[object Blob]":return new a.constructor([a],{type:a.type})}if(D(a.cloneNode))return a.cloneNode(!0)}var g=[],h=[];d=Sb(d)?d:NaN;if(b){if(pe(b)||"[object ArrayBuffer]"===ma.call(b))throw Fa("cpta");if(a===b)throw Fa("cpi");H(b)?b.length=
+0:q(b,function(a,c){"$$hashKey"!==c&&delete b[c]});g.push(a);h.push(b);return c(a,b,d)}return e(a,d)}function Xb(a,b){return a===b||a!==a&&b!==b}function sa(a,b){if(a===b)return!0;if(null===a||null===b)return!1;if(a!==a&&b!==b)return!0;var d=typeof a,c;if(d===typeof b&&"object"===d)if(H(a)){if(!H(b))return!1;if((d=a.length)===b.length){for(c=0;c<d;c++)if(!sa(a[c],b[c]))return!1;return!0}}else{if(ga(a))return ga(b)?Xb(a.getTime(),b.getTime()):!1;if(Xa(a))return Xa(b)?a.toString()===b.toString():!1;
+if(Za(a)||Za(b)||Wa(a)||Wa(b)||H(b)||ga(b)||Xa(b))return!1;d=V();for(c in a)if("$"!==c.charAt(0)&&!D(a[c])){if(!sa(a[c],b[c]))return!1;d[c]=!0}for(c in b)if(!(c in d)&&"$"!==c.charAt(0)&&u(b[c])&&!D(b[c]))return!1;return!0}return!1}function ab(a,b,d){return a.concat(va.call(b,d))}function bb(a,b){var d=2<arguments.length?va.call(arguments,2):[];return!D(b)||b instanceof RegExp?b:d.length?function(){return arguments.length?b.apply(a,ab(d,arguments,0)):b.apply(a,d)}:function(){return arguments.length?
+b.apply(a,arguments):b.call(a)}}function Nc(a,b){var d=b;"string"===typeof a&&"$"===a.charAt(0)&&"$"===a.charAt(1)?d=void 0:Wa(b)?d="$WINDOW":b&&x.document===b?d="$DOCUMENT":Za(b)&&(d="$SCOPE");return d}function cb(a,b){if(!w(a))return ba(b)||(b=b?2:null),JSON.stringify(a,Nc,b)}function Oc(a){return F(a)?JSON.parse(a):a}function Pc(a,b){a=a.replace(se,"");var d=Date.parse("Jan 01, 1970 00:00:00 "+a)/6E4;return da(d)?b:d}function Yb(a,b,d){d=d?-1:1;var c=a.getTimezoneOffset();b=Pc(b,c);d*=b-c;a=new Date(a.getTime());
+a.setMinutes(a.getMinutes()+d);return a}function xa(a){a=B(a).clone();try{a.empty()}catch(b){}var d=B("<div>").append(a).html();try{return a[0].nodeType===Ia?Q(d):d.match(/^(<[^>]+>)/)[1].replace(/^<([\w-]+)/,function(a,b){return"<"+Q(b)})}catch(c){return Q(d)}}function Qc(a){try{return decodeURIComponent(a)}catch(b){}}function Rc(a){var b={};q((a||"").split("&"),function(a){var c,e,f;a&&(e=a=a.replace(/\+/g,"%20"),c=a.indexOf("="),-1!==c&&(e=a.substring(0,c),f=a.substring(c+1)),e=Qc(e),u(e)&&(f=
+u(f)?Qc(f):!0,ua.call(b,e)?H(b[e])?b[e].push(f):b[e]=[b[e],f]:b[e]=f))});return b}function Zb(a){var b=[];q(a,function(a,c){H(a)?q(a,function(a){b.push($(c,!0)+(!0===a?"":"="+$(a,!0)))}):b.push($(c,!0)+(!0===a?"":"="+$(a,!0)))});return b.length?b.join("&"):""}function db(a){return $(a,!0).replace(/%26/gi,"&").replace(/%3D/gi,"=").replace(/%2B/gi,"+")}function $(a,b){return encodeURIComponent(a).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%3B/gi,";").replace(/%20/g,
+b?"%20":"+")}function te(a,b){var d,c,e=Ja.length;for(c=0;c<e;++c)if(d=Ja[c]+b,F(d=a.getAttribute(d)))return d;return null}function ue(a,b){var d,c,e={};q(Ja,function(b){b+="app";!d&&a.hasAttribute&&a.hasAttribute(b)&&(d=a,c=a.getAttribute(b))});q(Ja,function(b){b+="app";var e;!d&&(e=a.querySelector("["+b.replace(":","\\:")+"]"))&&(d=e,c=e.getAttribute(b))});d&&(ve?(e.strictDi=null!==te(d,"strict-di"),b(d,c?[c]:[],e)):x.console.error("Angular: disabling automatic bootstrap. <script> protocol indicates an extension, document.location.href does not match."))}
+function Sc(a,b,d){C(d)||(d={});d=S({strictDi:!1},d);var c=function(){a=B(a);if(a.injector()){var c=a[0]===x.document?"document":xa(a);throw Fa("btstrpd",c.replace(/</,"&lt;").replace(/>/,"&gt;"));}b=b||[];b.unshift(["$provide",function(b){b.value("$rootElement",a)}]);d.debugInfoEnabled&&b.push(["$compileProvider",function(a){a.debugInfoEnabled(!0)}]);b.unshift("ng");c=eb(b,d.strictDi);c.invoke(["$rootScope","$rootElement","$compile","$injector",function(a,b,c,d){a.$apply(function(){b.data("$injector",
+d);c(b)(a)})}]);return c},e=/^NG_ENABLE_DEBUG_INFO!/,f=/^NG_DEFER_BOOTSTRAP!/;x&&e.test(x.name)&&(d.debugInfoEnabled=!0,x.name=x.name.replace(e,""));if(x&&!f.test(x.name))return c();x.name=x.name.replace(f,"");ea.resumeBootstrap=function(a){q(a,function(a){b.push(a)});return c()};D(ea.resumeDeferredBootstrap)&&ea.resumeDeferredBootstrap()}function we(){x.name="NG_ENABLE_DEBUG_INFO!"+x.name;x.location.reload()}function xe(a){a=ea.element(a).injector();if(!a)throw Fa("test");return a.get("$$testability")}
+function Tc(a,b){b=b||"_";return a.replace(ye,function(a,c){return(c?b:"")+a.toLowerCase()})}function ze(){var a;if(!Uc){var b=rb();(na=w(b)?x.jQuery:b?x[b]:void 0)&&na.fn.on?(B=na,S(na.fn,{scope:Na.scope,isolateScope:Na.isolateScope,controller:Na.controller,injector:Na.injector,inheritedData:Na.inheritedData}),a=na.cleanData,na.cleanData=function(b){for(var c,e=0,f;null!=(f=b[e]);e++)(c=na._data(f,"events"))&&c.$destroy&&na(f).triggerHandler("$destroy");a(b)}):B=W;ea.element=B;Uc=!0}}function fb(a,
+b,d){if(!a)throw Fa("areq",b||"?",d||"required");return a}function sb(a,b,d){d&&H(a)&&(a=a[a.length-1]);fb(D(a),b,"not a function, got "+(a&&"object"===typeof a?a.constructor.name||"Object":typeof a));return a}function Ka(a,b){if("hasOwnProperty"===a)throw Fa("badname",b);}function Vc(a,b,d){if(!b)return a;b=b.split(".");for(var c,e=a,f=b.length,g=0;g<f;g++)c=b[g],a&&(a=(e=a)[c]);return!d&&D(a)?bb(e,a):a}function tb(a){for(var b=a[0],d=a[a.length-1],c,e=1;b!==d&&(b=b.nextSibling);e++)if(c||a[e]!==
+b)c||(c=B(va.call(a,0,e))),c.push(b);return c||a}function V(){return Object.create(null)}function $b(a){if(null==a)return"";switch(typeof a){case "string":break;case "number":a=""+a;break;default:a=!Wb(a)||H(a)||ga(a)?cb(a):a.toString()}return a}function Ae(a){function b(a,b,c){return a[b]||(a[b]=c())}var d=L("$injector"),c=L("ng");a=b(a,"angular",Object);a.$$minErr=a.$$minErr||L;return b(a,"module",function(){var a={};return function(f,g,h){var k={};if("hasOwnProperty"===f)throw c("badname","module");
+g&&a.hasOwnProperty(f)&&(a[f]=null);return b(a,f,function(){function a(b,c,d,f){f||(f=e);return function(){f[d||"push"]([b,c,arguments]);return v}}function b(a,c,d){d||(d=e);return function(b,e){e&&D(e)&&(e.$$moduleName=f);d.push([a,c,arguments]);return v}}if(!g)throw d("nomod",f);var e=[],p=[],r=[],J=a("$injector","invoke","push",p),v={_invokeQueue:e,_configBlocks:p,_runBlocks:r,info:function(a){if(u(a)){if(!C(a))throw c("aobj","value");k=a;return this}return k},requires:g,name:f,provider:b("$provide",
+"provider"),factory:b("$provide","factory"),service:b("$provide","service"),value:a("$provide","value"),constant:a("$provide","constant","unshift"),decorator:b("$provide","decorator",p),animation:b("$animateProvider","register"),filter:b("$filterProvider","register"),controller:b("$controllerProvider","register"),directive:b("$compileProvider","directive"),component:b("$compileProvider","component"),config:J,run:function(a){r.push(a);return this}};h&&J(h);return v})}})}function pa(a,b){if(H(a)){b=
+b||[];for(var d=0,c=a.length;d<c;d++)b[d]=a[d]}else if(C(a))for(d in b=b||{},a)if("$"!==d.charAt(0)||"$"!==d.charAt(1))b[d]=a[d];return b||a}function Be(a,b){var d=[];Sb(b)&&(a=ra(a,null,b));return JSON.stringify(a,function(a,b){b=Nc(a,b);if(C(b)){if(0<=d.indexOf(b))return"...";d.push(b)}return b})}function Ce(a){S(a,{errorHandlingConfig:me,bootstrap:Sc,copy:ra,extend:S,merge:oe,equals:sa,element:B,forEach:q,injector:eb,noop:z,bind:bb,toJson:cb,fromJson:Oc,identity:Ya,isUndefined:w,isDefined:u,isString:F,
+isFunction:D,isObject:C,isNumber:ba,isElement:Ub,isArray:H,version:De,isDate:ga,lowercase:Q,uppercase:ub,callbacks:{$$counter:0},getTestability:xe,reloadWithDebugInfo:we,$$minErr:L,$$csp:Ga,$$encodeUriSegment:db,$$encodeUriQuery:$,$$stringify:$b});ac=Ae(x);ac("ng",["ngLocale"],["$provide",function(a){a.provider({$$sanitizeUri:Ee});a.provider("$compile",Wc).directive({a:Fe,input:Xc,textarea:Xc,form:Ge,script:He,select:Ie,option:Je,ngBind:Ke,ngBindHtml:Le,ngBindTemplate:Me,ngClass:Ne,ngClassEven:Oe,
+ngClassOdd:Pe,ngCloak:Qe,ngController:Re,ngForm:Se,ngHide:Te,ngIf:Ue,ngInclude:Ve,ngInit:We,ngNonBindable:Xe,ngPluralize:Ye,ngRepeat:Ze,ngShow:$e,ngStyle:af,ngSwitch:bf,ngSwitchWhen:cf,ngSwitchDefault:df,ngOptions:ef,ngTransclude:ff,ngModel:gf,ngList:hf,ngChange:jf,pattern:Yc,ngPattern:Yc,required:Zc,ngRequired:Zc,minlength:$c,ngMinlength:$c,maxlength:ad,ngMaxlength:ad,ngValue:kf,ngModelOptions:lf}).directive({ngInclude:mf}).directive(vb).directive(bd);a.provider({$anchorScroll:nf,$animate:of,$animateCss:pf,
+$$animateJs:qf,$$animateQueue:rf,$$AnimateRunner:sf,$$animateAsyncRun:tf,$browser:uf,$cacheFactory:vf,$controller:wf,$document:xf,$$isDocumentHidden:yf,$exceptionHandler:zf,$filter:cd,$$forceReflow:Af,$interpolate:Bf,$interval:Cf,$http:Df,$httpParamSerializer:Ef,$httpParamSerializerJQLike:Ff,$httpBackend:Gf,$xhrFactory:Hf,$jsonpCallbacks:If,$location:Jf,$log:Kf,$parse:Lf,$rootScope:Mf,$q:Nf,$$q:Of,$sce:Pf,$sceDelegate:Qf,$sniffer:Rf,$templateCache:Sf,$templateRequest:Tf,$$testability:Uf,$timeout:Vf,
+$window:Wf,$$rAF:Xf,$$jqLite:Yf,$$Map:Zf,$$cookieReader:$f})}]).info({angularVersion:"1.6.4"})}function gb(a,b){return b.toUpperCase()}function wb(a){return a.replace(ag,gb)}function bc(a){a=a.nodeType;return 1===a||!a||9===a}function dd(a,b){var d,c,e=b.createDocumentFragment(),f=[];if(cc.test(a)){d=e.appendChild(b.createElement("div"));c=(bg.exec(a)||["",""])[1].toLowerCase();c=ha[c]||ha._default;d.innerHTML=c[1]+a.replace(cg,"<$1></$2>")+c[2];for(c=c[0];c--;)d=d.lastChild;f=ab(f,d.childNodes);
+d=e.firstChild;d.textContent=""}else f.push(b.createTextNode(a));e.textContent="";e.innerHTML="";q(f,function(a){e.appendChild(a)});return e}function W(a){if(a instanceof W)return a;var b;F(a)&&(a=T(a),b=!0);if(!(this instanceof W)){if(b&&"<"!==a.charAt(0))throw dc("nosel");return new W(a)}if(b){b=x.document;var d;a=(d=dg.exec(a))?[b.createElement(d[1])]:(d=dd(a,b))?d.childNodes:[];ec(this,a)}else D(a)?ed(a):ec(this,a)}function fc(a){return a.cloneNode(!0)}function xb(a,b){!b&&bc(a)&&B.cleanData([a]);
+a.querySelectorAll&&B.cleanData(a.querySelectorAll("*"))}function fd(a,b,d,c){if(u(c))throw dc("offargs");var e=(c=yb(a))&&c.events,f=c&&c.handle;if(f)if(b){var g=function(b){var c=e[b];u(d)&&$a(c||[],d);u(d)&&c&&0<c.length||(a.removeEventListener(b,f),delete e[b])};q(b.split(" "),function(a){g(a);zb[a]&&g(zb[a])})}else for(b in e)"$destroy"!==b&&a.removeEventListener(b,f),delete e[b]}function gc(a,b){var d=a.ng339,c=d&&hb[d];c&&(b?delete c.data[b]:(c.handle&&(c.events.$destroy&&c.handle({},"$destroy"),
+fd(a)),delete hb[d],a.ng339=void 0))}function yb(a,b){var d=a.ng339,d=d&&hb[d];b&&!d&&(a.ng339=d=++eg,d=hb[d]={events:{},data:{},handle:void 0});return d}function hc(a,b,d){if(bc(a)){var c,e=u(d),f=!e&&b&&!C(b),g=!b;a=(a=yb(a,!f))&&a.data;if(e)a[wb(b)]=d;else{if(g)return a;if(f)return a&&a[wb(b)];for(c in b)a[wb(c)]=b[c]}}}function Ab(a,b){return a.getAttribute?-1<(" "+(a.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").indexOf(" "+b+" "):!1}function Bb(a,b){b&&a.setAttribute&&q(b.split(" "),
+function(b){a.setAttribute("class",T((" "+(a.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").replace(" "+T(b)+" "," ")))})}function Cb(a,b){if(b&&a.setAttribute){var d=(" "+(a.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ");q(b.split(" "),function(a){a=T(a);-1===d.indexOf(" "+a+" ")&&(d+=a+" ")});a.setAttribute("class",T(d))}}function ec(a,b){if(b)if(b.nodeType)a[a.length++]=b;else{var d=b.length;if("number"===typeof d&&b.window!==b){if(d)for(var c=0;c<d;c++)a[a.length++]=b[c]}else a[a.length++]=
+b}}function gd(a,b){return Db(a,"$"+(b||"ngController")+"Controller")}function Db(a,b,d){9===a.nodeType&&(a=a.documentElement);for(b=H(b)?b:[b];a;){for(var c=0,e=b.length;c<e;c++)if(u(d=B.data(a,b[c])))return d;a=a.parentNode||11===a.nodeType&&a.host}}function hd(a){for(xb(a,!0);a.firstChild;)a.removeChild(a.firstChild)}function Eb(a,b){b||xb(a);var d=a.parentNode;d&&d.removeChild(a)}function fg(a,b){b=b||x;if("complete"===b.document.readyState)b.setTimeout(a);else B(b).on("load",a)}function ed(a){function b(){x.document.removeEventListener("DOMContentLoaded",
+b);x.removeEventListener("load",b);a()}"complete"===x.document.readyState?x.setTimeout(a):(x.document.addEventListener("DOMContentLoaded",b),x.addEventListener("load",b))}function id(a,b){var d=Fb[b.toLowerCase()];return d&&jd[wa(a)]&&d}function gg(a,b){var d=function(c,d){c.isDefaultPrevented=function(){return c.defaultPrevented};var f=b[d||c.type],g=f?f.length:0;if(g){if(w(c.immediatePropagationStopped)){var h=c.stopImmediatePropagation;c.stopImmediatePropagation=function(){c.immediatePropagationStopped=
+!0;c.stopPropagation&&c.stopPropagation();h&&h.call(c)}}c.isImmediatePropagationStopped=function(){return!0===c.immediatePropagationStopped};var k=f.specialHandlerWrapper||hg;1<g&&(f=pa(f));for(var l=0;l<g;l++)c.isImmediatePropagationStopped()||k(a,c,f[l])}};d.elem=a;return d}function hg(a,b,d){d.call(a,b)}function ig(a,b,d){var c=b.relatedTarget;c&&(c===a||jg.call(a,c))||d.call(a,b)}function Yf(){this.$get=function(){return S(W,{hasClass:function(a,b){a.attr&&(a=a[0]);return Ab(a,b)},addClass:function(a,
+b){a.attr&&(a=a[0]);return Cb(a,b)},removeClass:function(a,b){a.attr&&(a=a[0]);return Bb(a,b)}})}}function Pa(a,b){var d=a&&a.$$hashKey;if(d)return"function"===typeof d&&(d=a.$$hashKey()),d;d=typeof a;return d="function"===d||"object"===d&&null!==a?a.$$hashKey=d+":"+(b||ne)():d+":"+a}function kd(){this._keys=[];this._values=[];this._lastKey=NaN;this._lastIndex=-1}function ld(a){a=Function.prototype.toString.call(a).replace(kg,"");return a.match(lg)||a.match(mg)}function ng(a){return(a=ld(a))?"function("+
+(a[1]||"").replace(/[\s\r\n]+/," ")+")":"fn"}function eb(a,b){function d(a){return function(b,c){if(C(b))q(b,Lc(a));else return a(b,c)}}function c(a,b){Ka(a,"service");if(D(b)||H(b))b=p.instantiate(b);if(!b.$get)throw ya("pget",a);return n[a+"Provider"]=b}function e(a,b){return function(){var c=v.invoke(b,this);if(w(c))throw ya("undef",a);return c}}function f(a,b,d){return c(a,{$get:!1!==d?e(a,b):b})}function g(a){fb(w(a)||H(a),"modulesToLoad","not an array");var b=[],c;q(a,function(a){function d(a){var b,
+c;b=0;for(c=a.length;b<c;b++){var e=a[b],f=p.get(e[0]);f[e[1]].apply(f,e[2])}}if(!m.get(a)){m.set(a,!0);try{F(a)?(c=ac(a),v.modules[a]=c,b=b.concat(g(c.requires)).concat(c._runBlocks),d(c._invokeQueue),d(c._configBlocks)):D(a)?b.push(p.invoke(a)):H(a)?b.push(p.invoke(a)):sb(a,"module")}catch(e){throw H(a)&&(a=a[a.length-1]),e.message&&e.stack&&-1===e.stack.indexOf(e.message)&&(e=e.message+"\n"+e.stack),ya("modulerr",a,e.stack||e.message||e);}}});return b}function h(a,c){function d(b,e){if(a.hasOwnProperty(b)){if(a[b]===
+k)throw ya("cdep",b+" <- "+l.join(" <- "));return a[b]}try{return l.unshift(b),a[b]=k,a[b]=c(b,e),a[b]}catch(f){throw a[b]===k&&delete a[b],f;}finally{l.shift()}}function e(a,c,f){var g=[];a=eb.$$annotate(a,b,f);for(var k=0,h=a.length;k<h;k++){var l=a[k];if("string"!==typeof l)throw ya("itkn",l);g.push(c&&c.hasOwnProperty(l)?c[l]:d(l,f))}return g}return{invoke:function(a,b,c,d){"string"===typeof c&&(d=c,c=null);c=e(a,c,d);H(a)&&(a=a[a.length-1]);d=a;if(za||"function"!==typeof d)d=!1;else{var f=d.$$ngIsClass;
+Ha(f)||(f=d.$$ngIsClass=/^(?:class\b|constructor\()/.test(Function.prototype.toString.call(d)));d=f}return d?(c.unshift(null),new (Function.prototype.bind.apply(a,c))):a.apply(b,c)},instantiate:function(a,b,c){var d=H(a)?a[a.length-1]:a;a=e(a,b,c);a.unshift(null);return new (Function.prototype.bind.apply(d,a))},get:d,annotate:eb.$$annotate,has:function(b){return n.hasOwnProperty(b+"Provider")||a.hasOwnProperty(b)}}}b=!0===b;var k={},l=[],m=new Gb,n={$provide:{provider:d(c),factory:d(f),service:d(function(a,
+b){return f(a,["$injector",function(a){return a.instantiate(b)}])}),value:d(function(a,b){return f(a,la(b),!1)}),constant:d(function(a,b){Ka(a,"constant");n[a]=b;r[a]=b}),decorator:function(a,b){var c=p.get(a+"Provider"),d=c.$get;c.$get=function(){var a=v.invoke(d,c);return v.invoke(b,null,{$delegate:a})}}}},p=n.$injector=h(n,function(a,b){ea.isString(b)&&l.push(b);throw ya("unpr",l.join(" <- "));}),r={},J=h(r,function(a,b){var c=p.get(a+"Provider",b);return v.invoke(c.$get,c,void 0,a)}),v=J;n.$injectorProvider=
+{$get:la(J)};v.modules=p.modules=V();var t=g(a),v=J.get("$injector");v.strictDi=b;q(t,function(a){a&&v.invoke(a)});return v}function nf(){var a=!0;this.disableAutoScrolling=function(){a=!1};this.$get=["$window","$location","$rootScope",function(b,d,c){function e(a){var b=null;Array.prototype.some.call(a,function(a){if("a"===wa(a))return b=a,!0});return b}function f(a){if(a){a.scrollIntoView();var c;c=g.yOffset;D(c)?c=c():Ub(c)?(c=c[0],c="fixed"!==b.getComputedStyle(c).position?0:c.getBoundingClientRect().bottom):
+ba(c)||(c=0);c&&(a=a.getBoundingClientRect().top,b.scrollBy(0,a-c))}else b.scrollTo(0,0)}function g(a){a=F(a)?a:ba(a)?a.toString():d.hash();var b;a?(b=h.getElementById(a))?f(b):(b=e(h.getElementsByName(a)))?f(b):"top"===a&&f(null):f(null)}var h=b.document;a&&c.$watch(function(){return d.hash()},function(a,b){a===b&&""===a||fg(function(){c.$evalAsync(g)})});return g}]}function ib(a,b){if(!a&&!b)return"";if(!a)return b;if(!b)return a;H(a)&&(a=a.join(" "));H(b)&&(b=b.join(" "));return a+" "+b}function og(a){F(a)&&
+(a=a.split(" "));var b=V();q(a,function(a){a.length&&(b[a]=!0)});return b}function ia(a){return C(a)?a:{}}function pg(a,b,d,c){function e(a){try{a.apply(null,va.call(arguments,1))}finally{if(J--,0===J)for(;v.length;)try{v.pop()()}catch(b){d.error(b)}}}function f(){Oa=null;h()}function g(){t=I();t=w(t)?null:t;sa(t,G)&&(t=G);M=G=t}function h(){var a=M;g();if(N!==k.url()||a!==t)N=k.url(),M=t,q(K,function(a){a(k.url(),t)})}var k=this,l=a.location,m=a.history,n=a.setTimeout,p=a.clearTimeout,r={};k.isMock=
+!1;var J=0,v=[];k.$$completeOutstandingRequest=e;k.$$incOutstandingRequestCount=function(){J++};k.notifyWhenNoOutstandingRequests=function(a){0===J?a():v.push(a)};var t,M,N=l.href,A=b.find("base"),Oa=null,I=c.history?function(){try{return m.state}catch(a){}}:z;g();k.url=function(b,d,e){w(e)&&(e=null);l!==a.location&&(l=a.location);m!==a.history&&(m=a.history);if(b){var f=M===e;if(N===b&&(!c.history||f))return k;var h=N&&Aa(N)===Aa(b);N=b;M=e;!c.history||h&&f?(h||(Oa=b),d?l.replace(b):h?(d=l,e=b.indexOf("#"),
+e=-1===e?"":b.substr(e),d.hash=e):l.href=b,l.href!==b&&(Oa=b)):(m[d?"replaceState":"pushState"](e,"",b),g());Oa&&(Oa=b);return k}return Oa||l.href.replace(/%27/g,"'")};k.state=function(){return t};var K=[],E=!1,G=null;k.onUrlChange=function(b){if(!E){if(c.history)B(a).on("popstate",f);B(a).on("hashchange",f);E=!0}K.push(b);return b};k.$$applicationDestroyed=function(){B(a).off("hashchange popstate",f)};k.$$checkUrlChange=h;k.baseHref=function(){var a=A.attr("href");return a?a.replace(/^(https?:)?\/\/[^/]*/,
+""):""};k.defer=function(a,b){var c;J++;c=n(function(){delete r[c];e(a)},b||0);r[c]=!0;return c};k.defer.cancel=function(a){return r[a]?(delete r[a],p(a),e(z),!0):!1}}function uf(){this.$get=["$window","$log","$sniffer","$document",function(a,b,d,c){return new pg(a,c,b,d)}]}function vf(){this.$get=function(){function a(a,c){function e(a){a!==n&&(p?p===a&&(p=a.n):p=a,f(a.n,a.p),f(a,n),n=a,n.n=null)}function f(a,b){a!==b&&(a&&(a.p=b),b&&(b.n=a))}if(a in b)throw L("$cacheFactory")("iid",a);var g=0,h=
+S({},c,{id:a}),k=V(),l=c&&c.capacity||Number.MAX_VALUE,m=V(),n=null,p=null;return b[a]={put:function(a,b){if(!w(b)){if(l<Number.MAX_VALUE){var c=m[a]||(m[a]={key:a});e(c)}a in k||g++;k[a]=b;g>l&&this.remove(p.key);return b}},get:function(a){if(l<Number.MAX_VALUE){var b=m[a];if(!b)return;e(b)}return k[a]},remove:function(a){if(l<Number.MAX_VALUE){var b=m[a];if(!b)return;b===n&&(n=b.p);b===p&&(p=b.n);f(b.n,b.p);delete m[a]}a in k&&(delete k[a],g--)},removeAll:function(){k=V();g=0;m=V();n=p=null},destroy:function(){m=
+h=k=null;delete b[a]},info:function(){return S({},h,{size:g})}}}var b={};a.info=function(){var a={};q(b,function(b,e){a[e]=b.info()});return a};a.get=function(a){return b[a]};return a}}function Sf(){this.$get=["$cacheFactory",function(a){return a("templates")}]}function Wc(a,b){function d(a,b,c){var d=/^\s*([@&<]|=(\*?))(\??)\s*([\w$]*)\s*$/,e=V();q(a,function(a,f){if(a in n)e[f]=n[a];else{var g=a.match(d);if(!g)throw fa("iscp",b,f,a,c?"controller bindings definition":"isolate scope definition");
+e[f]={mode:g[1][0],collection:"*"===g[2],optional:"?"===g[3],attrName:g[4]||f};g[4]&&(n[a]=e[f])}});return e}function c(a){var b=a.charAt(0);if(!b||b!==Q(b))throw fa("baddir",a);if(a!==a.trim())throw fa("baddir",a);}function e(a){var b=a.require||a.controller&&a.name;!H(b)&&C(b)&&q(b,function(a,c){var d=a.match(l);a.substring(d[0].length)||(b[c]=d[0]+c)});return b}var f={},g=/^\s*directive:\s*([\w-]+)\s+(.*)$/,h=/(([\w-]+)(?::([^;]+))?;?)/,k=re("ngSrc,ngSrcset,src,srcset"),l=/^(?:(\^\^?)?(\?)?(\^\^?)?)?/,
+m=/^(on[a-z]+|formaction)$/,n=V();this.directive=function N(b,d){fb(b,"name");Ka(b,"directive");F(b)?(c(b),fb(d,"directiveFactory"),f.hasOwnProperty(b)||(f[b]=[],a.factory(b+"Directive",["$injector","$exceptionHandler",function(a,c){var d=[];q(f[b],function(f,g){try{var h=a.invoke(f);D(h)?h={compile:la(h)}:!h.compile&&h.link&&(h.compile=la(h.link));h.priority=h.priority||0;h.index=g;h.name=h.name||b;h.require=e(h);var k=h,l=h.restrict;if(l&&(!F(l)||!/[EACM]/.test(l)))throw fa("badrestrict",l,b);k.restrict=
+l||"EA";h.$$moduleName=f.$$moduleName;d.push(h)}catch(m){c(m)}});return d}])),f[b].push(d)):q(b,Lc(N));return this};this.component=function(a,b){function c(a){function e(b){return D(b)||H(b)?function(c,d){return a.invoke(b,this,{$element:c,$attrs:d})}:b}var f=b.template||b.templateUrl?b.template:"",g={controller:d,controllerAs:qg(b.controller)||b.controllerAs||"$ctrl",template:e(f),templateUrl:e(b.templateUrl),transclude:b.transclude,scope:{},bindToController:b.bindings||{},restrict:"E",require:b.require};
+q(b,function(a,b){"$"===b.charAt(0)&&(g[b]=a)});return g}var d=b.controller||function(){};q(b,function(a,b){"$"===b.charAt(0)&&(c[b]=a,D(d)&&(d[b]=a))});c.$inject=["$injector"];return this.directive(a,c)};this.aHrefSanitizationWhitelist=function(a){return u(a)?(b.aHrefSanitizationWhitelist(a),this):b.aHrefSanitizationWhitelist()};this.imgSrcSanitizationWhitelist=function(a){return u(a)?(b.imgSrcSanitizationWhitelist(a),this):b.imgSrcSanitizationWhitelist()};var p=!0;this.debugInfoEnabled=function(a){return u(a)?
+(p=a,this):p};var r=!1;this.preAssignBindingsEnabled=function(a){return u(a)?(r=a,this):r};var J=10;this.onChangesTtl=function(a){return arguments.length?(J=a,this):J};var v=!0;this.commentDirectivesEnabled=function(a){return arguments.length?(v=a,this):v};var t=!0;this.cssClassDirectivesEnabled=function(a){return arguments.length?(t=a,this):t};this.$get=["$injector","$interpolate","$exceptionHandler","$templateRequest","$parse","$controller","$rootScope","$sce","$animate","$$sanitizeUri",function(a,
+b,c,e,n,E,G,y,O,X){function P(){try{if(!--ya)throw ia=void 0,fa("infchng",J);G.$apply(function(){for(var a=[],b=0,c=ia.length;b<c;++b)try{ia[b]()}catch(d){a.push(d)}ia=void 0;if(a.length)throw a;})}finally{ya++}}function s(a,b){if(b){var c=Object.keys(b),d,e,f;d=0;for(e=c.length;d<e;d++)f=c[d],this[f]=b[f]}else this.$attr={};this.$$element=a}function R(a,b,c){ta.innerHTML="<span "+b+">";b=ta.firstChild.attributes;var d=b[0];b.removeNamedItem(d.name);d.value=c;a.attributes.setNamedItem(d)}function La(a,
+b){try{a.addClass(b)}catch(c){}}function ca(a,b,c,d,e){a instanceof B||(a=B(a));var f=Ma(a,b,a,c,d,e);ca.$$addScopeClass(a);var g=null;return function(b,c,d){if(!a)throw fa("multilink");fb(b,"scope");e&&e.needsNewScope&&(b=b.$parent.$new());d=d||{};var h=d.parentBoundTranscludeFn,k=d.transcludeControllers;d=d.futureParentElement;h&&h.$$boundTransclude&&(h=h.$$boundTransclude);g||(g=(d=d&&d[0])?"foreignobject"!==wa(d)&&ma.call(d).match(/SVG/)?"svg":"html":"html");d="html"!==g?B(ha(g,B("<div>").append(a).html())):
+c?Na.clone.call(a):a;if(k)for(var l in k)d.data("$"+l+"Controller",k[l].instance);ca.$$addScopeInfo(d,b);c&&c(d,b);f&&f(b,d,d,h);c||(a=f=null);return d}}function Ma(a,b,c,d,e,f){function g(a,c,d,e){var f,k,l,m,n,p,r;if(K)for(r=Array(c.length),m=0;m<h.length;m+=3)f=h[m],r[f]=c[f];else r=c;m=0;for(n=h.length;m<n;)k=r[h[m++]],c=h[m++],f=h[m++],c?(c.scope?(l=a.$new(),ca.$$addScopeInfo(B(k),l)):l=a,p=c.transcludeOnThisElement?ja(a,c.transclude,e):!c.templateOnThisElement&&e?e:!e&&b?ja(a,b):null,c(f,l,
+k,d,p)):f&&f(a,k.childNodes,void 0,e)}for(var h=[],k=H(a)||a instanceof B,l,m,n,p,K,r=0;r<a.length;r++){l=new s;11===za&&L(a,r,k);m=jc(a[r],[],l,0===r?d:void 0,e);(f=m.length?W(m,a[r],l,b,c,null,[],[],f):null)&&f.scope&&ca.$$addScopeClass(l.$$element);l=f&&f.terminal||!(n=a[r].childNodes)||!n.length?null:Ma(n,f?(f.transcludeOnThisElement||!f.templateOnThisElement)&&f.transclude:b);if(f||l)h.push(r,f,l),p=!0,K=K||f;f=null}return p?g:null}function L(a,b,c){var d=a[b],e=d.parentNode,f;if(d.nodeType===
+Ia)for(;;){f=e?d.nextSibling:a[b+1];if(!f||f.nodeType!==Ia)break;d.nodeValue+=f.nodeValue;f.parentNode&&f.parentNode.removeChild(f);c&&f===a[b+1]&&a.splice(b+1,1)}}function ja(a,b,c){function d(e,f,g,h,k){e||(e=a.$new(!1,k),e.$$transcluded=!0);return b(e,f,{parentBoundTranscludeFn:c,transcludeControllers:g,futureParentElement:h})}var e=d.$$slots=V(),f;for(f in b.$$slots)e[f]=b.$$slots[f]?ja(a,b.$$slots[f],c):null;return d}function jc(a,b,c,d,e){var f=c.$attr,g;switch(a.nodeType){case 1:g=wa(a);Y(b,
+Ba(g),"E",d,e);for(var k,l,m,n,p=a.attributes,K=0,r=p&&p.length;K<r;K++){var G=!1,E=!1;k=p[K];l=k.name;m=k.value;k=Ba(l);(n=Ja.test(k))&&(l=l.replace(md,"").substr(8).replace(/_(.)/g,function(a,b){return b.toUpperCase()}));(k=k.match(Ka))&&Z(k[1])&&(G=l,E=l.substr(0,l.length-5)+"end",l=l.substr(0,l.length-6));k=Ba(l.toLowerCase());f[k]=l;if(n||!c.hasOwnProperty(k))c[k]=m,id(a,k)&&(c[k]=!0);pa(a,b,m,k,n);Y(b,k,"A",d,e,G,E)}"input"===g&&"hidden"===a.getAttribute("type")&&a.setAttribute("autocomplete",
+"off");if(!Ga)break;f=a.className;C(f)&&(f=f.animVal);if(F(f)&&""!==f)for(;a=h.exec(f);)k=Ba(a[2]),Y(b,k,"C",d,e)&&(c[k]=T(a[3])),f=f.substr(a.index+a[0].length);break;case Ia:la(b,a.nodeValue);break;case 8:if(!Fa)break;jb(a,b,c,d,e)}b.sort(ea);return b}function jb(a,b,c,d,e){try{var f=g.exec(a.nodeValue);if(f){var h=Ba(f[1]);Y(b,h,"M",d,e)&&(c[h]=T(f[2]))}}catch(k){}}function nd(a,b,c){var d=[],e=0;if(b&&a.hasAttribute&&a.hasAttribute(b)){do{if(!a)throw fa("uterdir",b,c);1===a.nodeType&&(a.hasAttribute(b)&&
+e++,a.hasAttribute(c)&&e--);d.push(a);a=a.nextSibling}while(0<e)}else d.push(a);return B(d)}function od(a,b,c){return function(d,e,f,g,h){e=nd(e[0],b,c);return a(d,e,f,g,h)}}function kc(a,b,c,d,e,f){var g;return a?ca(b,c,d,e,f):function(){g||(g=ca(b,c,d,e,f),b=c=f=null);return g.apply(this,arguments)}}function W(a,b,d,e,f,g,h,k,l){function m(a,b,c,d){if(a){c&&(a=od(a,c,d));a.require=y.require;a.directiveName=P;if(E===y||y.$$isolateScope)a=qa(a,{isolateScope:!0});h.push(a)}if(b){c&&(b=od(b,c,d));b.require=
+y.require;b.directiveName=P;if(E===y||y.$$isolateScope)b=qa(b,{isolateScope:!0});k.push(b)}}function n(a,e,f,g,l){function m(a,b,c,d){var e;Za(a)||(d=c,c=b,b=a,a=void 0);X&&(e=O);c||(c=X?P.parent():P);if(d){var f=l.$$slots[d];if(f)return f(a,b,e,c,R);if(w(f))throw fa("noslot",d,xa(P));}else return l(a,b,e,c,R)}var p,y,t,v,J,O,N,P;b===f?(g=d,P=d.$$element):(P=B(f),g=new s(P,d));J=e;E?v=e.$new(!0):K&&(J=e.$parent);l&&(N=m,N.$$boundTransclude=l,N.isSlotFilled=function(a){return!!l.$$slots[a]});G&&(O=
+ba(P,g,N,G,v,e,E));E&&(ca.$$addScopeInfo(P,v,!0,!(I&&(I===E||I===E.$$originalDirective))),ca.$$addScopeClass(P,!0),v.$$isolateBindings=E.$$isolateBindings,y=na(e,g,v,v.$$isolateBindings,E),y.removeWatches&&v.$on("$destroy",y.removeWatches));for(p in O){y=G[p];t=O[p];var Hb=y.$$bindings.bindToController;if(r){t.bindingInfo=Hb?na(J,g,t.instance,Hb,y):{};var A=t();A!==t.instance&&(t.instance=A,P.data("$"+y.name+"Controller",A),t.bindingInfo.removeWatches&&t.bindingInfo.removeWatches(),t.bindingInfo=
+na(J,g,t.instance,Hb,y))}else t.instance=t(),P.data("$"+y.name+"Controller",t.instance),t.bindingInfo=na(J,g,t.instance,Hb,y)}q(G,function(a,b){var c=a.require;a.bindToController&&!H(c)&&C(c)&&S(O[b].instance,U(b,c,P,O))});q(O,function(a){var b=a.instance;if(D(b.$onChanges))try{b.$onChanges(a.bindingInfo.initialChanges)}catch(d){c(d)}if(D(b.$onInit))try{b.$onInit()}catch(e){c(e)}D(b.$doCheck)&&(J.$watch(function(){b.$doCheck()}),b.$doCheck());D(b.$onDestroy)&&J.$on("$destroy",function(){b.$onDestroy()})});
+p=0;for(y=h.length;p<y;p++)t=h[p],ra(t,t.isolateScope?v:e,P,g,t.require&&U(t.directiveName,t.require,P,O),N);var R=e;E&&(E.template||null===E.templateUrl)&&(R=v);a&&a(R,f.childNodes,void 0,l);for(p=k.length-1;0<=p;p--)t=k[p],ra(t,t.isolateScope?v:e,P,g,t.require&&U(t.directiveName,t.require,P,O),N);q(O,function(a){a=a.instance;D(a.$postLink)&&a.$postLink()})}l=l||{};for(var p=-Number.MAX_VALUE,K=l.newScopeDirective,G=l.controllerDirectives,E=l.newIsolateScopeDirective,I=l.templateDirective,t=l.nonTlbTranscludeDirective,
+J=!1,O=!1,X=l.hasElementTranscludeDirective,v=d.$$element=B(b),y,P,N,A=e,R,u=!1,La=!1,x,z=0,F=a.length;z<F;z++){y=a[z];var Ma=y.$$start,L=y.$$end;Ma&&(v=nd(b,Ma,L));N=void 0;if(p>y.priority)break;if(x=y.scope)y.templateUrl||(C(x)?($("new/isolated scope",E||K,y,v),E=y):$("new/isolated scope",E,y,v)),K=K||y;P=y.name;if(!u&&(y.replace&&(y.templateUrl||y.template)||y.transclude&&!y.$$tlb)){for(x=z+1;u=a[x++];)if(u.transclude&&!u.$$tlb||u.replace&&(u.templateUrl||u.template)){La=!0;break}u=!0}!y.templateUrl&&
+y.controller&&(G=G||V(),$("'"+P+"' controller",G[P],y,v),G[P]=y);if(x=y.transclude)if(J=!0,y.$$tlb||($("transclusion",t,y,v),t=y),"element"===x)X=!0,p=y.priority,N=v,v=d.$$element=B(ca.$$createComment(P,d[P])),b=v[0],ka(f,va.call(N,0),b),N[0].$$parentNode=N[0].parentNode,A=kc(La,N,e,p,g&&g.name,{nonTlbTranscludeDirective:t});else{var ja=V();if(C(x)){N=[];var Q=V(),jb=V();q(x,function(a,b){var c="?"===a.charAt(0);a=c?a.substring(1):a;Q[a]=b;ja[b]=null;jb[b]=c});q(v.contents(),function(a){var b=Q[Ba(wa(a))];
+b?(jb[b]=!0,ja[b]=ja[b]||[],ja[b].push(a)):N.push(a)});q(jb,function(a,b){if(!a)throw fa("reqslot",b);});for(var ic in ja)ja[ic]&&(ja[ic]=kc(La,ja[ic],e))}else N=B(fc(b)).contents();v.empty();A=kc(La,N,e,void 0,void 0,{needsNewScope:y.$$isolateScope||y.$$newScope});A.$$slots=ja}if(y.template)if(O=!0,$("template",I,y,v),I=y,x=D(y.template)?y.template(v,d):y.template,x=Ea(x),y.replace){g=y;N=cc.test(x)?pd(ha(y.templateNamespace,T(x))):[];b=N[0];if(1!==N.length||1!==b.nodeType)throw fa("tplrt",P,"");
+ka(f,v,b);F={$attr:{}};x=jc(b,[],F);var Y=a.splice(z+1,a.length-(z+1));(E||K)&&aa(x,E,K);a=a.concat(x).concat(Y);da(d,F);F=a.length}else v.html(x);if(y.templateUrl)O=!0,$("template",I,y,v),I=y,y.replace&&(g=y),n=ga(a.splice(z,a.length-z),v,d,f,J&&A,h,k,{controllerDirectives:G,newScopeDirective:K!==y&&K,newIsolateScopeDirective:E,templateDirective:I,nonTlbTranscludeDirective:t}),F=a.length;else if(y.compile)try{R=y.compile(v,d,A);var Z=y.$$originalDirective||y;D(R)?m(null,bb(Z,R),Ma,L):R&&m(bb(Z,R.pre),
+bb(Z,R.post),Ma,L)}catch(ea){c(ea,xa(v))}y.terminal&&(n.terminal=!0,p=Math.max(p,y.priority))}n.scope=K&&!0===K.scope;n.transcludeOnThisElement=J;n.templateOnThisElement=O;n.transclude=A;l.hasElementTranscludeDirective=X;return n}function U(a,b,c,d){var e;if(F(b)){var f=b.match(l);b=b.substring(f[0].length);var g=f[1]||f[3],f="?"===f[2];"^^"===g?c=c.parent():e=(e=d&&d[b])&&e.instance;if(!e){var h="$"+b+"Controller";e=g?c.inheritedData(h):c.data(h)}if(!e&&!f)throw fa("ctreq",b,a);}else if(H(b))for(e=
+[],g=0,f=b.length;g<f;g++)e[g]=U(a,b[g],c,d);else C(b)&&(e={},q(b,function(b,f){e[f]=U(a,b,c,d)}));return e||null}function ba(a,b,c,d,e,f,g){var h=V(),k;for(k in d){var l=d[k],m={$scope:l===g||l.$$isolateScope?e:f,$element:a,$attrs:b,$transclude:c},n=l.controller;"@"===n&&(n=b[l.name]);m=E(n,m,!0,l.controllerAs);h[l.name]=m;a.data("$"+l.name+"Controller",m.instance)}return h}function aa(a,b,c){for(var d=0,e=a.length;d<e;d++)a[d]=Vb(a[d],{$$isolateScope:b,$$newScope:c})}function Y(b,c,e,g,h,k,l){if(c===
+h)return null;var m=null;if(f.hasOwnProperty(c)){h=a.get(c+"Directive");for(var n=0,p=h.length;n<p;n++)if(c=h[n],(w(g)||g>c.priority)&&-1!==c.restrict.indexOf(e)){k&&(c=Vb(c,{$$start:k,$$end:l}));if(!c.$$bindings){var K=m=c,r=c.name,t={isolateScope:null,bindToController:null};C(K.scope)&&(!0===K.bindToController?(t.bindToController=d(K.scope,r,!0),t.isolateScope={}):t.isolateScope=d(K.scope,r,!1));C(K.bindToController)&&(t.bindToController=d(K.bindToController,r,!0));if(t.bindToController&&!K.controller)throw fa("noctrl",
+r);m=m.$$bindings=t;C(m.isolateScope)&&(c.$$isolateBindings=m.isolateScope)}b.push(c);m=c}}return m}function Z(b){if(f.hasOwnProperty(b))for(var c=a.get(b+"Directive"),d=0,e=c.length;d<e;d++)if(b=c[d],b.multiElement)return!0;return!1}function da(a,b){var c=b.$attr,d=a.$attr;q(a,function(d,e){"$"!==e.charAt(0)&&(b[e]&&b[e]!==d&&(d=d.length?d+(("style"===e?";":" ")+b[e]):b[e]),a.$set(e,d,!0,c[e]))});q(b,function(b,e){a.hasOwnProperty(e)||"$"===e.charAt(0)||(a[e]=b,"class"!==e&&"style"!==e&&(d[e]=c[e]))})}
+function ga(a,b,d,f,g,h,k,l){var m=[],n,p,K=b[0],r=a.shift(),t=Vb(r,{templateUrl:null,transclude:null,replace:null,$$originalDirective:r}),y=D(r.templateUrl)?r.templateUrl(b,d):r.templateUrl,E=r.templateNamespace;b.empty();e(y).then(function(c){var e,G;c=Ea(c);if(r.replace){c=cc.test(c)?pd(ha(E,T(c))):[];e=c[0];if(1!==c.length||1!==e.nodeType)throw fa("tplrt",r.name,y);c={$attr:{}};ka(f,b,e);var I=jc(e,[],c);C(r.scope)&&aa(I,!0);a=I.concat(a);da(d,c)}else e=K,b.html(c);a.unshift(t);n=W(a,e,d,g,b,
+r,h,k,l);q(f,function(a,c){a===e&&(f[c]=b[0])});for(p=Ma(b[0].childNodes,g);m.length;){c=m.shift();G=m.shift();var v=m.shift(),J=m.shift(),I=b[0];if(!c.$$destroyed){if(G!==K){var O=G.className;l.hasElementTranscludeDirective&&r.replace||(I=fc(e));ka(v,B(G),I);La(B(I),O)}G=n.transcludeOnThisElement?ja(c,n.transclude,J):J;n(p,c,I,f,G)}}m=null}).catch(function(a){a instanceof Error&&c(a)});return function(a,b,c,d,e){a=e;b.$$destroyed||(m?m.push(b,c,d,a):(n.transcludeOnThisElement&&(a=ja(b,n.transclude,
+e)),n(p,b,c,d,a)))}}function ea(a,b){var c=b.priority-a.priority;return 0!==c?c:a.name!==b.name?a.name<b.name?-1:1:a.index-b.index}function $(a,b,c,d){function e(a){return a?" (module: "+a+")":""}if(b)throw fa("multidir",b.name,e(b.$$moduleName),c.name,e(c.$$moduleName),a,xa(d));}function la(a,c){var d=b(c,!0);d&&a.push({priority:0,compile:function(a){a=a.parent();var b=!!a.length;b&&ca.$$addBindingClass(a);return function(a,c){var e=c.parent();b||ca.$$addBindingClass(e);ca.$$addBindingInfo(e,d.expressions);
+a.$watch(d,function(a){c[0].nodeValue=a})}}})}function ha(a,b){a=Q(a||"html");switch(a){case "svg":case "math":var c=x.document.createElement("div");c.innerHTML="<"+a+">"+b+"</"+a+">";return c.childNodes[0].childNodes;default:return b}}function oa(a,b){if("srcdoc"===b)return y.HTML;var c=wa(a);if("src"===b||"ngSrc"===b){if(-1===["img","video","audio","source","track"].indexOf(c))return y.RESOURCE_URL}else if("xlinkHref"===b||"form"===c&&"action"===b||"link"===c&&"href"===b)return y.RESOURCE_URL}function pa(a,
+c,d,e,f){var g=oa(a,e),h=k[e]||f,l=b(d,!f,g,h);if(l){if("multiple"===e&&"select"===wa(a))throw fa("selmulti",xa(a));if(m.test(e))throw fa("nodomevents");c.push({priority:100,compile:function(){return{pre:function(a,c,f){c=f.$$observers||(f.$$observers=V());var k=f[e];k!==d&&(l=k&&b(k,!0,g,h),d=k);l&&(f[e]=l(a),(c[e]||(c[e]=[])).$$inter=!0,(f.$$observers&&f.$$observers[e].$$scope||a).$watch(l,function(a,b){"class"===e&&a!==b?f.$updateClass(a,b):f.$set(e,a)}))}}}})}}function ka(a,b,c){var d=b[0],e=
+b.length,f=d.parentNode,g,h;if(a)for(g=0,h=a.length;g<h;g++)if(a[g]===d){a[g++]=c;h=g+e-1;for(var k=a.length;g<k;g++,h++)h<k?a[g]=a[h]:delete a[g];a.length-=e-1;a.context===d&&(a.context=c);break}f&&f.replaceChild(c,d);a=x.document.createDocumentFragment();for(g=0;g<e;g++)a.appendChild(b[g]);B.hasData(d)&&(B.data(c,B.data(d)),B(d).off("$destroy"));B.cleanData(a.querySelectorAll("*"));for(g=1;g<e;g++)delete b[g];b[0]=c;b.length=1}function qa(a,b){return S(function(){return a.apply(null,arguments)},
+a,b)}function ra(a,b,d,e,f,g){try{a(b,d,e,f,g)}catch(h){c(h,xa(d))}}function na(a,c,d,e,f){function g(b,c,e){D(d.$onChanges)&&!Xb(c,e)&&(ia||(a.$$postDigest(P),ia=[]),m||(m={},ia.push(h)),m[b]&&(e=m[b].previousValue),m[b]=new Ib(e,c))}function h(){d.$onChanges(m);m=void 0}var k=[],l={},m;q(e,function(e,h){var m=e.attrName,p=e.optional,r,t,y,G;switch(e.mode){case "@":p||ua.call(c,m)||(d[h]=c[m]=void 0);p=c.$observe(m,function(a){if(F(a)||Ha(a))g(h,a,d[h]),d[h]=a});c.$$observers[m].$$scope=a;r=c[m];
+F(r)?d[h]=b(r)(a):Ha(r)&&(d[h]=r);l[h]=new Ib(lc,d[h]);k.push(p);break;case "=":if(!ua.call(c,m)){if(p)break;c[m]=void 0}if(p&&!c[m])break;t=n(c[m]);G=t.literal?sa:Xb;y=t.assign||function(){r=d[h]=t(a);throw fa("nonassign",c[m],m,f.name);};r=d[h]=t(a);p=function(b){G(b,d[h])||(G(b,r)?y(a,b=d[h]):d[h]=b);return r=b};p.$stateful=!0;p=e.collection?a.$watchCollection(c[m],p):a.$watch(n(c[m],p),null,t.literal);k.push(p);break;case "<":if(!ua.call(c,m)){if(p)break;c[m]=void 0}if(p&&!c[m])break;t=n(c[m]);
+var E=t.literal,I=d[h]=t(a);l[h]=new Ib(lc,d[h]);p=a.$watch(t,function(a,b){if(b===a){if(b===I||E&&sa(b,I))return;b=I}g(h,a,b);d[h]=a},E);k.push(p);break;case "&":t=c.hasOwnProperty(m)?n(c[m]):z;if(t===z&&p)break;d[h]=function(b){return t(a,b)}}});return{initialChanges:l,removeWatches:k.length&&function(){for(var a=0,b=k.length;a<b;++a)k[a]()}}}var Ca=/^\w/,ta=x.document.createElement("div"),Fa=v,Ga=t,ya=J,ia;s.prototype={$normalize:Ba,$addClass:function(a){a&&0<a.length&&O.addClass(this.$$element,
+a)},$removeClass:function(a){a&&0<a.length&&O.removeClass(this.$$element,a)},$updateClass:function(a,b){var c=qd(a,b);c&&c.length&&O.addClass(this.$$element,c);(c=qd(b,a))&&c.length&&O.removeClass(this.$$element,c)},$set:function(a,b,d,e){var f=id(this.$$element[0],a),g=rd[a],h=a;f?(this.$$element.prop(a,b),e=f):g&&(this[g]=b,h=g);this[a]=b;e?this.$attr[a]=e:(e=this.$attr[a])||(this.$attr[a]=e=Tc(a,"-"));f=wa(this.$$element);if("a"===f&&("href"===a||"xlinkHref"===a)||"img"===f&&"src"===a)this[a]=
+b=X(b,"src"===a);else if("img"===f&&"srcset"===a&&u(b)){for(var f="",g=T(b),k=/(\s+\d+x\s*,|\s+\d+w\s*,|\s+,|,\s+)/,k=/\s/.test(g)?k:/(,)/,g=g.split(k),k=Math.floor(g.length/2),l=0;l<k;l++)var m=2*l,f=f+X(T(g[m]),!0),f=f+(" "+T(g[m+1]));g=T(g[2*l]).split(/\s/);f+=X(T(g[0]),!0);2===g.length&&(f+=" "+T(g[1]));this[a]=b=f}!1!==d&&(null===b||w(b)?this.$$element.removeAttr(e):Ca.test(e)?this.$$element.attr(e,b):R(this.$$element[0],e,b));(a=this.$$observers)&&q(a[h],function(a){try{a(b)}catch(d){c(d)}})},
+$observe:function(a,b){var c=this,d=c.$$observers||(c.$$observers=V()),e=d[a]||(d[a]=[]);e.push(b);G.$evalAsync(function(){e.$$inter||!c.hasOwnProperty(a)||w(c[a])||b(c[a])});return function(){$a(e,b)}}};var Aa=b.startSymbol(),Da=b.endSymbol(),Ea="{{"===Aa&&"}}"===Da?Ya:function(a){return a.replace(/\{\{/g,Aa).replace(/}}/g,Da)},Ja=/^ngAttr[A-Z]/,Ka=/^(.+)Start$/;ca.$$addBindingInfo=p?function(a,b){var c=a.data("$binding")||[];H(b)?c=c.concat(b):c.push(b);a.data("$binding",c)}:z;ca.$$addBindingClass=
+p?function(a){La(a,"ng-binding")}:z;ca.$$addScopeInfo=p?function(a,b,c,d){a.data(c?d?"$isolateScopeNoTemplate":"$isolateScope":"$scope",b)}:z;ca.$$addScopeClass=p?function(a,b){La(a,b?"ng-isolate-scope":"ng-scope")}:z;ca.$$createComment=function(a,b){var c="";p&&(c=" "+(a||"")+": ",b&&(c+=b+" "));return x.document.createComment(c)};return ca}]}function Ib(a,b){this.previousValue=a;this.currentValue=b}function Ba(a){return a.replace(md,"").replace(rg,gb)}function qd(a,b){var d="",c=a.split(/\s+/),
+e=b.split(/\s+/),f=0;a:for(;f<c.length;f++){for(var g=c[f],h=0;h<e.length;h++)if(g===e[h])continue a;d+=(0<d.length?" ":"")+g}return d}function pd(a){a=B(a);var b=a.length;if(1>=b)return a;for(;b--;){var d=a[b];(8===d.nodeType||d.nodeType===Ia&&""===d.nodeValue.trim())&&sg.call(a,b,1)}return a}function qg(a,b){if(b&&F(b))return b;if(F(a)){var d=sd.exec(a);if(d)return d[3]}}function wf(){var a={},b=!1;this.has=function(b){return a.hasOwnProperty(b)};this.register=function(b,c){Ka(b,"controller");C(b)?
+S(a,b):a[b]=c};this.allowGlobals=function(){b=!0};this.$get=["$injector","$window",function(d,c){function e(a,b,c,d){if(!a||!C(a.$scope))throw L("$controller")("noscp",d,b);a.$scope[b]=c}return function(f,g,h,k){var l,m,n;h=!0===h;k&&F(k)&&(n=k);if(F(f)){k=f.match(sd);if(!k)throw td("ctrlfmt",f);m=k[1];n=n||k[3];f=a.hasOwnProperty(m)?a[m]:Vc(g.$scope,m,!0)||(b?Vc(c,m,!0):void 0);if(!f)throw td("ctrlreg",m);sb(f,m,!0)}if(h)return h=(H(f)?f[f.length-1]:f).prototype,l=Object.create(h||null),n&&e(g,n,
+l,m||f.name),S(function(){var a=d.invoke(f,l,g,m);a!==l&&(C(a)||D(a))&&(l=a,n&&e(g,n,l,m||f.name));return l},{instance:l,identifier:n});l=d.instantiate(f,g,m);n&&e(g,n,l,m||f.name);return l}}]}function xf(){this.$get=["$window",function(a){return B(a.document)}]}function yf(){this.$get=["$document","$rootScope",function(a,b){function d(){e=c.hidden}var c=a[0],e=c&&c.hidden;a.on("visibilitychange",d);b.$on("$destroy",function(){a.off("visibilitychange",d)});return function(){return e}}]}function zf(){this.$get=
+["$log",function(a){return function(b,d){a.error.apply(a,arguments)}}]}function mc(a){return C(a)?ga(a)?a.toISOString():cb(a):a}function Ef(){this.$get=function(){return function(a){if(!a)return"";var b=[];Kc(a,function(a,c){null===a||w(a)||(H(a)?q(a,function(a){b.push($(c)+"="+$(mc(a)))}):b.push($(c)+"="+$(mc(a))))});return b.join("&")}}}function Ff(){this.$get=function(){return function(a){function b(a,e,f){null===a||w(a)||(H(a)?q(a,function(a,c){b(a,e+"["+(C(a)?c:"")+"]")}):C(a)&&!ga(a)?Kc(a,function(a,
+c){b(a,e+(f?"":"[")+c+(f?"":"]"))}):d.push($(e)+"="+$(mc(a))))}if(!a)return"";var d=[];b(a,"",!0);return d.join("&")}}}function nc(a,b){if(F(a)){var d=a.replace(tg,"").trim();if(d){var c=b("Content-Type");(c=c&&0===c.indexOf(ud))||(c=(c=d.match(ug))&&vg[c[0]].test(d));if(c)try{a=Oc(d)}catch(e){throw oc("baddata",a,e);}}}return a}function vd(a){var b=V(),d;F(a)?q(a.split("\n"),function(a){d=a.indexOf(":");var e=Q(T(a.substr(0,d)));a=T(a.substr(d+1));e&&(b[e]=b[e]?b[e]+", "+a:a)}):C(a)&&q(a,function(a,
+d){var f=Q(d),g=T(a);f&&(b[f]=b[f]?b[f]+", "+g:g)});return b}function wd(a){var b;return function(d){b||(b=vd(a));return d?(d=b[Q(d)],void 0===d&&(d=null),d):b}}function xd(a,b,d,c){if(D(c))return c(a,b,d);q(c,function(c){a=c(a,b,d)});return a}function Df(){var a=this.defaults={transformResponse:[nc],transformRequest:[function(a){return C(a)&&"[object File]"!==ma.call(a)&&"[object Blob]"!==ma.call(a)&&"[object FormData]"!==ma.call(a)?cb(a):a}],headers:{common:{Accept:"application/json, text/plain, */*"},
+post:pa(pc),put:pa(pc),patch:pa(pc)},xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",paramSerializer:"$httpParamSerializer",jsonpCallbackParam:"callback"},b=!1;this.useApplyAsync=function(a){return u(a)?(b=!!a,this):b};var d=this.interceptors=[];this.$get=["$browser","$httpBackend","$$cookieReader","$cacheFactory","$rootScope","$q","$injector","$sce",function(c,e,f,g,h,k,l,m){function n(b){function d(a,b){for(var c=0,e=b.length;c<e;){var f=b[c++],g=b[c++];a=a.then(f,g)}b.length=0;return a}
+function e(a,b){var c,d={};q(a,function(a,e){D(a)?(c=a(b),null!=c&&(d[e]=c)):d[e]=a});return d}function f(a){var b=S({},a);b.data=xd(a.data,a.headers,a.status,g.transformResponse);a=a.status;return 200<=a&&300>a?b:k.reject(b)}if(!C(b))throw L("$http")("badreq",b);if(!F(m.valueOf(b.url)))throw L("$http")("badreq",b.url);var g=S({method:"get",transformRequest:a.transformRequest,transformResponse:a.transformResponse,paramSerializer:a.paramSerializer,jsonpCallbackParam:a.jsonpCallbackParam},b);g.headers=
+function(b){var c=a.headers,d=S({},b.headers),f,g,h,c=S({},c.common,c[Q(b.method)]);a:for(f in c){g=Q(f);for(h in d)if(Q(h)===g)continue a;d[f]=c[f]}return e(d,pa(b))}(b);g.method=ub(g.method);g.paramSerializer=F(g.paramSerializer)?l.get(g.paramSerializer):g.paramSerializer;c.$$incOutstandingRequestCount();var h=[],n=[];b=k.resolve(g);q(t,function(a){(a.request||a.requestError)&&h.unshift(a.request,a.requestError);(a.response||a.responseError)&&n.push(a.response,a.responseError)});b=d(b,h);b=b.then(function(b){var c=
+b.headers,d=xd(b.data,wd(c),void 0,b.transformRequest);w(d)&&q(c,function(a,b){"content-type"===Q(b)&&delete c[b]});w(b.withCredentials)&&!w(a.withCredentials)&&(b.withCredentials=a.withCredentials);return p(b,d).then(f,f)});b=d(b,n);return b=b.finally(function(){c.$$completeOutstandingRequest(z)})}function p(c,d){function g(a){if(a){var c={};q(a,function(a,d){c[d]=function(c){function d(){a(c)}b?h.$applyAsync(d):h.$$phase?d():h.$apply(d)}});return c}}function l(a,c,d,e){function f(){p(c,a,d,e)}O&&
+(200<=a&&300>a?O.put(R,[a,c,vd(d),e]):O.remove(R));b?h.$applyAsync(f):(f(),h.$$phase||h.$apply())}function p(a,b,d,e){b=-1<=b?b:0;(200<=b&&300>b?G.resolve:G.reject)({data:a,status:b,headers:wd(d),config:c,statusText:e})}function K(a){p(a.data,a.status,pa(a.headers()),a.statusText)}function t(){var a=n.pendingRequests.indexOf(c);-1!==a&&n.pendingRequests.splice(a,1)}var G=k.defer(),y=G.promise,O,X,P=c.headers,s="jsonp"===Q(c.method),R=c.url;s?R=m.getTrustedResourceUrl(R):F(R)||(R=m.valueOf(R));R=r(R,
+c.paramSerializer(c.params));s&&(R=J(R,c.jsonpCallbackParam));n.pendingRequests.push(c);y.then(t,t);!c.cache&&!a.cache||!1===c.cache||"GET"!==c.method&&"JSONP"!==c.method||(O=C(c.cache)?c.cache:C(a.cache)?a.cache:v);O&&(X=O.get(R),u(X)?X&&D(X.then)?X.then(K,K):H(X)?p(X[1],X[0],pa(X[2]),X[3]):p(X,200,{},"OK"):O.put(R,y));w(X)&&((X=yd(c.url)?f()[c.xsrfCookieName||a.xsrfCookieName]:void 0)&&(P[c.xsrfHeaderName||a.xsrfHeaderName]=X),e(c.method,R,d,l,P,c.timeout,c.withCredentials,c.responseType,g(c.eventHandlers),
+g(c.uploadEventHandlers)));return y}function r(a,b){0<b.length&&(a+=(-1===a.indexOf("?")?"?":"&")+b);return a}function J(a,b){if(/[&?][^=]+=JSON_CALLBACK/.test(a))throw oc("badjsonp",a);if((new RegExp("[&?]"+b+"=")).test(a))throw oc("badjsonp",b,a);return a+=(-1===a.indexOf("?")?"?":"&")+b+"=JSON_CALLBACK"}var v=g("$http");a.paramSerializer=F(a.paramSerializer)?l.get(a.paramSerializer):a.paramSerializer;var t=[];q(d,function(a){t.unshift(F(a)?l.get(a):l.invoke(a))});n.pendingRequests=[];(function(a){q(arguments,
+function(a){n[a]=function(b,c){return n(S({},c||{},{method:a,url:b}))}})})("get","delete","head","jsonp");(function(a){q(arguments,function(a){n[a]=function(b,c,d){return n(S({},d||{},{method:a,url:b,data:c}))}})})("post","put","patch");n.defaults=a;return n}]}function Hf(){this.$get=function(){return function(){return new x.XMLHttpRequest}}}function Gf(){this.$get=["$browser","$jsonpCallbacks","$document","$xhrFactory",function(a,b,d,c){return wg(a,c,a.defer,b,d[0])}]}function wg(a,b,d,c,e){function f(a,
+b,d){a=a.replace("JSON_CALLBACK",b);var f=e.createElement("script"),m=null;f.type="text/javascript";f.src=a;f.async=!0;m=function(a){f.removeEventListener("load",m);f.removeEventListener("error",m);e.body.removeChild(f);f=null;var g=-1,r="unknown";a&&("load"!==a.type||c.wasCalled(b)||(a={type:"error"}),r=a.type,g="error"===a.type?404:200);d&&d(g,r)};f.addEventListener("load",m);f.addEventListener("error",m);e.body.appendChild(f);return m}return function(e,h,k,l,m,n,p,r,J,v){function t(){N&&N();A&&
+A.abort()}h=h||a.url();if("jsonp"===Q(e))var M=c.createCallback(h),N=f(h,M,function(a,b){var e=200===a&&c.getResponse(M);u(I)&&d.cancel(I);N=A=null;l(a,e,"",b);c.removeCallback(M)});else{var A=b(e,h);A.open(e,h,!0);q(m,function(a,b){u(a)&&A.setRequestHeader(b,a)});A.onload=function(){var a=A.statusText||"",b="response"in A?A.response:A.responseText,c=1223===A.status?204:A.status;0===c&&(c=b?200:"file"===Ca(h).protocol?404:0);var e=A.getAllResponseHeaders();u(I)&&d.cancel(I);N=A=null;l(c,b,e,a)};e=
+function(){u(I)&&d.cancel(I);N=A=null;l(-1,null,null,"")};A.onerror=e;A.onabort=e;A.ontimeout=e;q(J,function(a,b){A.addEventListener(b,a)});q(v,function(a,b){A.upload.addEventListener(b,a)});p&&(A.withCredentials=!0);if(r)try{A.responseType=r}catch(s){if("json"!==r)throw s;}A.send(w(k)?null:k)}if(0<n)var I=d(t,n);else n&&D(n.then)&&n.then(t)}}function Bf(){var a="{{",b="}}";this.startSymbol=function(b){return b?(a=b,this):a};this.endSymbol=function(a){return a?(b=a,this):b};this.$get=["$parse","$exceptionHandler",
+"$sce",function(d,c,e){function f(a){return"\\\\\\"+a}function g(c){return c.replace(n,a).replace(p,b)}function h(a,b,c,d){var e=a.$watch(function(a){e();return d(a)},b,c);return e}function k(f,k,n,p){function M(a){try{var b=a;a=n?e.getTrusted(n,b):e.valueOf(b);return p&&!u(a)?a:$b(a)}catch(d){c(Da.interr(f,d))}}if(!f.length||-1===f.indexOf(a)){var q;k||(k=g(f),q=la(k),q.exp=f,q.expressions=[],q.$$watchDelegate=h);return q}p=!!p;var A,s,I=0,K=[],E=[];q=f.length;for(var G=[],y=[];I<q;)if(-1!==(A=f.indexOf(a,
+I))&&-1!==(s=f.indexOf(b,A+l)))I!==A&&G.push(g(f.substring(I,A))),I=f.substring(A+l,s),K.push(I),E.push(d(I,M)),I=s+m,y.push(G.length),G.push("");else{I!==q&&G.push(g(f.substring(I)));break}n&&1<G.length&&Da.throwNoconcat(f);if(!k||K.length){var O=function(a){for(var b=0,c=K.length;b<c;b++){if(p&&w(a[b]))return;G[y[b]]=a[b]}return G.join("")};return S(function(a){var b=0,d=K.length,e=Array(d);try{for(;b<d;b++)e[b]=E[b](a);return O(e)}catch(g){c(Da.interr(f,g))}},{exp:f,expressions:K,$$watchDelegate:function(a,
+b){var c;return a.$watchGroup(E,function(d,e){var f=O(d);D(b)&&b.call(this,f,d!==e?c:f,a);c=f})}})}}var l=a.length,m=b.length,n=new RegExp(a.replace(/./g,f),"g"),p=new RegExp(b.replace(/./g,f),"g");k.startSymbol=function(){return a};k.endSymbol=function(){return b};return k}]}function Cf(){this.$get=["$rootScope","$window","$q","$$q","$browser",function(a,b,d,c,e){function f(f,k,l,m){function n(){p?f.apply(null,r):f(t)}var p=4<arguments.length,r=p?va.call(arguments,4):[],J=b.setInterval,v=b.clearInterval,
+t=0,M=u(m)&&!m,q=(M?c:d).defer(),A=q.promise;l=u(l)?l:0;A.$$intervalId=J(function(){M?e.defer(n):a.$evalAsync(n);q.notify(t++);0<l&&t>=l&&(q.resolve(t),v(A.$$intervalId),delete g[A.$$intervalId]);M||a.$apply()},k);g[A.$$intervalId]=q;return A}var g={};f.cancel=function(a){return a&&a.$$intervalId in g?(g[a.$$intervalId].promise.catch(z),g[a.$$intervalId].reject("canceled"),b.clearInterval(a.$$intervalId),delete g[a.$$intervalId],!0):!1};return f}]}function qc(a){a=a.split("/");for(var b=a.length;b--;)a[b]=
+db(a[b]);return a.join("/")}function zd(a,b){var d=Ca(a);b.$$protocol=d.protocol;b.$$host=d.hostname;b.$$port=Z(d.port)||xg[d.protocol]||null}function Ad(a,b){if(yg.test(a))throw kb("badpath",a);var d="/"!==a.charAt(0);d&&(a="/"+a);var c=Ca(a);b.$$path=decodeURIComponent(d&&"/"===c.pathname.charAt(0)?c.pathname.substring(1):c.pathname);b.$$search=Rc(c.search);b.$$hash=decodeURIComponent(c.hash);b.$$path&&"/"!==b.$$path.charAt(0)&&(b.$$path="/"+b.$$path)}function rc(a,b){return a.slice(0,b.length)===
+b}function ka(a,b){if(rc(b,a))return b.substr(a.length)}function Aa(a){var b=a.indexOf("#");return-1===b?a:a.substr(0,b)}function lb(a){return a.replace(/(#.+)|#$/,"$1")}function sc(a,b,d){this.$$html5=!0;d=d||"";zd(a,this);this.$$parse=function(a){var d=ka(b,a);if(!F(d))throw kb("ipthprfx",a,b);Ad(d,this);this.$$path||(this.$$path="/");this.$$compose()};this.$$compose=function(){var a=Zb(this.$$search),d=this.$$hash?"#"+db(this.$$hash):"";this.$$url=qc(this.$$path)+(a?"?"+a:"")+d;this.$$absUrl=b+
+this.$$url.substr(1);this.$$urlUpdatedByLocation=!0};this.$$parseLinkUrl=function(c,e){if(e&&"#"===e[0])return this.hash(e.slice(1)),!0;var f,g;u(f=ka(a,c))?(g=f,g=d&&u(f=ka(d,f))?b+(ka("/",f)||f):a+g):u(f=ka(b,c))?g=b+f:b===c+"/"&&(g=b);g&&this.$$parse(g);return!!g}}function tc(a,b,d){zd(a,this);this.$$parse=function(c){var e=ka(a,c)||ka(b,c),f;w(e)||"#"!==e.charAt(0)?this.$$html5?f=e:(f="",w(e)&&(a=c,this.replace())):(f=ka(d,e),w(f)&&(f=e));Ad(f,this);c=this.$$path;var e=a,g=/^\/[A-Z]:(\/.*)/;rc(f,
+e)&&(f=f.replace(e,""));g.exec(f)||(c=(f=g.exec(c))?f[1]:c);this.$$path=c;this.$$compose()};this.$$compose=function(){var b=Zb(this.$$search),e=this.$$hash?"#"+db(this.$$hash):"";this.$$url=qc(this.$$path)+(b?"?"+b:"")+e;this.$$absUrl=a+(this.$$url?d+this.$$url:"");this.$$urlUpdatedByLocation=!0};this.$$parseLinkUrl=function(b,d){return Aa(a)===Aa(b)?(this.$$parse(b),!0):!1}}function Bd(a,b,d){this.$$html5=!0;tc.apply(this,arguments);this.$$parseLinkUrl=function(c,e){if(e&&"#"===e[0])return this.hash(e.slice(1)),
+!0;var f,g;a===Aa(c)?f=c:(g=ka(b,c))?f=a+d+g:b===c+"/"&&(f=b);f&&this.$$parse(f);return!!f};this.$$compose=function(){var b=Zb(this.$$search),e=this.$$hash?"#"+db(this.$$hash):"";this.$$url=qc(this.$$path)+(b?"?"+b:"")+e;this.$$absUrl=a+d+this.$$url;this.$$urlUpdatedByLocation=!0}}function Jb(a){return function(){return this[a]}}function Cd(a,b){return function(d){if(w(d))return this[a];this[a]=b(d);this.$$compose();return this}}function Jf(){var a="!",b={enabled:!1,requireBase:!0,rewriteLinks:!0};
+this.hashPrefix=function(b){return u(b)?(a=b,this):a};this.html5Mode=function(a){if(Ha(a))return b.enabled=a,this;if(C(a)){Ha(a.enabled)&&(b.enabled=a.enabled);Ha(a.requireBase)&&(b.requireBase=a.requireBase);if(Ha(a.rewriteLinks)||F(a.rewriteLinks))b.rewriteLinks=a.rewriteLinks;return this}return b};this.$get=["$rootScope","$browser","$sniffer","$rootElement","$window",function(d,c,e,f,g){function h(a,b,d){var e=l.url(),f=l.$$state;try{c.url(a,b,d),l.$$state=c.state()}catch(g){throw l.url(e),l.$$state=
+f,g;}}function k(a,b){d.$broadcast("$locationChangeSuccess",l.absUrl(),a,l.$$state,b)}var l,m;m=c.baseHref();var n=c.url(),p;if(b.enabled){if(!m&&b.requireBase)throw kb("nobase");p=n.substring(0,n.indexOf("/",n.indexOf("//")+2))+(m||"/");m=e.history?sc:Bd}else p=Aa(n),m=tc;var r=p.substr(0,Aa(p).lastIndexOf("/")+1);l=new m(p,r,"#"+a);l.$$parseLinkUrl(n,n);l.$$state=c.state();var J=/^\s*(javascript|mailto):/i;f.on("click",function(a){var e=b.rewriteLinks;if(e&&!a.ctrlKey&&!a.metaKey&&!a.shiftKey&&
+2!==a.which&&2!==a.button){for(var h=B(a.target);"a"!==wa(h[0]);)if(h[0]===f[0]||!(h=h.parent())[0])return;if(!F(e)||!w(h.attr(e))){var e=h.prop("href"),k=h.attr("href")||h.attr("xlink:href");C(e)&&"[object SVGAnimatedString]"===e.toString()&&(e=Ca(e.animVal).href);J.test(e)||!e||h.attr("target")||a.isDefaultPrevented()||!l.$$parseLinkUrl(e,k)||(a.preventDefault(),l.absUrl()!==c.url()&&(d.$apply(),g.angular["ff-684208-preventDefault"]=!0))}}});lb(l.absUrl())!==lb(n)&&c.url(l.absUrl(),!0);var v=!0;
+c.onUrlChange(function(a,b){rc(a,r)?(d.$evalAsync(function(){var c=l.absUrl(),e=l.$$state,f;a=lb(a);l.$$parse(a);l.$$state=b;f=d.$broadcast("$locationChangeStart",a,c,b,e).defaultPrevented;l.absUrl()===a&&(f?(l.$$parse(c),l.$$state=e,h(c,!1,e)):(v=!1,k(c,e)))}),d.$$phase||d.$digest()):g.location.href=a});d.$watch(function(){if(v||l.$$urlUpdatedByLocation){l.$$urlUpdatedByLocation=!1;var a=lb(c.url()),b=lb(l.absUrl()),f=c.state(),g=l.$$replace,m=a!==b||l.$$html5&&e.history&&f!==l.$$state;if(v||m)v=
+!1,d.$evalAsync(function(){var b=l.absUrl(),c=d.$broadcast("$locationChangeStart",b,a,l.$$state,f).defaultPrevented;l.absUrl()===b&&(c?(l.$$parse(a),l.$$state=f):(m&&h(b,g,f===l.$$state?null:l.$$state),k(a,f)))})}l.$$replace=!1});return l}]}function Kf(){var a=!0,b=this;this.debugEnabled=function(b){return u(b)?(a=b,this):a};this.$get=["$window",function(d){function c(a){a instanceof Error&&(a.stack&&f?a=a.message&&-1===a.stack.indexOf(a.message)?"Error: "+a.message+"\n"+a.stack:a.stack:a.sourceURL&&
+(a=a.message+"\n"+a.sourceURL+":"+a.line));return a}function e(a){var b=d.console||{},e=b[a]||b.log||z;a=!1;try{a=!!e.apply}catch(f){}return a?function(){var a=[];q(arguments,function(b){a.push(c(b))});return e.apply(b,a)}:function(a,b){e(a,null==b?"":b)}}var f=za||/\bEdge\//.test(d.navigator&&d.navigator.userAgent);return{log:e("log"),info:e("info"),warn:e("warn"),error:e("error"),debug:function(){var c=e("debug");return function(){a&&c.apply(b,arguments)}}()}}]}function zg(a){return a+""}function Ag(a,
+b){return"undefined"!==typeof a?a:b}function Dd(a,b){return"undefined"===typeof a?b:"undefined"===typeof b?a:a+b}function U(a,b){var d,c,e;switch(a.type){case s.Program:d=!0;q(a.body,function(a){U(a.expression,b);d=d&&a.expression.constant});a.constant=d;break;case s.Literal:a.constant=!0;a.toWatch=[];break;case s.UnaryExpression:U(a.argument,b);a.constant=a.argument.constant;a.toWatch=a.argument.toWatch;break;case s.BinaryExpression:U(a.left,b);U(a.right,b);a.constant=a.left.constant&&a.right.constant;
+a.toWatch=a.left.toWatch.concat(a.right.toWatch);break;case s.LogicalExpression:U(a.left,b);U(a.right,b);a.constant=a.left.constant&&a.right.constant;a.toWatch=a.constant?[]:[a];break;case s.ConditionalExpression:U(a.test,b);U(a.alternate,b);U(a.consequent,b);a.constant=a.test.constant&&a.alternate.constant&&a.consequent.constant;a.toWatch=a.constant?[]:[a];break;case s.Identifier:a.constant=!1;a.toWatch=[a];break;case s.MemberExpression:U(a.object,b);a.computed&&U(a.property,b);a.constant=a.object.constant&&
+(!a.computed||a.property.constant);a.toWatch=[a];break;case s.CallExpression:d=e=a.filter?!b(a.callee.name).$stateful:!1;c=[];q(a.arguments,function(a){U(a,b);d=d&&a.constant;a.constant||c.push.apply(c,a.toWatch)});a.constant=d;a.toWatch=e?c:[a];break;case s.AssignmentExpression:U(a.left,b);U(a.right,b);a.constant=a.left.constant&&a.right.constant;a.toWatch=[a];break;case s.ArrayExpression:d=!0;c=[];q(a.elements,function(a){U(a,b);d=d&&a.constant;a.constant||c.push.apply(c,a.toWatch)});a.constant=
+d;a.toWatch=c;break;case s.ObjectExpression:d=!0;c=[];q(a.properties,function(a){U(a.value,b);d=d&&a.value.constant&&!a.computed;a.value.constant||c.push.apply(c,a.value.toWatch);a.computed&&(U(a.key,b),a.key.constant||c.push.apply(c,a.key.toWatch))});a.constant=d;a.toWatch=c;break;case s.ThisExpression:a.constant=!1;a.toWatch=[];break;case s.LocalsExpression:a.constant=!1,a.toWatch=[]}}function Ed(a){if(1===a.length){a=a[0].expression;var b=a.toWatch;return 1!==b.length?b:b[0]!==a?b:void 0}}function Fd(a){return a.type===
+s.Identifier||a.type===s.MemberExpression}function Gd(a){if(1===a.body.length&&Fd(a.body[0].expression))return{type:s.AssignmentExpression,left:a.body[0].expression,right:{type:s.NGValueParameter},operator:"="}}function Hd(a){this.$filter=a}function Id(a){this.$filter=a}function uc(a,b,d){this.ast=new s(a,d);this.astCompiler=d.csp?new Id(b):new Hd(b)}function vc(a){return D(a.valueOf)?a.valueOf():Bg.call(a)}function Lf(){var a=V(),b={"true":!0,"false":!1,"null":null,undefined:void 0},d,c;this.addLiteral=
+function(a,c){b[a]=c};this.setIdentifierFns=function(a,b){d=a;c=b;return this};this.$get=["$filter",function(e){function f(a,b,c){return null==a||null==b?a===b:"object"!==typeof a||(a=vc(a),"object"!==typeof a||c)?a===b||a!==a&&b!==b:!1}function g(a,b,c,d,e){var g=d.inputs,h;if(1===g.length){var k=f,g=g[0];return a.$watch(function(a){var b=g(a);f(b,k,d.literal)||(h=d(a,void 0,void 0,[b]),k=b&&vc(b));return h},b,c,e)}for(var l=[],m=[],n=0,E=g.length;n<E;n++)l[n]=f,m[n]=null;return a.$watch(function(a){for(var b=
+!1,c=0,e=g.length;c<e;c++){var k=g[c](a);if(b||(b=!f(k,l[c],d.literal)))m[c]=k,l[c]=k&&vc(k)}b&&(h=d(a,void 0,void 0,m));return h},b,c,e)}function h(a,b,c,d,e){function f(a){return d(a)}function h(a,c,d){n=a;D(b)&&b(a,c,d);l(a)&&d.$$postDigest(function(){l(n)&&m()})}var l=d.literal?k:u,m,n;return m=d.inputs?g(a,h,c,d,e):a.$watch(f,h,c)}function k(a){var b=!0;q(a,function(a){u(a)||(b=!1)});return b}function l(a,b,c,d){var e=a.$watch(function(a){e();return d(a)},b,c);return e}function m(a,b){function c(d,
+e,g,h){g=f&&h?h[0]:a(d,e,g,h);return b(g,d,e)}function d(c,e,g,k){g=f&&k?k[0]:a(c,e,g,k);c=b(g,c,e);return h(g)?c:g}if(!b)return a;var e=a.$$watchDelegate,f=!1,h=a.literal?k:u,l=a.oneTime?d:c;l.literal=a.literal;l.oneTime=a.oneTime;f=!a.inputs;e&&e!==g?(l.$$watchDelegate=e,l.inputs=a.inputs):b.$stateful||(l.$$watchDelegate=g,l.inputs=a.inputs?a.inputs:[a]);return l}var n={csp:Ga().noUnsafeEval,literals:ra(b),isIdentifierStart:D(d)&&d,isIdentifierContinue:D(c)&&c};return function(b,c){var d,f,k;switch(typeof b){case "string":return k=
+b=b.trim(),d=a[k],d||(":"===b.charAt(0)&&":"===b.charAt(1)&&(f=!0,b=b.substring(2)),d=new wc(n),d=(new uc(d,e,n)).parse(b),d.constant?d.$$watchDelegate=l:f?(d.oneTime=!0,d.$$watchDelegate=h):d.inputs&&(d.$$watchDelegate=g),a[k]=d),m(d,c);case "function":return m(b,c);default:return m(z,c)}}}]}function Nf(){var a=!0;this.$get=["$rootScope","$exceptionHandler",function(b,d){return Jd(function(a){b.$evalAsync(a)},d,a)}];this.errorOnUnhandledRejections=function(b){return u(b)?(a=b,this):a}}function Of(){var a=
+!0;this.$get=["$browser","$exceptionHandler",function(b,d){return Jd(function(a){b.defer(a)},d,a)}];this.errorOnUnhandledRejections=function(b){return u(b)?(a=b,this):a}}function Jd(a,b,d){function c(){return new e}function e(){var a=this.promise=new f;this.resolve=function(b){k(a,b)};this.reject=function(b){m(a,b)};this.notify=function(b){p(a,b)}}function f(){this.$$state={status:0}}function g(){for(;!s&&A.length;){var a=A.shift();if(!a.pur){a.pur=!0;var c=a.value,c="Possibly unhandled rejection: "+
+("function"===typeof c?c.toString().replace(/ \{[\s\S]*$/,""):w(c)?"undefined":"string"!==typeof c?Be(c,void 0):c);a.value instanceof Error?b(a.value,c):b(c)}}}function h(b){!d||b.pending||2!==b.status||b.pur||(0===s&&0===A.length&&a(g),A.push(b));!b.processScheduled&&b.pending&&(b.processScheduled=!0,++s,a(function(){var c,e,f;f=b.pending;b.processScheduled=!1;b.pending=void 0;try{for(var h=0,l=f.length;h<l;++h){b.pur=!0;e=f[h][0];c=f[h][b.status];try{D(c)?k(e,c(b.value)):1===b.status?k(e,b.value):
+m(e,b.value)}catch(n){m(e,n)}}}finally{--s,d&&0===s&&a(g)}}))}function k(a,b){a.$$state.status||(b===a?n(a,M("qcycle",b)):l(a,b))}function l(a,b){function c(b){g||(g=!0,l(a,b))}function d(b){g||(g=!0,n(a,b))}function e(b){p(a,b)}var f,g=!1;try{if(C(b)||D(b))f=b.then;D(f)?(a.$$state.status=-1,f.call(b,c,d,e)):(a.$$state.value=b,a.$$state.status=1,h(a.$$state))}catch(k){d(k)}}function m(a,b){a.$$state.status||n(a,b)}function n(a,b){a.$$state.value=b;a.$$state.status=2;h(a.$$state)}function p(c,d){var e=
+c.$$state.pending;0>=c.$$state.status&&e&&e.length&&a(function(){for(var a,c,f=0,g=e.length;f<g;f++){c=e[f][0];a=e[f][3];try{p(c,D(a)?a(d):d)}catch(h){b(h)}}})}function r(a){var b=new f;m(b,a);return b}function J(a,b,c){var d=null;try{D(c)&&(d=c())}catch(e){return r(e)}return d&&D(d.then)?d.then(function(){return b(a)},r):b(a)}function v(a,b,c,d){var e=new f;k(e,a);return e.then(b,c,d)}function t(a){if(!D(a))throw M("norslvr",a);var b=new f;a(function(a){k(b,a)},function(a){m(b,a)});return b}var M=
+L("$q",TypeError),s=0,A=[];S(f.prototype,{then:function(a,b,c){if(w(a)&&w(b)&&w(c))return this;var d=new f;this.$$state.pending=this.$$state.pending||[];this.$$state.pending.push([d,a,b,c]);0<this.$$state.status&&h(this.$$state);return d},"catch":function(a){return this.then(null,a)},"finally":function(a,b){return this.then(function(b){return J(b,u,a)},function(b){return J(b,r,a)},b)}});var u=v;t.prototype=f.prototype;t.defer=c;t.reject=r;t.when=v;t.resolve=u;t.all=function(a){var b=new f,c=0,d=H(a)?
+[]:{};q(a,function(a,e){c++;v(a).then(function(a){d[e]=a;--c||k(b,d)},function(a){m(b,a)})});0===c&&k(b,d);return b};t.race=function(a){var b=c();q(a,function(a){v(a).then(b.resolve,b.reject)});return b.promise};return t}function Xf(){this.$get=["$window","$timeout",function(a,b){var d=a.requestAnimationFrame||a.webkitRequestAnimationFrame,c=a.cancelAnimationFrame||a.webkitCancelAnimationFrame||a.webkitCancelRequestAnimationFrame,e=!!d,f=e?function(a){var b=d(a);return function(){c(b)}}:function(a){var c=
+b(a,16.66,!1);return function(){b.cancel(c)}};f.supported=e;return f}]}function Mf(){function a(a){function b(){this.$$watchers=this.$$nextSibling=this.$$childHead=this.$$childTail=null;this.$$listeners={};this.$$listenerCount={};this.$$watchersCount=0;this.$id=++qb;this.$$ChildScope=null}b.prototype=a;return b}var b=10,d=L("$rootScope"),c=null,e=null;this.digestTtl=function(a){arguments.length&&(b=a);return b};this.$get=["$exceptionHandler","$parse","$browser",function(f,g,h){function k(a){a.currentScope.$$destroyed=
+!0}function l(a){9===za&&(a.$$childHead&&l(a.$$childHead),a.$$nextSibling&&l(a.$$nextSibling));a.$parent=a.$$nextSibling=a.$$prevSibling=a.$$childHead=a.$$childTail=a.$root=a.$$watchers=null}function m(){this.$id=++qb;this.$$phase=this.$parent=this.$$watchers=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=null;this.$root=this;this.$$destroyed=!1;this.$$listeners={};this.$$listenerCount={};this.$$watchersCount=0;this.$$isolateBindings=null}function n(a){if(M.$$phase)throw d("inprog",
+M.$$phase);M.$$phase=a}function p(a,b){do a.$$watchersCount+=b;while(a=a.$parent)}function r(a,b,c){do a.$$listenerCount[c]-=b,0===a.$$listenerCount[c]&&delete a.$$listenerCount[c];while(a=a.$parent)}function J(){}function v(){for(;u.length;)try{u.shift()()}catch(a){f(a)}e=null}function t(){null===e&&(e=h.defer(function(){M.$apply(v)}))}m.prototype={constructor:m,$new:function(b,c){var d;c=c||this;b?(d=new m,d.$root=this.$root):(this.$$ChildScope||(this.$$ChildScope=a(this)),d=new this.$$ChildScope);
+d.$parent=c;d.$$prevSibling=c.$$childTail;c.$$childHead?(c.$$childTail.$$nextSibling=d,c.$$childTail=d):c.$$childHead=c.$$childTail=d;(b||c!==this)&&d.$on("$destroy",k);return d},$watch:function(a,b,d,e){var f=g(a);if(f.$$watchDelegate)return f.$$watchDelegate(this,b,d,f,a);var h=this,k=h.$$watchers,l={fn:b,last:J,get:f,exp:e||a,eq:!!d};c=null;D(b)||(l.fn=z);k||(k=h.$$watchers=[],k.$$digestWatchIndex=-1);k.unshift(l);k.$$digestWatchIndex++;p(this,1);return function(){var a=$a(k,l);0<=a&&(p(h,-1),
+a<k.$$digestWatchIndex&&k.$$digestWatchIndex--);c=null}},$watchGroup:function(a,b){function c(){h=!1;k?(k=!1,b(e,e,g)):b(e,d,g)}var d=Array(a.length),e=Array(a.length),f=[],g=this,h=!1,k=!0;if(!a.length){var l=!0;g.$evalAsync(function(){l&&b(e,e,g)});return function(){l=!1}}if(1===a.length)return this.$watch(a[0],function(a,c,f){e[0]=a;d[0]=c;b(e,a===c?e:d,f)});q(a,function(a,b){var k=g.$watch(a,function(a,f){e[b]=a;d[b]=f;h||(h=!0,g.$evalAsync(c))});f.push(k)});return function(){for(;f.length;)f.shift()()}},
+$watchCollection:function(a,b){function c(a){e=a;var b,d,g,h;if(!w(e)){if(C(e))if(qa(e))for(f!==n&&(f=n,t=f.length=0,l++),a=e.length,t!==a&&(l++,f.length=t=a),b=0;b<a;b++)h=f[b],g=e[b],d=h!==h&&g!==g,d||h===g||(l++,f[b]=g);else{f!==p&&(f=p={},t=0,l++);a=0;for(b in e)ua.call(e,b)&&(a++,g=e[b],h=f[b],b in f?(d=h!==h&&g!==g,d||h===g||(l++,f[b]=g)):(t++,f[b]=g,l++));if(t>a)for(b in l++,f)ua.call(e,b)||(t--,delete f[b])}else f!==e&&(f=e,l++);return l}}c.$stateful=!0;var d=this,e,f,h,k=1<b.length,l=0,m=
+g(a,c),n=[],p={},r=!0,t=0;return this.$watch(m,function(){r?(r=!1,b(e,e,d)):b(e,h,d);if(k)if(C(e))if(qa(e)){h=Array(e.length);for(var a=0;a<e.length;a++)h[a]=e[a]}else for(a in h={},e)ua.call(e,a)&&(h[a]=e[a]);else h=e})},$digest:function(){var a,g,k,l,m,p,r,t=b,q,u=[],w,x;n("$digest");h.$$checkUrlChange();this===M&&null!==e&&(h.defer.cancel(e),v());c=null;do{r=!1;q=this;for(p=0;p<s.length;p++){try{x=s[p],l=x.fn,l(x.scope,x.locals)}catch(z){f(z)}c=null}s.length=0;a:do{if(p=q.$$watchers)for(p.$$digestWatchIndex=
+p.length;p.$$digestWatchIndex--;)try{if(a=p[p.$$digestWatchIndex])if(m=a.get,(g=m(q))!==(k=a.last)&&!(a.eq?sa(g,k):da(g)&&da(k)))r=!0,c=a,a.last=a.eq?ra(g,null):g,l=a.fn,l(g,k===J?g:k,q),5>t&&(w=4-t,u[w]||(u[w]=[]),u[w].push({msg:D(a.exp)?"fn: "+(a.exp.name||a.exp.toString()):a.exp,newVal:g,oldVal:k}));else if(a===c){r=!1;break a}}catch(B){f(B)}if(!(p=q.$$watchersCount&&q.$$childHead||q!==this&&q.$$nextSibling))for(;q!==this&&!(p=q.$$nextSibling);)q=q.$parent}while(q=p);if((r||s.length)&&!t--)throw M.$$phase=
+null,d("infdig",b,u);}while(r||s.length);for(M.$$phase=null;I<A.length;)try{A[I++]()}catch(F){f(F)}A.length=I=0;h.$$checkUrlChange()},$destroy:function(){if(!this.$$destroyed){var a=this.$parent;this.$broadcast("$destroy");this.$$destroyed=!0;this===M&&h.$$applicationDestroyed();p(this,-this.$$watchersCount);for(var b in this.$$listenerCount)r(this,this.$$listenerCount[b],b);a&&a.$$childHead===this&&(a.$$childHead=this.$$nextSibling);a&&a.$$childTail===this&&(a.$$childTail=this.$$prevSibling);this.$$prevSibling&&
+(this.$$prevSibling.$$nextSibling=this.$$nextSibling);this.$$nextSibling&&(this.$$nextSibling.$$prevSibling=this.$$prevSibling);this.$destroy=this.$digest=this.$apply=this.$evalAsync=this.$applyAsync=z;this.$on=this.$watch=this.$watchGroup=function(){return z};this.$$listeners={};this.$$nextSibling=null;l(this)}},$eval:function(a,b){return g(a)(this,b)},$evalAsync:function(a,b){M.$$phase||s.length||h.defer(function(){s.length&&M.$digest()});s.push({scope:this,fn:g(a),locals:b})},$$postDigest:function(a){A.push(a)},
+$apply:function(a){try{n("$apply");try{return this.$eval(a)}finally{M.$$phase=null}}catch(b){f(b)}finally{try{M.$digest()}catch(c){throw f(c),c;}}},$applyAsync:function(a){function b(){c.$eval(a)}var c=this;a&&u.push(b);a=g(a);t()},$on:function(a,b){var c=this.$$listeners[a];c||(this.$$listeners[a]=c=[]);c.push(b);var d=this;do d.$$listenerCount[a]||(d.$$listenerCount[a]=0),d.$$listenerCount[a]++;while(d=d.$parent);var e=this;return function(){var d=c.indexOf(b);-1!==d&&(c[d]=null,r(e,1,a))}},$emit:function(a,
+b){var c=[],d,e=this,g=!1,h={name:a,targetScope:e,stopPropagation:function(){g=!0},preventDefault:function(){h.defaultPrevented=!0},defaultPrevented:!1},k=ab([h],arguments,1),l,m;do{d=e.$$listeners[a]||c;h.currentScope=e;l=0;for(m=d.length;l<m;l++)if(d[l])try{d[l].apply(null,k)}catch(n){f(n)}else d.splice(l,1),l--,m--;if(g)return h.currentScope=null,h;e=e.$parent}while(e);h.currentScope=null;return h},$broadcast:function(a,b){var c=this,d=this,e={name:a,targetScope:this,preventDefault:function(){e.defaultPrevented=
+!0},defaultPrevented:!1};if(!this.$$listenerCount[a])return e;for(var g=ab([e],arguments,1),h,k;c=d;){e.currentScope=c;d=c.$$listeners[a]||[];h=0;for(k=d.length;h<k;h++)if(d[h])try{d[h].apply(null,g)}catch(l){f(l)}else d.splice(h,1),h--,k--;if(!(d=c.$$listenerCount[a]&&c.$$childHead||c!==this&&c.$$nextSibling))for(;c!==this&&!(d=c.$$nextSibling);)c=c.$parent}e.currentScope=null;return e}};var M=new m,s=M.$$asyncQueue=[],A=M.$$postDigestQueue=[],u=M.$$applyAsyncQueue=[],I=0;return M}]}function Ee(){var a=
+/^\s*(https?|ftp|mailto|tel|file):/,b=/^\s*((https?|ftp|file|blob):|data:image\/)/;this.aHrefSanitizationWhitelist=function(b){return u(b)?(a=b,this):a};this.imgSrcSanitizationWhitelist=function(a){return u(a)?(b=a,this):b};this.$get=function(){return function(d,c){var e=c?b:a,f;f=Ca(d).href;return""===f||f.match(e)?d:"unsafe:"+f}}}function Cg(a){if("self"===a)return a;if(F(a)){if(-1<a.indexOf("***"))throw ta("iwcard",a);a=Kd(a).replace(/\\\*\\\*/g,".*").replace(/\\\*/g,"[^:/.?&;]*");return new RegExp("^"+
+a+"$")}if(Xa(a))return new RegExp("^"+a.source+"$");throw ta("imatcher");}function Ld(a){var b=[];u(a)&&q(a,function(a){b.push(Cg(a))});return b}function Qf(){this.SCE_CONTEXTS=oa;var a=["self"],b=[];this.resourceUrlWhitelist=function(b){arguments.length&&(a=Ld(b));return a};this.resourceUrlBlacklist=function(a){arguments.length&&(b=Ld(a));return b};this.$get=["$injector",function(d){function c(a,b){return"self"===a?yd(b):!!a.exec(b.href)}function e(a){var b=function(a){this.$$unwrapTrustedValue=
+function(){return a}};a&&(b.prototype=new a);b.prototype.valueOf=function(){return this.$$unwrapTrustedValue()};b.prototype.toString=function(){return this.$$unwrapTrustedValue().toString()};return b}var f=function(a){throw ta("unsafe");};d.has("$sanitize")&&(f=d.get("$sanitize"));var g=e(),h={};h[oa.HTML]=e(g);h[oa.CSS]=e(g);h[oa.URL]=e(g);h[oa.JS]=e(g);h[oa.RESOURCE_URL]=e(h[oa.URL]);return{trustAs:function(a,b){var c=h.hasOwnProperty(a)?h[a]:null;if(!c)throw ta("icontext",a,b);if(null===b||w(b)||
+""===b)return b;if("string"!==typeof b)throw ta("itype",a);return new c(b)},getTrusted:function(d,e){if(null===e||w(e)||""===e)return e;var g=h.hasOwnProperty(d)?h[d]:null;if(g&&e instanceof g)return e.$$unwrapTrustedValue();if(d===oa.RESOURCE_URL){var g=Ca(e.toString()),n,p,r=!1;n=0;for(p=a.length;n<p;n++)if(c(a[n],g)){r=!0;break}if(r)for(n=0,p=b.length;n<p;n++)if(c(b[n],g)){r=!1;break}if(r)return e;throw ta("insecurl",e.toString());}if(d===oa.HTML)return f(e);throw ta("unsafe");},valueOf:function(a){return a instanceof
+g?a.$$unwrapTrustedValue():a}}}]}function Pf(){var a=!0;this.enabled=function(b){arguments.length&&(a=!!b);return a};this.$get=["$parse","$sceDelegate",function(b,d){if(a&&8>za)throw ta("iequirks");var c=pa(oa);c.isEnabled=function(){return a};c.trustAs=d.trustAs;c.getTrusted=d.getTrusted;c.valueOf=d.valueOf;a||(c.trustAs=c.getTrusted=function(a,b){return b},c.valueOf=Ya);c.parseAs=function(a,d){var e=b(d);return e.literal&&e.constant?e:b(d,function(b){return c.getTrusted(a,b)})};var e=c.parseAs,
+f=c.getTrusted,g=c.trustAs;q(oa,function(a,b){var d=Q(b);c[("parse_as_"+d).replace(xc,gb)]=function(b){return e(a,b)};c[("get_trusted_"+d).replace(xc,gb)]=function(b){return f(a,b)};c[("trust_as_"+d).replace(xc,gb)]=function(b){return g(a,b)}});return c}]}function Rf(){this.$get=["$window","$document",function(a,b){var d={},c=!((!a.nw||!a.nw.process)&&a.chrome&&(a.chrome.app&&a.chrome.app.runtime||!a.chrome.app&&a.chrome.runtime&&a.chrome.runtime.id))&&a.history&&a.history.pushState,e=Z((/android (\d+)/.exec(Q((a.navigator||
+{}).userAgent))||[])[1]),f=/Boxee/i.test((a.navigator||{}).userAgent),g=b[0]||{},h=g.body&&g.body.style,k=!1,l=!1;h&&(k=!!("transition"in h||"webkitTransition"in h),l=!!("animation"in h||"webkitAnimation"in h));return{history:!(!c||4>e||f),hasEvent:function(a){if("input"===a&&za)return!1;if(w(d[a])){var b=g.createElement("div");d[a]="on"+a in b}return d[a]},csp:Ga(),transitions:k,animations:l,android:e}}]}function Tf(){var a;this.httpOptions=function(b){return b?(a=b,this):a};this.$get=["$exceptionHandler",
+"$templateCache","$http","$q","$sce",function(b,d,c,e,f){function g(h,k){g.totalPendingRequests++;if(!F(h)||w(d.get(h)))h=f.getTrustedResourceUrl(h);var l=c.defaults&&c.defaults.transformResponse;H(l)?l=l.filter(function(a){return a!==nc}):l===nc&&(l=null);return c.get(h,S({cache:d,transformResponse:l},a)).finally(function(){g.totalPendingRequests--}).then(function(a){d.put(h,a.data);return a.data},function(a){k||(a=Dg("tpload",h,a.status,a.statusText),b(a));return e.reject(a)})}g.totalPendingRequests=
+0;return g}]}function Uf(){this.$get=["$rootScope","$browser","$location",function(a,b,d){return{findBindings:function(a,b,d){a=a.getElementsByClassName("ng-binding");var g=[];q(a,function(a){var c=ea.element(a).data("$binding");c&&q(c,function(c){d?(new RegExp("(^|\\s)"+Kd(b)+"(\\s|\\||$)")).test(c)&&g.push(a):-1!==c.indexOf(b)&&g.push(a)})});return g},findModels:function(a,b,d){for(var g=["ng-","data-ng-","ng\\:"],h=0;h<g.length;++h){var k=a.querySelectorAll("["+g[h]+"model"+(d?"=":"*=")+'"'+b+
+'"]');if(k.length)return k}},getLocation:function(){return d.url()},setLocation:function(b){b!==d.url()&&(d.url(b),a.$digest())},whenStable:function(a){b.notifyWhenNoOutstandingRequests(a)}}}]}function Vf(){this.$get=["$rootScope","$browser","$q","$$q","$exceptionHandler",function(a,b,d,c,e){function f(f,k,l){D(f)||(l=k,k=f,f=z);var m=va.call(arguments,3),n=u(l)&&!l,p=(n?c:d).defer(),r=p.promise,q;q=b.defer(function(){try{p.resolve(f.apply(null,m))}catch(b){p.reject(b),e(b)}finally{delete g[r.$$timeoutId]}n||
+a.$apply()},k);r.$$timeoutId=q;g[q]=p;return r}var g={};f.cancel=function(a){return a&&a.$$timeoutId in g?(g[a.$$timeoutId].promise.catch(z),g[a.$$timeoutId].reject("canceled"),delete g[a.$$timeoutId],b.defer.cancel(a.$$timeoutId)):!1};return f}]}function Ca(a){za&&(aa.setAttribute("href",a),a=aa.href);aa.setAttribute("href",a);return{href:aa.href,protocol:aa.protocol?aa.protocol.replace(/:$/,""):"",host:aa.host,search:aa.search?aa.search.replace(/^\?/,""):"",hash:aa.hash?aa.hash.replace(/^#/,""):
+"",hostname:aa.hostname,port:aa.port,pathname:"/"===aa.pathname.charAt(0)?aa.pathname:"/"+aa.pathname}}function yd(a){a=F(a)?Ca(a):a;return a.protocol===Md.protocol&&a.host===Md.host}function Wf(){this.$get=la(x)}function Nd(a){function b(a){try{return decodeURIComponent(a)}catch(b){return a}}var d=a[0]||{},c={},e="";return function(){var a,g,h,k,l;try{a=d.cookie||""}catch(m){a=""}if(a!==e)for(e=a,a=e.split("; "),c={},h=0;h<a.length;h++)g=a[h],k=g.indexOf("="),0<k&&(l=b(g.substring(0,k)),w(c[l])&&
+(c[l]=b(g.substring(k+1))));return c}}function $f(){this.$get=Nd}function cd(a){function b(d,c){if(C(d)){var e={};q(d,function(a,c){e[c]=b(c,a)});return e}return a.factory(d+"Filter",c)}this.register=b;this.$get=["$injector",function(a){return function(b){return a.get(b+"Filter")}}];b("currency",Od);b("date",Pd);b("filter",Eg);b("json",Fg);b("limitTo",Gg);b("lowercase",Hg);b("number",Qd);b("orderBy",Rd);b("uppercase",Ig)}function Eg(){return function(a,b,d,c){if(!qa(a)){if(null==a)return a;throw L("filter")("notarray",
+a);}c=c||"$";var e;switch(yc(b)){case "function":break;case "boolean":case "null":case "number":case "string":e=!0;case "object":b=Jg(b,d,c,e);break;default:return a}return Array.prototype.filter.call(a,b)}}function Jg(a,b,d,c){var e=C(a)&&d in a;!0===b?b=sa:D(b)||(b=function(a,b){if(w(a))return!1;if(null===a||null===b)return a===b;if(C(b)||C(a)&&!Wb(a))return!1;a=Q(""+a);b=Q(""+b);return-1!==a.indexOf(b)});return function(f){return e&&!C(f)?Ea(f,a[d],b,d,!1):Ea(f,a,b,d,c)}}function Ea(a,b,d,c,e,
+f){var g=yc(a),h=yc(b);if("string"===h&&"!"===b.charAt(0))return!Ea(a,b.substring(1),d,c,e);if(H(a))return a.some(function(a){return Ea(a,b,d,c,e)});switch(g){case "object":var k;if(e){for(k in a)if(k.charAt&&"$"!==k.charAt(0)&&Ea(a[k],b,d,c,!0))return!0;return f?!1:Ea(a,b,d,c,!1)}if("object"===h){for(k in b)if(f=b[k],!D(f)&&!w(f)&&(g=k===c,!Ea(g?a:a[k],f,d,c,g,g)))return!1;return!0}return d(a,b);case "function":return!1;default:return d(a,b)}}function yc(a){return null===a?"null":typeof a}function Od(a){var b=
+a.NUMBER_FORMATS;return function(a,c,e){w(c)&&(c=b.CURRENCY_SYM);w(e)&&(e=b.PATTERNS[1].maxFrac);return null==a?a:Sd(a,b.PATTERNS[1],b.GROUP_SEP,b.DECIMAL_SEP,e).replace(/\u00A4/g,c)}}function Qd(a){var b=a.NUMBER_FORMATS;return function(a,c){return null==a?a:Sd(a,b.PATTERNS[0],b.GROUP_SEP,b.DECIMAL_SEP,c)}}function Kg(a){var b=0,d,c,e,f,g;-1<(c=a.indexOf(Td))&&(a=a.replace(Td,""));0<(e=a.search(/e/i))?(0>c&&(c=e),c+=+a.slice(e+1),a=a.substring(0,e)):0>c&&(c=a.length);for(e=0;a.charAt(e)===zc;e++);
+if(e===(g=a.length))d=[0],c=1;else{for(g--;a.charAt(g)===zc;)g--;c-=e;d=[];for(f=0;e<=g;e++,f++)d[f]=+a.charAt(e)}c>Ud&&(d=d.splice(0,Ud-1),b=c-1,c=1);return{d:d,e:b,i:c}}function Lg(a,b,d,c){var e=a.d,f=e.length-a.i;b=w(b)?Math.min(Math.max(d,f),c):+b;d=b+a.i;c=e[d];if(0<d){e.splice(Math.max(a.i,d));for(var g=d;g<e.length;g++)e[g]=0}else for(f=Math.max(0,f),a.i=1,e.length=Math.max(1,d=b+1),e[0]=0,g=1;g<d;g++)e[g]=0;if(5<=c)if(0>d-1){for(c=0;c>d;c--)e.unshift(0),a.i++;e.unshift(1);a.i++}else e[d-
+1]++;for(;f<Math.max(0,b);f++)e.push(0);if(b=e.reduceRight(function(a,b,c,d){b+=a;d[c]=b%10;return Math.floor(b/10)},0))e.unshift(b),a.i++}function Sd(a,b,d,c,e){if(!F(a)&&!ba(a)||isNaN(a))return"";var f=!isFinite(a),g=!1,h=Math.abs(a)+"",k="";if(f)k="\u221e";else{g=Kg(h);Lg(g,e,b.minFrac,b.maxFrac);k=g.d;h=g.i;e=g.e;f=[];for(g=k.reduce(function(a,b){return a&&!b},!0);0>h;)k.unshift(0),h++;0<h?f=k.splice(h,k.length):(f=k,k=[0]);h=[];for(k.length>=b.lgSize&&h.unshift(k.splice(-b.lgSize,k.length).join(""));k.length>
+b.gSize;)h.unshift(k.splice(-b.gSize,k.length).join(""));k.length&&h.unshift(k.join(""));k=h.join(d);f.length&&(k+=c+f.join(""));e&&(k+="e+"+e)}return 0>a&&!g?b.negPre+k+b.negSuf:b.posPre+k+b.posSuf}function Kb(a,b,d,c){var e="";if(0>a||c&&0>=a)c?a=-a+1:(a=-a,e="-");for(a=""+a;a.length<b;)a=zc+a;d&&(a=a.substr(a.length-b));return e+a}function Y(a,b,d,c,e){d=d||0;return function(f){f=f["get"+a]();if(0<d||f>-d)f+=d;0===f&&-12===d&&(f=12);return Kb(f,b,c,e)}}function mb(a,b,d){return function(c,e){var f=
+c["get"+a](),g=ub((d?"STANDALONE":"")+(b?"SHORT":"")+a);return e[g][f]}}function Vd(a){var b=(new Date(a,0,1)).getDay();return new Date(a,0,(4>=b?5:12)-b)}function Wd(a){return function(b){var d=Vd(b.getFullYear());b=+new Date(b.getFullYear(),b.getMonth(),b.getDate()+(4-b.getDay()))-+d;b=1+Math.round(b/6048E5);return Kb(b,a)}}function Ac(a,b){return 0>=a.getFullYear()?b.ERAS[0]:b.ERAS[1]}function Pd(a){function b(a){var b;if(b=a.match(d)){a=new Date(0);var f=0,g=0,h=b[8]?a.setUTCFullYear:a.setFullYear,
+k=b[8]?a.setUTCHours:a.setHours;b[9]&&(f=Z(b[9]+b[10]),g=Z(b[9]+b[11]));h.call(a,Z(b[1]),Z(b[2])-1,Z(b[3]));f=Z(b[4]||0)-f;g=Z(b[5]||0)-g;h=Z(b[6]||0);b=Math.round(1E3*parseFloat("0."+(b[7]||0)));k.call(a,f,g,h,b)}return a}var d=/^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;return function(c,d,f){var g="",h=[],k,l;d=d||"mediumDate";d=a.DATETIME_FORMATS[d]||d;F(c)&&(c=Mg.test(c)?Z(c):b(c));ba(c)&&(c=new Date(c));if(!ga(c)||!isFinite(c.getTime()))return c;
+for(;d;)(l=Ng.exec(d))?(h=ab(h,l,1),d=h.pop()):(h.push(d),d=null);var m=c.getTimezoneOffset();f&&(m=Pc(f,m),c=Yb(c,f,!0));q(h,function(b){k=Og[b];g+=k?k(c,a.DATETIME_FORMATS,m):"''"===b?"'":b.replace(/(^'|'$)/g,"").replace(/''/g,"'")});return g}}function Fg(){return function(a,b){w(b)&&(b=2);return cb(a,b)}}function Gg(){return function(a,b,d){b=Infinity===Math.abs(Number(b))?Number(b):Z(b);if(da(b))return a;ba(a)&&(a=a.toString());if(!qa(a))return a;d=!d||isNaN(d)?0:Z(d);d=0>d?Math.max(0,a.length+
+d):d;return 0<=b?Bc(a,d,d+b):0===d?Bc(a,b,a.length):Bc(a,Math.max(0,d+b),d)}}function Bc(a,b,d){return F(a)?a.slice(b,d):va.call(a,b,d)}function Rd(a){function b(b){return b.map(function(b){var c=1,d=Ya;if(D(b))d=b;else if(F(b)){if("+"===b.charAt(0)||"-"===b.charAt(0))c="-"===b.charAt(0)?-1:1,b=b.substring(1);if(""!==b&&(d=a(b),d.constant))var e=d(),d=function(a){return a[e]}}return{get:d,descending:c}})}function d(a){switch(typeof a){case "number":case "boolean":case "string":return!0;default:return!1}}
+function c(a,b){var c=0,d=a.type,k=b.type;if(d===k){var k=a.value,l=b.value;"string"===d?(k=k.toLowerCase(),l=l.toLowerCase()):"object"===d&&(C(k)&&(k=a.index),C(l)&&(l=b.index));k!==l&&(c=k<l?-1:1)}else c=d<k?-1:1;return c}return function(a,f,g,h){if(null==a)return a;if(!qa(a))throw L("orderBy")("notarray",a);H(f)||(f=[f]);0===f.length&&(f=["+"]);var k=b(f),l=g?-1:1,m=D(h)?h:c;a=Array.prototype.map.call(a,function(a,b){return{value:a,tieBreaker:{value:b,type:"number",index:b},predicateValues:k.map(function(c){var e=
+c.get(a);c=typeof e;if(null===e)c="string",e="null";else if("object"===c)a:{if(D(e.valueOf)&&(e=e.valueOf(),d(e)))break a;Wb(e)&&(e=e.toString(),d(e))}return{value:e,type:c,index:b}})}});a.sort(function(a,b){for(var c=0,d=k.length;c<d;c++){var e=m(a.predicateValues[c],b.predicateValues[c]);if(e)return e*k[c].descending*l}return m(a.tieBreaker,b.tieBreaker)*l});return a=a.map(function(a){return a.value})}}function Qa(a){D(a)&&(a={link:a});a.restrict=a.restrict||"AC";return la(a)}function Lb(a,b,d,
+c,e){this.$$controls=[];this.$error={};this.$$success={};this.$pending=void 0;this.$name=e(b.name||b.ngForm||"")(d);this.$dirty=!1;this.$valid=this.$pristine=!0;this.$submitted=this.$invalid=!1;this.$$parentForm=Mb;this.$$element=a;this.$$animate=c;Xd(this)}function Xd(a){a.$$classCache={};a.$$classCache[Yd]=!(a.$$classCache[nb]=a.$$element.hasClass(nb))}function Zd(a){function b(a,b,c){c&&!a.$$classCache[b]?(a.$$animate.addClass(a.$$element,b),a.$$classCache[b]=!0):!c&&a.$$classCache[b]&&(a.$$animate.removeClass(a.$$element,
+b),a.$$classCache[b]=!1)}function d(a,c,d){c=c?"-"+Tc(c,"-"):"";b(a,nb+c,!0===d);b(a,Yd+c,!1===d)}var c=a.set,e=a.unset;a.clazz.prototype.$setValidity=function(a,g,h){w(g)?(this.$pending||(this.$pending={}),c(this.$pending,a,h)):(this.$pending&&e(this.$pending,a,h),$d(this.$pending)&&(this.$pending=void 0));Ha(g)?g?(e(this.$error,a,h),c(this.$$success,a,h)):(c(this.$error,a,h),e(this.$$success,a,h)):(e(this.$error,a,h),e(this.$$success,a,h));this.$pending?(b(this,"ng-pending",!0),this.$valid=this.$invalid=
+void 0,d(this,"",null)):(b(this,"ng-pending",!1),this.$valid=$d(this.$error),this.$invalid=!this.$valid,d(this,"",this.$valid));g=this.$pending&&this.$pending[a]?void 0:this.$error[a]?!1:this.$$success[a]?!0:null;d(this,a,g);this.$$parentForm.$setValidity(a,g,this)}}function $d(a){if(a)for(var b in a)if(a.hasOwnProperty(b))return!1;return!0}function Cc(a){a.$formatters.push(function(b){return a.$isEmpty(b)?b:b.toString()})}function Ra(a,b,d,c,e,f){var g=Q(b[0].type);if(!e.android){var h=!1;b.on("compositionstart",
+function(){h=!0});b.on("compositionend",function(){h=!1;l()})}var k,l=function(a){k&&(f.defer.cancel(k),k=null);if(!h){var e=b.val();a=a&&a.type;"password"===g||d.ngTrim&&"false"===d.ngTrim||(e=T(e));(c.$viewValue!==e||""===e&&c.$$hasNativeValidators)&&c.$setViewValue(e,a)}};if(e.hasEvent("input"))b.on("input",l);else{var m=function(a,b,c){k||(k=f.defer(function(){k=null;b&&b.value===c||l(a)}))};b.on("keydown",function(a){var b=a.keyCode;91===b||15<b&&19>b||37<=b&&40>=b||m(a,this,this.value)});if(e.hasEvent("paste"))b.on("paste cut",
+m)}b.on("change",l);if(ae[g]&&c.$$hasNativeValidators&&g===d.type)b.on("keydown wheel mousedown",function(a){if(!k){var b=this.validity,c=b.badInput,d=b.typeMismatch;k=f.defer(function(){k=null;b.badInput===c&&b.typeMismatch===d||l(a)})}});c.$render=function(){var a=c.$isEmpty(c.$viewValue)?"":c.$viewValue;b.val()!==a&&b.val(a)}}function Nb(a,b){return function(d,c){var e,f;if(ga(d))return d;if(F(d)){'"'===d.charAt(0)&&'"'===d.charAt(d.length-1)&&(d=d.substring(1,d.length-1));if(Pg.test(d))return new Date(d);
+a.lastIndex=0;if(e=a.exec(d))return e.shift(),f=c?{yyyy:c.getFullYear(),MM:c.getMonth()+1,dd:c.getDate(),HH:c.getHours(),mm:c.getMinutes(),ss:c.getSeconds(),sss:c.getMilliseconds()/1E3}:{yyyy:1970,MM:1,dd:1,HH:0,mm:0,ss:0,sss:0},q(e,function(a,c){c<b.length&&(f[b[c]]=+a)}),new Date(f.yyyy,f.MM-1,f.dd,f.HH,f.mm,f.ss||0,1E3*f.sss||0)}return NaN}}function ob(a,b,d,c){return function(e,f,g,h,k,l,m){function n(a){return a&&!(a.getTime&&a.getTime()!==a.getTime())}function p(a){return u(a)&&!ga(a)?d(a)||
+void 0:a}Dc(e,f,g,h);Ra(e,f,g,h,k,l);var r=h&&h.$options.getOption("timezone"),q;h.$$parserName=a;h.$parsers.push(function(a){if(h.$isEmpty(a))return null;if(b.test(a))return a=d(a,q),r&&(a=Yb(a,r)),a});h.$formatters.push(function(a){if(a&&!ga(a))throw pb("datefmt",a);if(n(a))return(q=a)&&r&&(q=Yb(q,r,!0)),m("date")(a,c,r);q=null;return""});if(u(g.min)||g.ngMin){var v;h.$validators.min=function(a){return!n(a)||w(v)||d(a)>=v};g.$observe("min",function(a){v=p(a);h.$validate()})}if(u(g.max)||g.ngMax){var t;
+h.$validators.max=function(a){return!n(a)||w(t)||d(a)<=t};g.$observe("max",function(a){t=p(a);h.$validate()})}}}function Dc(a,b,d,c){(c.$$hasNativeValidators=C(b[0].validity))&&c.$parsers.push(function(a){var c=b.prop("validity")||{};return c.badInput||c.typeMismatch?void 0:a})}function be(a){a.$$parserName="number";a.$parsers.push(function(b){if(a.$isEmpty(b))return null;if(Qg.test(b))return parseFloat(b)});a.$formatters.push(function(b){if(!a.$isEmpty(b)){if(!ba(b))throw pb("numfmt",b);b=b.toString()}return b})}
+function Sa(a){u(a)&&!ba(a)&&(a=parseFloat(a));return da(a)?void 0:a}function Ec(a){var b=a.toString(),d=b.indexOf(".");return-1===d?-1<a&&1>a&&(a=/e-(\d+)$/.exec(b))?Number(a[1]):0:b.length-d-1}function ce(a,b,d){a=Number(a);var c=(a|0)!==a,e=(b|0)!==b,f=(d|0)!==d;if(c||e||f){var g=c?Ec(a):0,h=e?Ec(b):0,k=f?Ec(d):0,g=Math.max(g,h,k),g=Math.pow(10,g);a*=g;b*=g;d*=g;c&&(a=Math.round(a));e&&(b=Math.round(b));f&&(d=Math.round(d))}return 0===(a-b)%d}function de(a,b,d,c,e){if(u(c)){a=a(c);if(!a.constant)throw pb("constexpr",
+d,c);return a(b)}return e}function Fc(a,b){function d(a,b){if(!a||!a.length)return[];if(!b||!b.length)return a;var c=[],d=0;a:for(;d<a.length;d++){for(var e=a[d],m=0;m<b.length;m++)if(e===b[m])continue a;c.push(e)}return c}function c(a){var b=a;H(a)?b=a.map(c).join(" "):C(a)&&(b=Object.keys(a).filter(function(b){return a[b]}).join(" "));return b}a="ngClass"+a;var e;return["$parse",function(f){return{restrict:"AC",link:function(g,h,k){function l(a,b){var c=[];q(a,function(a){if(0<b||n[a])n[a]=(n[a]||
+0)+b,n[a]===+(0<b)&&c.push(a)});return c.join(" ")}function m(a){if(a===b){var c=r,c=l(c&&c.split(" "),1);k.$addClass(c)}else c=r,c=l(c&&c.split(" "),-1),k.$removeClass(c);p=a}var n=h.data("$classCounts"),p=!0,r;n||(n=V(),h.data("$classCounts",n));"ngClass"!==a&&(e||(e=f("$index",function(a){return a&1})),g.$watch(e,m));g.$watch(f(k[a],c),function(a){F(a)||(a=c(a));if(p===b){var e=a,f=r&&r.split(" "),g=e&&e.split(" "),e=d(f,g),f=d(g,f),e=l(e,-1),f=l(f,1);k.$addClass(f);k.$removeClass(e)}r=a})}}}]}
+function Ob(a,b,d,c,e,f,g,h,k){this.$modelValue=this.$viewValue=Number.NaN;this.$$rawModelValue=void 0;this.$validators={};this.$asyncValidators={};this.$parsers=[];this.$formatters=[];this.$viewChangeListeners=[];this.$untouched=!0;this.$touched=!1;this.$pristine=!0;this.$dirty=!1;this.$valid=!0;this.$invalid=!1;this.$error={};this.$$success={};this.$pending=void 0;this.$name=k(d.name||"",!1)(a);this.$$parentForm=Mb;this.$options=Pb;this.$$parsedNgModel=e(d.ngModel);this.$$parsedNgModelAssign=this.$$parsedNgModel.assign;
+this.$$ngModelGet=this.$$parsedNgModel;this.$$ngModelSet=this.$$parsedNgModelAssign;this.$$pendingDebounce=null;this.$$parserValid=void 0;this.$$currentValidationRunId=0;Object.defineProperty(this,"$$scope",{value:a});this.$$attr=d;this.$$element=c;this.$$animate=f;this.$$timeout=g;this.$$parse=e;this.$$q=h;this.$$exceptionHandler=b;Xd(this);Rg(this)}function Rg(a){a.$$scope.$watch(function(b){b=a.$$ngModelGet(b);if(b!==a.$modelValue&&(a.$modelValue===a.$modelValue||b===b)){a.$modelValue=a.$$rawModelValue=
+b;a.$$parserValid=void 0;for(var d=a.$formatters,c=d.length,e=b;c--;)e=d[c](e);a.$viewValue!==e&&(a.$$updateEmptyClasses(e),a.$viewValue=a.$$lastCommittedViewValue=e,a.$render(),a.$$runValidators(a.$modelValue,a.$viewValue,z))}return b})}function Gc(a){this.$$options=a}function ee(a,b){q(b,function(b,c){u(a[c])||(a[c]=b)})}function Ta(a,b){a.prop("selected",b);a.attr("selected",b)}var Sg=/^\/(.+)\/([a-z]*)$/,ua=Object.prototype.hasOwnProperty,Ic={objectMaxDepth:5},Q=function(a){return F(a)?a.toLowerCase():
+a},ub=function(a){return F(a)?a.toUpperCase():a},za,B,na,va=[].slice,sg=[].splice,Tg=[].push,ma=Object.prototype.toString,Mc=Object.getPrototypeOf,Fa=L("ng"),ea=x.angular||(x.angular={}),ac,qb=0;za=x.document.documentMode;var da=Number.isNaN||function(a){return a!==a};z.$inject=[];Ya.$inject=[];var H=Array.isArray,qe=/^\[object (?:Uint8|Uint8Clamped|Uint16|Uint32|Int8|Int16|Int32|Float32|Float64)Array]$/,T=function(a){return F(a)?a.trim():a},Kd=function(a){return a.replace(/([-()[\]{}+?*.$^|,:#<!\\])/g,
+"\\$1").replace(/\x08/g,"\\x08")},Ga=function(){if(!u(Ga.rules)){var a=x.document.querySelector("[ng-csp]")||x.document.querySelector("[data-ng-csp]");if(a){var b=a.getAttribute("ng-csp")||a.getAttribute("data-ng-csp");Ga.rules={noUnsafeEval:!b||-1!==b.indexOf("no-unsafe-eval"),noInlineStyle:!b||-1!==b.indexOf("no-inline-style")}}else{a=Ga;try{new Function(""),b=!1}catch(d){b=!0}a.rules={noUnsafeEval:b,noInlineStyle:!1}}}return Ga.rules},rb=function(){if(u(rb.name_))return rb.name_;var a,b,d=Ja.length,
+c,e;for(b=0;b<d;++b)if(c=Ja[b],a=x.document.querySelector("["+c.replace(":","\\:")+"jq]")){e=a.getAttribute(c+"jq");break}return rb.name_=e},se=/:/g,Ja=["ng-","data-ng-","ng:","x-ng-"],ve=function(a){var b=a.currentScript;if(!b)return!0;if(!(b instanceof x.HTMLScriptElement||b instanceof x.SVGScriptElement))return!1;b=b.attributes;return[b.getNamedItem("src"),b.getNamedItem("href"),b.getNamedItem("xlink:href")].every(function(b){if(!b)return!0;if(!b.value)return!1;var c=a.createElement("a");c.href=
+b.value;if(a.location.origin===c.origin)return!0;switch(c.protocol){case "http:":case "https:":case "ftp:":case "blob:":case "file:":case "data:":return!0;default:return!1}})}(x.document),ye=/[A-Z]/g,Uc=!1,Ia=3,De={full:"1.6.4",major:1,minor:6,dot:4,codeName:"phenomenal-footnote"};W.expando="ng339";var hb=W.cache={},eg=1;W._data=function(a){return this.cache[a[this.expando]]||{}};var ag=/-([a-z])/g,Ug=/^-ms-/,zb={mouseleave:"mouseout",mouseenter:"mouseover"},dc=L("jqLite"),dg=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,
+cc=/<|&#?\w+;/,bg=/<([\w:-]+)/,cg=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,ha={option:[1,'<select multiple="multiple">',"</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ha.optgroup=ha.option;ha.tbody=ha.tfoot=ha.colgroup=ha.caption=ha.thead;ha.th=ha.td;var jg=x.Node.prototype.contains||function(a){return!!(this.compareDocumentPosition(a)&
+16)},Na=W.prototype={ready:ed,toString:function(){var a=[];q(this,function(b){a.push(""+b)});return"["+a.join(", ")+"]"},eq:function(a){return 0<=a?B(this[a]):B(this[this.length+a])},length:0,push:Tg,sort:[].sort,splice:[].splice},Fb={};q("multiple selected checked disabled readOnly required open".split(" "),function(a){Fb[Q(a)]=a});var jd={};q("input select option textarea button form details".split(" "),function(a){jd[a]=!0});var rd={ngMinlength:"minlength",ngMaxlength:"maxlength",ngMin:"min",ngMax:"max",
+ngPattern:"pattern",ngStep:"step"};q({data:hc,removeData:gc,hasData:function(a){for(var b in hb[a.ng339])return!0;return!1},cleanData:function(a){for(var b=0,d=a.length;b<d;b++)gc(a[b])}},function(a,b){W[b]=a});q({data:hc,inheritedData:Db,scope:function(a){return B.data(a,"$scope")||Db(a.parentNode||a,["$isolateScope","$scope"])},isolateScope:function(a){return B.data(a,"$isolateScope")||B.data(a,"$isolateScopeNoTemplate")},controller:gd,injector:function(a){return Db(a,"$injector")},removeAttr:function(a,
+b){a.removeAttribute(b)},hasClass:Ab,css:function(a,b,d){b=wb(b.replace(Ug,"ms-"));if(u(d))a.style[b]=d;else return a.style[b]},attr:function(a,b,d){var c=a.nodeType;if(c!==Ia&&2!==c&&8!==c&&a.getAttribute){var c=Q(b),e=Fb[c];if(u(d))null===d||!1===d&&e?a.removeAttribute(b):a.setAttribute(b,e?c:d);else return a=a.getAttribute(b),e&&null!==a&&(a=c),null===a?void 0:a}},prop:function(a,b,d){if(u(d))a[b]=d;else return a[b]},text:function(){function a(a,d){if(w(d)){var c=a.nodeType;return 1===c||c===Ia?
+a.textContent:""}a.textContent=d}a.$dv="";return a}(),val:function(a,b){if(w(b)){if(a.multiple&&"select"===wa(a)){var d=[];q(a.options,function(a){a.selected&&d.push(a.value||a.text)});return d}return a.value}a.value=b},html:function(a,b){if(w(b))return a.innerHTML;xb(a,!0);a.innerHTML=b},empty:hd},function(a,b){W.prototype[b]=function(b,c){var e,f,g=this.length;if(a!==hd&&w(2===a.length&&a!==Ab&&a!==gd?b:c)){if(C(b)){for(e=0;e<g;e++)if(a===hc)a(this[e],b);else for(f in b)a(this[e],f,b[f]);return this}e=
+a.$dv;g=w(e)?Math.min(g,1):g;for(f=0;f<g;f++){var h=a(this[f],b,c);e=e?e+h:h}return e}for(e=0;e<g;e++)a(this[e],b,c);return this}});q({removeData:gc,on:function(a,b,d,c){if(u(c))throw dc("onargs");if(bc(a)){c=yb(a,!0);var e=c.events,f=c.handle;f||(f=c.handle=gg(a,e));c=0<=b.indexOf(" ")?b.split(" "):[b];for(var g=c.length,h=function(b,c,g){var h=e[b];h||(h=e[b]=[],h.specialHandlerWrapper=c,"$destroy"===b||g||a.addEventListener(b,f));h.push(d)};g--;)b=c[g],zb[b]?(h(zb[b],ig),h(b,void 0,!0)):h(b)}},
+off:fd,one:function(a,b,d){a=B(a);a.on(b,function e(){a.off(b,d);a.off(b,e)});a.on(b,d)},replaceWith:function(a,b){var d,c=a.parentNode;xb(a);q(new W(b),function(b){d?c.insertBefore(b,d.nextSibling):c.replaceChild(b,a);d=b})},children:function(a){var b=[];q(a.childNodes,function(a){1===a.nodeType&&b.push(a)});return b},contents:function(a){return a.contentDocument||a.childNodes||[]},append:function(a,b){var d=a.nodeType;if(1===d||11===d){b=new W(b);for(var d=0,c=b.length;d<c;d++)a.appendChild(b[d])}},
+prepend:function(a,b){if(1===a.nodeType){var d=a.firstChild;q(new W(b),function(b){a.insertBefore(b,d)})}},wrap:function(a,b){var d=B(b).eq(0).clone()[0],c=a.parentNode;c&&c.replaceChild(d,a);d.appendChild(a)},remove:Eb,detach:function(a){Eb(a,!0)},after:function(a,b){var d=a,c=a.parentNode;if(c){b=new W(b);for(var e=0,f=b.length;e<f;e++){var g=b[e];c.insertBefore(g,d.nextSibling);d=g}}},addClass:Cb,removeClass:Bb,toggleClass:function(a,b,d){b&&q(b.split(" "),function(b){var e=d;w(e)&&(e=!Ab(a,b));
+(e?Cb:Bb)(a,b)})},parent:function(a){return(a=a.parentNode)&&11!==a.nodeType?a:null},next:function(a){return a.nextElementSibling},find:function(a,b){return a.getElementsByTagName?a.getElementsByTagName(b):[]},clone:fc,triggerHandler:function(a,b,d){var c,e,f=b.type||b,g=yb(a);if(g=(g=g&&g.events)&&g[f])c={preventDefault:function(){this.defaultPrevented=!0},isDefaultPrevented:function(){return!0===this.defaultPrevented},stopImmediatePropagation:function(){this.immediatePropagationStopped=!0},isImmediatePropagationStopped:function(){return!0===
+this.immediatePropagationStopped},stopPropagation:z,type:f,target:a},b.type&&(c=S(c,b)),b=pa(g),e=d?[c].concat(d):[c],q(b,function(b){c.isImmediatePropagationStopped()||b.apply(a,e)})}},function(a,b){W.prototype[b]=function(b,c,e){for(var f,g=0,h=this.length;g<h;g++)w(f)?(f=a(this[g],b,c,e),u(f)&&(f=B(f))):ec(f,a(this[g],b,c,e));return u(f)?f:this}});W.prototype.bind=W.prototype.on;W.prototype.unbind=W.prototype.off;var Vg=Object.create(null);kd.prototype={_idx:function(a){if(a===this._lastKey)return this._lastIndex;
+this._lastKey=a;return this._lastIndex=this._keys.indexOf(a)},_transformKey:function(a){return da(a)?Vg:a},get:function(a){a=this._transformKey(a);a=this._idx(a);if(-1!==a)return this._values[a]},set:function(a,b){a=this._transformKey(a);var d=this._idx(a);-1===d&&(d=this._lastIndex=this._keys.length);this._keys[d]=a;this._values[d]=b},delete:function(a){a=this._transformKey(a);a=this._idx(a);if(-1===a)return!1;this._keys.splice(a,1);this._values.splice(a,1);this._lastKey=NaN;this._lastIndex=-1;return!0}};
+var Gb=kd,Zf=[function(){this.$get=[function(){return Gb}]}],lg=/^([^(]+?)=>/,mg=/^[^(]*\(\s*([^)]*)\)/m,Wg=/,/,Xg=/^\s*(_?)(\S+?)\1\s*$/,kg=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg,ya=L("$injector");eb.$$annotate=function(a,b,d){var c;if("function"===typeof a){if(!(c=a.$inject)){c=[];if(a.length){if(b)throw F(d)&&d||(d=a.name||ng(a)),ya("strictdi",d);b=ld(a);q(b[1].split(Wg),function(a){a.replace(Xg,function(a,b,d){c.push(d)})})}a.$inject=c}}else H(a)?(b=a.length-1,sb(a[b],"fn"),c=a.slice(0,b)):sb(a,"fn",
+!0);return c};var fe=L("$animate"),qf=function(){this.$get=z},rf=function(){var a=new Gb,b=[];this.$get=["$$AnimateRunner","$rootScope",function(d,c){function e(a,b,c){var d=!1;b&&(b=F(b)?b.split(" "):H(b)?b:[],q(b,function(b){b&&(d=!0,a[b]=c)}));return d}function f(){q(b,function(b){var c=a.get(b);if(c){var d=og(b.attr("class")),e="",f="";q(c,function(a,b){a!==!!d[b]&&(a?e+=(e.length?" ":"")+b:f+=(f.length?" ":"")+b)});q(b,function(a){e&&Cb(a,e);f&&Bb(a,f)});a.delete(b)}});b.length=0}return{enabled:z,
+on:z,off:z,pin:z,push:function(g,h,k,l){l&&l();k=k||{};k.from&&g.css(k.from);k.to&&g.css(k.to);if(k.addClass||k.removeClass)if(h=k.addClass,l=k.removeClass,k=a.get(g)||{},h=e(k,h,!0),l=e(k,l,!1),h||l)a.set(g,k),b.push(g),1===b.length&&c.$$postDigest(f);g=new d;g.complete();return g}}}]},of=["$provide",function(a){var b=this,d=null;this.$$registeredAnimations=Object.create(null);this.register=function(c,d){if(c&&"."!==c.charAt(0))throw fe("notcsel",c);var f=c+"-animation";b.$$registeredAnimations[c.substr(1)]=
+f;a.factory(f,d)};this.classNameFilter=function(a){if(1===arguments.length&&(d=a instanceof RegExp?a:null)&&/[(\s|\/)]ng-animate[(\s|\/)]/.test(d.toString()))throw d=null,fe("nongcls","ng-animate");return d};this.$get=["$$animateQueue",function(a){function b(a,c,d){if(d){var e;a:{for(e=0;e<d.length;e++){var l=d[e];if(1===l.nodeType){e=l;break a}}e=void 0}!e||e.parentNode||e.previousElementSibling||(d=null)}d?d.after(a):c.prepend(a)}return{on:a.on,off:a.off,pin:a.pin,enabled:a.enabled,cancel:function(a){a.end&&
+a.end()},enter:function(d,g,h,k){g=g&&B(g);h=h&&B(h);g=g||h.parent();b(d,g,h);return a.push(d,"enter",ia(k))},move:function(d,g,h,k){g=g&&B(g);h=h&&B(h);g=g||h.parent();b(d,g,h);return a.push(d,"move",ia(k))},leave:function(b,d){return a.push(b,"leave",ia(d),function(){b.remove()})},addClass:function(b,d,e){e=ia(e);e.addClass=ib(e.addclass,d);return a.push(b,"addClass",e)},removeClass:function(b,d,e){e=ia(e);e.removeClass=ib(e.removeClass,d);return a.push(b,"removeClass",e)},setClass:function(b,d,
+e,k){k=ia(k);k.addClass=ib(k.addClass,d);k.removeClass=ib(k.removeClass,e);return a.push(b,"setClass",k)},animate:function(b,d,e,k,l){l=ia(l);l.from=l.from?S(l.from,d):d;l.to=l.to?S(l.to,e):e;l.tempClasses=ib(l.tempClasses,k||"ng-inline-animate");return a.push(b,"animate",l)}}}]}],tf=function(){this.$get=["$$rAF",function(a){function b(b){d.push(b);1<d.length||a(function(){for(var a=0;a<d.length;a++)d[a]();d=[]})}var d=[];return function(){var a=!1;b(function(){a=!0});return function(d){a?d():b(d)}}}]},
+sf=function(){this.$get=["$q","$sniffer","$$animateAsyncRun","$$isDocumentHidden","$timeout",function(a,b,d,c,e){function f(a){this.setHost(a);var b=d();this._doneCallbacks=[];this._tick=function(a){c()?e(a,0,!1):b(a)};this._state=0}f.chain=function(a,b){function c(){if(d===a.length)b(!0);else a[d](function(a){!1===a?b(!1):(d++,c())})}var d=0;c()};f.all=function(a,b){function c(f){e=e&&f;++d===a.length&&b(e)}var d=0,e=!0;q(a,function(a){a.done(c)})};f.prototype={setHost:function(a){this.host=a||{}},
+done:function(a){2===this._state?a():this._doneCallbacks.push(a)},progress:z,getPromise:function(){if(!this.promise){var b=this;this.promise=a(function(a,c){b.done(function(b){!1===b?c():a()})})}return this.promise},then:function(a,b){return this.getPromise().then(a,b)},"catch":function(a){return this.getPromise()["catch"](a)},"finally":function(a){return this.getPromise()["finally"](a)},pause:function(){this.host.pause&&this.host.pause()},resume:function(){this.host.resume&&this.host.resume()},end:function(){this.host.end&&
+this.host.end();this._resolve(!0)},cancel:function(){this.host.cancel&&this.host.cancel();this._resolve(!1)},complete:function(a){var b=this;0===b._state&&(b._state=1,b._tick(function(){b._resolve(a)}))},_resolve:function(a){2!==this._state&&(q(this._doneCallbacks,function(b){b(a)}),this._doneCallbacks.length=0,this._state=2)}};return f}]},pf=function(){this.$get=["$$rAF","$q","$$AnimateRunner",function(a,b,d){return function(b,e){function f(){a(function(){g.addClass&&(b.addClass(g.addClass),g.addClass=
+null);g.removeClass&&(b.removeClass(g.removeClass),g.removeClass=null);g.to&&(b.css(g.to),g.to=null);h||k.complete();h=!0});return k}var g=e||{};g.$$prepared||(g=ra(g));g.cleanupStyles&&(g.from=g.to=null);g.from&&(b.css(g.from),g.from=null);var h,k=new d;return{start:f,end:f}}}]},fa=L("$compile"),lc=new function(){};Wc.$inject=["$provide","$$sanitizeUriProvider"];Ib.prototype.isFirstChange=function(){return this.previousValue===lc};var md=/^((?:x|data)[:\-_])/i,rg=/[:\-_]+(.)/g,td=L("$controller"),
+sd=/^(\S+)(\s+as\s+([\w$]+))?$/,Af=function(){this.$get=["$document",function(a){return function(b){b?!b.nodeType&&b instanceof B&&(b=b[0]):b=a[0].body;return b.offsetWidth+1}}]},ud="application/json",pc={"Content-Type":ud+";charset=utf-8"},ug=/^\[|^\{(?!\{)/,vg={"[":/]$/,"{":/}$/},tg=/^\)]\}',?\n/,oc=L("$http"),Da=ea.$interpolateMinErr=L("$interpolate");Da.throwNoconcat=function(a){throw Da("noconcat",a);};Da.interr=function(a,b){return Da("interr",a,b.toString())};var If=function(){this.$get=function(){function a(a){var b=
+function(a){b.data=a;b.called=!0};b.id=a;return b}var b=ea.callbacks,d={};return{createCallback:function(c){c="_"+(b.$$counter++).toString(36);var e="angular.callbacks."+c,f=a(c);d[e]=b[c]=f;return e},wasCalled:function(a){return d[a].called},getResponse:function(a){return d[a].data},removeCallback:function(a){delete b[d[a].id];delete d[a]}}}},Yg=/^([^?#]*)(\?([^#]*))?(#(.*))?$/,xg={http:80,https:443,ftp:21},kb=L("$location"),yg=/^\s*[\\/]{2,}/,Zg={$$absUrl:"",$$html5:!1,$$replace:!1,absUrl:Jb("$$absUrl"),
+url:function(a){if(w(a))return this.$$url;var b=Yg.exec(a);(b[1]||""===a)&&this.path(decodeURIComponent(b[1]));(b[2]||b[1]||""===a)&&this.search(b[3]||"");this.hash(b[5]||"");return this},protocol:Jb("$$protocol"),host:Jb("$$host"),port:Jb("$$port"),path:Cd("$$path",function(a){a=null!==a?a.toString():"";return"/"===a.charAt(0)?a:"/"+a}),search:function(a,b){switch(arguments.length){case 0:return this.$$search;case 1:if(F(a)||ba(a))a=a.toString(),this.$$search=Rc(a);else if(C(a))a=ra(a,{}),q(a,function(b,
+c){null==b&&delete a[c]}),this.$$search=a;else throw kb("isrcharg");break;default:w(b)||null===b?delete this.$$search[a]:this.$$search[a]=b}this.$$compose();return this},hash:Cd("$$hash",function(a){return null!==a?a.toString():""}),replace:function(){this.$$replace=!0;return this}};q([Bd,tc,sc],function(a){a.prototype=Object.create(Zg);a.prototype.state=function(b){if(!arguments.length)return this.$$state;if(a!==sc||!this.$$html5)throw kb("nostate");this.$$state=w(b)?null:b;this.$$urlUpdatedByLocation=
+!0;return this}});var Ua=L("$parse"),Bg={}.constructor.prototype.valueOf,Qb=V();q("+ - * / % === !== == != < > <= >= && || ! = |".split(" "),function(a){Qb[a]=!0});var $g={n:"\n",f:"\f",r:"\r",t:"\t",v:"\v","'":"'",'"':'"'},wc=function(a){this.options=a};wc.prototype={constructor:wc,lex:function(a){this.text=a;this.index=0;for(this.tokens=[];this.index<this.text.length;)if(a=this.text.charAt(this.index),'"'===a||"'"===a)this.readString(a);else if(this.isNumber(a)||"."===a&&this.isNumber(this.peek()))this.readNumber();
+else if(this.isIdentifierStart(this.peekMultichar()))this.readIdent();else if(this.is(a,"(){}[].,;:?"))this.tokens.push({index:this.index,text:a}),this.index++;else if(this.isWhitespace(a))this.index++;else{var b=a+this.peek(),d=b+this.peek(2),c=Qb[b],e=Qb[d];Qb[a]||c||e?(a=e?d:c?b:a,this.tokens.push({index:this.index,text:a,operator:!0}),this.index+=a.length):this.throwError("Unexpected next character ",this.index,this.index+1)}return this.tokens},is:function(a,b){return-1!==b.indexOf(a)},peek:function(a){a=
+a||1;return this.index+a<this.text.length?this.text.charAt(this.index+a):!1},isNumber:function(a){return"0"<=a&&"9">=a&&"string"===typeof a},isWhitespace:function(a){return" "===a||"\r"===a||"\t"===a||"\n"===a||"\v"===a||"\u00a0"===a},isIdentifierStart:function(a){return this.options.isIdentifierStart?this.options.isIdentifierStart(a,this.codePointAt(a)):this.isValidIdentifierStart(a)},isValidIdentifierStart:function(a){return"a"<=a&&"z">=a||"A"<=a&&"Z">=a||"_"===a||"$"===a},isIdentifierContinue:function(a){return this.options.isIdentifierContinue?
+this.options.isIdentifierContinue(a,this.codePointAt(a)):this.isValidIdentifierContinue(a)},isValidIdentifierContinue:function(a,b){return this.isValidIdentifierStart(a,b)||this.isNumber(a)},codePointAt:function(a){return 1===a.length?a.charCodeAt(0):(a.charCodeAt(0)<<10)+a.charCodeAt(1)-56613888},peekMultichar:function(){var a=this.text.charAt(this.index),b=this.peek();if(!b)return a;var d=a.charCodeAt(0),c=b.charCodeAt(0);return 55296<=d&&56319>=d&&56320<=c&&57343>=c?a+b:a},isExpOperator:function(a){return"-"===
+a||"+"===a||this.isNumber(a)},throwError:function(a,b,d){d=d||this.index;b=u(b)?"s "+b+"-"+this.index+" ["+this.text.substring(b,d)+"]":" "+d;throw Ua("lexerr",a,b,this.text);},readNumber:function(){for(var a="",b=this.index;this.index<this.text.length;){var d=Q(this.text.charAt(this.index));if("."===d||this.isNumber(d))a+=d;else{var c=this.peek();if("e"===d&&this.isExpOperator(c))a+=d;else if(this.isExpOperator(d)&&c&&this.isNumber(c)&&"e"===a.charAt(a.length-1))a+=d;else if(!this.isExpOperator(d)||
+c&&this.isNumber(c)||"e"!==a.charAt(a.length-1))break;else this.throwError("Invalid exponent")}this.index++}this.tokens.push({index:b,text:a,constant:!0,value:Number(a)})},readIdent:function(){var a=this.index;for(this.index+=this.peekMultichar().length;this.index<this.text.length;){var b=this.peekMultichar();if(!this.isIdentifierContinue(b))break;this.index+=b.length}this.tokens.push({index:a,text:this.text.slice(a,this.index),identifier:!0})},readString:function(a){var b=this.index;this.index++;
+for(var d="",c=a,e=!1;this.index<this.text.length;){var f=this.text.charAt(this.index),c=c+f;if(e)"u"===f?(e=this.text.substring(this.index+1,this.index+5),e.match(/[\da-f]{4}/i)||this.throwError("Invalid unicode escape [\\u"+e+"]"),this.index+=4,d+=String.fromCharCode(parseInt(e,16))):d+=$g[f]||f,e=!1;else if("\\"===f)e=!0;else{if(f===a){this.index++;this.tokens.push({index:b,text:c,constant:!0,value:d});return}d+=f}this.index++}this.throwError("Unterminated quote",b)}};var s=function(a,b){this.lexer=
+a;this.options=b};s.Program="Program";s.ExpressionStatement="ExpressionStatement";s.AssignmentExpression="AssignmentExpression";s.ConditionalExpression="ConditionalExpression";s.LogicalExpression="LogicalExpression";s.BinaryExpression="BinaryExpression";s.UnaryExpression="UnaryExpression";s.CallExpression="CallExpression";s.MemberExpression="MemberExpression";s.Identifier="Identifier";s.Literal="Literal";s.ArrayExpression="ArrayExpression";s.Property="Property";s.ObjectExpression="ObjectExpression";
+s.ThisExpression="ThisExpression";s.LocalsExpression="LocalsExpression";s.NGValueParameter="NGValueParameter";s.prototype={ast:function(a){this.text=a;this.tokens=this.lexer.lex(a);a=this.program();0!==this.tokens.length&&this.throwError("is an unexpected token",this.tokens[0]);return a},program:function(){for(var a=[];;)if(0<this.tokens.length&&!this.peek("}",")",";","]")&&a.push(this.expressionStatement()),!this.expect(";"))return{type:s.Program,body:a}},expressionStatement:function(){return{type:s.ExpressionStatement,
+expression:this.filterChain()}},filterChain:function(){for(var a=this.expression();this.expect("|");)a=this.filter(a);return a},expression:function(){return this.assignment()},assignment:function(){var a=this.ternary();if(this.expect("=")){if(!Fd(a))throw Ua("lval");a={type:s.AssignmentExpression,left:a,right:this.assignment(),operator:"="}}return a},ternary:function(){var a=this.logicalOR(),b,d;return this.expect("?")&&(b=this.expression(),this.consume(":"))?(d=this.expression(),{type:s.ConditionalExpression,
+test:a,alternate:b,consequent:d}):a},logicalOR:function(){for(var a=this.logicalAND();this.expect("||");)a={type:s.LogicalExpression,operator:"||",left:a,right:this.logicalAND()};return a},logicalAND:function(){for(var a=this.equality();this.expect("&&");)a={type:s.LogicalExpression,operator:"&&",left:a,right:this.equality()};return a},equality:function(){for(var a=this.relational(),b;b=this.expect("==","!=","===","!==");)a={type:s.BinaryExpression,operator:b.text,left:a,right:this.relational()};
+return a},relational:function(){for(var a=this.additive(),b;b=this.expect("<",">","<=",">=");)a={type:s.BinaryExpression,operator:b.text,left:a,right:this.additive()};return a},additive:function(){for(var a=this.multiplicative(),b;b=this.expect("+","-");)a={type:s.BinaryExpression,operator:b.text,left:a,right:this.multiplicative()};return a},multiplicative:function(){for(var a=this.unary(),b;b=this.expect("*","/","%");)a={type:s.BinaryExpression,operator:b.text,left:a,right:this.unary()};return a},
+unary:function(){var a;return(a=this.expect("+","-","!"))?{type:s.UnaryExpression,operator:a.text,prefix:!0,argument:this.unary()}:this.primary()},primary:function(){var a;this.expect("(")?(a=this.filterChain(),this.consume(")")):this.expect("[")?a=this.arrayDeclaration():this.expect("{")?a=this.object():this.selfReferential.hasOwnProperty(this.peek().text)?a=ra(this.selfReferential[this.consume().text]):this.options.literals.hasOwnProperty(this.peek().text)?a={type:s.Literal,value:this.options.literals[this.consume().text]}:
+this.peek().identifier?a=this.identifier():this.peek().constant?a=this.constant():this.throwError("not a primary expression",this.peek());for(var b;b=this.expect("(","[",".");)"("===b.text?(a={type:s.CallExpression,callee:a,arguments:this.parseArguments()},this.consume(")")):"["===b.text?(a={type:s.MemberExpression,object:a,property:this.expression(),computed:!0},this.consume("]")):"."===b.text?a={type:s.MemberExpression,object:a,property:this.identifier(),computed:!1}:this.throwError("IMPOSSIBLE");
+return a},filter:function(a){a=[a];for(var b={type:s.CallExpression,callee:this.identifier(),arguments:a,filter:!0};this.expect(":");)a.push(this.expression());return b},parseArguments:function(){var a=[];if(")"!==this.peekToken().text){do a.push(this.filterChain());while(this.expect(","))}return a},identifier:function(){var a=this.consume();a.identifier||this.throwError("is not a valid identifier",a);return{type:s.Identifier,name:a.text}},constant:function(){return{type:s.Literal,value:this.consume().value}},
+arrayDeclaration:function(){var a=[];if("]"!==this.peekToken().text){do{if(this.peek("]"))break;a.push(this.expression())}while(this.expect(","))}this.consume("]");return{type:s.ArrayExpression,elements:a}},object:function(){var a=[],b;if("}"!==this.peekToken().text){do{if(this.peek("}"))break;b={type:s.Property,kind:"init"};this.peek().constant?(b.key=this.constant(),b.computed=!1,this.consume(":"),b.value=this.expression()):this.peek().identifier?(b.key=this.identifier(),b.computed=!1,this.peek(":")?
+(this.consume(":"),b.value=this.expression()):b.value=b.key):this.peek("[")?(this.consume("["),b.key=this.expression(),this.consume("]"),b.computed=!0,this.consume(":"),b.value=this.expression()):this.throwError("invalid key",this.peek());a.push(b)}while(this.expect(","))}this.consume("}");return{type:s.ObjectExpression,properties:a}},throwError:function(a,b){throw Ua("syntax",b.text,a,b.index+1,this.text,this.text.substring(b.index));},consume:function(a){if(0===this.tokens.length)throw Ua("ueoe",
+this.text);var b=this.expect(a);b||this.throwError("is unexpected, expecting ["+a+"]",this.peek());return b},peekToken:function(){if(0===this.tokens.length)throw Ua("ueoe",this.text);return this.tokens[0]},peek:function(a,b,d,c){return this.peekAhead(0,a,b,d,c)},peekAhead:function(a,b,d,c,e){if(this.tokens.length>a){a=this.tokens[a];var f=a.text;if(f===b||f===d||f===c||f===e||!(b||d||c||e))return a}return!1},expect:function(a,b,d,c){return(a=this.peek(a,b,d,c))?(this.tokens.shift(),a):!1},selfReferential:{"this":{type:s.ThisExpression},
+$locals:{type:s.LocalsExpression}}};Hd.prototype={compile:function(a){var b=this;this.state={nextId:0,filters:{},fn:{vars:[],body:[],own:{}},assign:{vars:[],body:[],own:{}},inputs:[]};U(a,b.$filter);var d="",c;this.stage="assign";if(c=Gd(a))this.state.computing="assign",d=this.nextId(),this.recurse(c,d),this.return_(d),d="fn.assign="+this.generateFunction("assign","s,v,l");c=Ed(a.body);b.stage="inputs";q(c,function(a,c){var d="fn"+c;b.state[d]={vars:[],body:[],own:{}};b.state.computing=d;var h=b.nextId();
+b.recurse(a,h);b.return_(h);b.state.inputs.push(d);a.watchId=c});this.state.computing="fn";this.stage="main";this.recurse(a);a='"'+this.USE+" "+this.STRICT+'";\n'+this.filterPrefix()+"var fn="+this.generateFunction("fn","s,l,a,i")+d+this.watchFns()+"return fn;";a=(new Function("$filter","getStringValue","ifDefined","plus",a))(this.$filter,zg,Ag,Dd);this.state=this.stage=void 0;return a},USE:"use",STRICT:"strict",watchFns:function(){var a=[],b=this.state.inputs,d=this;q(b,function(b){a.push("var "+
+b+"="+d.generateFunction(b,"s"))});b.length&&a.push("fn.inputs=["+b.join(",")+"];");return a.join("")},generateFunction:function(a,b){return"function("+b+"){"+this.varsPrefix(a)+this.body(a)+"};"},filterPrefix:function(){var a=[],b=this;q(this.state.filters,function(d,c){a.push(d+"=$filter("+b.escape(c)+")")});return a.length?"var "+a.join(",")+";":""},varsPrefix:function(a){return this.state[a].vars.length?"var "+this.state[a].vars.join(",")+";":""},body:function(a){return this.state[a].body.join("")},
+recurse:function(a,b,d,c,e,f){var g,h,k=this,l,m,n;c=c||z;if(!f&&u(a.watchId))b=b||this.nextId(),this.if_("i",this.lazyAssign(b,this.computedMember("i",a.watchId)),this.lazyRecurse(a,b,d,c,e,!0));else switch(a.type){case s.Program:q(a.body,function(b,c){k.recurse(b.expression,void 0,void 0,function(a){h=a});c!==a.body.length-1?k.current().body.push(h,";"):k.return_(h)});break;case s.Literal:m=this.escape(a.value);this.assign(b,m);c(b||m);break;case s.UnaryExpression:this.recurse(a.argument,void 0,
+void 0,function(a){h=a});m=a.operator+"("+this.ifDefined(h,0)+")";this.assign(b,m);c(m);break;case s.BinaryExpression:this.recurse(a.left,void 0,void 0,function(a){g=a});this.recurse(a.right,void 0,void 0,function(a){h=a});m="+"===a.operator?this.plus(g,h):"-"===a.operator?this.ifDefined(g,0)+a.operator+this.ifDefined(h,0):"("+g+")"+a.operator+"("+h+")";this.assign(b,m);c(m);break;case s.LogicalExpression:b=b||this.nextId();k.recurse(a.left,b);k.if_("&&"===a.operator?b:k.not(b),k.lazyRecurse(a.right,
+b));c(b);break;case s.ConditionalExpression:b=b||this.nextId();k.recurse(a.test,b);k.if_(b,k.lazyRecurse(a.alternate,b),k.lazyRecurse(a.consequent,b));c(b);break;case s.Identifier:b=b||this.nextId();d&&(d.context="inputs"===k.stage?"s":this.assign(this.nextId(),this.getHasOwnProperty("l",a.name)+"?l:s"),d.computed=!1,d.name=a.name);k.if_("inputs"===k.stage||k.not(k.getHasOwnProperty("l",a.name)),function(){k.if_("inputs"===k.stage||"s",function(){e&&1!==e&&k.if_(k.isNull(k.nonComputedMember("s",a.name)),
+k.lazyAssign(k.nonComputedMember("s",a.name),"{}"));k.assign(b,k.nonComputedMember("s",a.name))})},b&&k.lazyAssign(b,k.nonComputedMember("l",a.name)));c(b);break;case s.MemberExpression:g=d&&(d.context=this.nextId())||this.nextId();b=b||this.nextId();k.recurse(a.object,g,void 0,function(){k.if_(k.notNull(g),function(){a.computed?(h=k.nextId(),k.recurse(a.property,h),k.getStringValue(h),e&&1!==e&&k.if_(k.not(k.computedMember(g,h)),k.lazyAssign(k.computedMember(g,h),"{}")),m=k.computedMember(g,h),k.assign(b,
+m),d&&(d.computed=!0,d.name=h)):(e&&1!==e&&k.if_(k.isNull(k.nonComputedMember(g,a.property.name)),k.lazyAssign(k.nonComputedMember(g,a.property.name),"{}")),m=k.nonComputedMember(g,a.property.name),k.assign(b,m),d&&(d.computed=!1,d.name=a.property.name))},function(){k.assign(b,"undefined")});c(b)},!!e);break;case s.CallExpression:b=b||this.nextId();a.filter?(h=k.filter(a.callee.name),l=[],q(a.arguments,function(a){var b=k.nextId();k.recurse(a,b);l.push(b)}),m=h+"("+l.join(",")+")",k.assign(b,m),c(b)):
+(h=k.nextId(),g={},l=[],k.recurse(a.callee,h,g,function(){k.if_(k.notNull(h),function(){q(a.arguments,function(b){k.recurse(b,a.constant?void 0:k.nextId(),void 0,function(a){l.push(a)})});m=g.name?k.member(g.context,g.name,g.computed)+"("+l.join(",")+")":h+"("+l.join(",")+")";k.assign(b,m)},function(){k.assign(b,"undefined")});c(b)}));break;case s.AssignmentExpression:h=this.nextId();g={};this.recurse(a.left,void 0,g,function(){k.if_(k.notNull(g.context),function(){k.recurse(a.right,h);m=k.member(g.context,
+g.name,g.computed)+a.operator+h;k.assign(b,m);c(b||m)})},1);break;case s.ArrayExpression:l=[];q(a.elements,function(b){k.recurse(b,a.constant?void 0:k.nextId(),void 0,function(a){l.push(a)})});m="["+l.join(",")+"]";this.assign(b,m);c(b||m);break;case s.ObjectExpression:l=[];n=!1;q(a.properties,function(a){a.computed&&(n=!0)});n?(b=b||this.nextId(),this.assign(b,"{}"),q(a.properties,function(a){a.computed?(g=k.nextId(),k.recurse(a.key,g)):g=a.key.type===s.Identifier?a.key.name:""+a.key.value;h=k.nextId();
+k.recurse(a.value,h);k.assign(k.member(b,g,a.computed),h)})):(q(a.properties,function(b){k.recurse(b.value,a.constant?void 0:k.nextId(),void 0,function(a){l.push(k.escape(b.key.type===s.Identifier?b.key.name:""+b.key.value)+":"+a)})}),m="{"+l.join(",")+"}",this.assign(b,m));c(b||m);break;case s.ThisExpression:this.assign(b,"s");c(b||"s");break;case s.LocalsExpression:this.assign(b,"l");c(b||"l");break;case s.NGValueParameter:this.assign(b,"v"),c(b||"v")}},getHasOwnProperty:function(a,b){var d=a+"."+
+b,c=this.current().own;c.hasOwnProperty(d)||(c[d]=this.nextId(!1,a+"&&("+this.escape(b)+" in "+a+")"));return c[d]},assign:function(a,b){if(a)return this.current().body.push(a,"=",b,";"),a},filter:function(a){this.state.filters.hasOwnProperty(a)||(this.state.filters[a]=this.nextId(!0));return this.state.filters[a]},ifDefined:function(a,b){return"ifDefined("+a+","+this.escape(b)+")"},plus:function(a,b){return"plus("+a+","+b+")"},return_:function(a){this.current().body.push("return ",a,";")},if_:function(a,
+b,d){if(!0===a)b();else{var c=this.current().body;c.push("if(",a,"){");b();c.push("}");d&&(c.push("else{"),d(),c.push("}"))}},not:function(a){return"!("+a+")"},isNull:function(a){return a+"==null"},notNull:function(a){return a+"!=null"},nonComputedMember:function(a,b){var d=/[^$_a-zA-Z0-9]/g;return/^[$_a-zA-Z][$_a-zA-Z0-9]*$/.test(b)?a+"."+b:a+'["'+b.replace(d,this.stringEscapeFn)+'"]'},computedMember:function(a,b){return a+"["+b+"]"},member:function(a,b,d){return d?this.computedMember(a,b):this.nonComputedMember(a,
+b)},getStringValue:function(a){this.assign(a,"getStringValue("+a+")")},lazyRecurse:function(a,b,d,c,e,f){var g=this;return function(){g.recurse(a,b,d,c,e,f)}},lazyAssign:function(a,b){var d=this;return function(){d.assign(a,b)}},stringEscapeRegex:/[^ a-zA-Z0-9]/g,stringEscapeFn:function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)},escape:function(a){if(F(a))return"'"+a.replace(this.stringEscapeRegex,this.stringEscapeFn)+"'";if(ba(a))return a.toString();if(!0===a)return"true";if(!1===
+a)return"false";if(null===a)return"null";if("undefined"===typeof a)return"undefined";throw Ua("esc");},nextId:function(a,b){var d="v"+this.state.nextId++;a||this.current().vars.push(d+(b?"="+b:""));return d},current:function(){return this.state[this.state.computing]}};Id.prototype={compile:function(a){var b=this;U(a,b.$filter);var d,c;if(d=Gd(a))c=this.recurse(d);d=Ed(a.body);var e;d&&(e=[],q(d,function(a,c){var d=b.recurse(a);a.input=d;e.push(d);a.watchId=c}));var f=[];q(a.body,function(a){f.push(b.recurse(a.expression))});
+a=0===a.body.length?z:1===a.body.length?f[0]:function(a,b){var c;q(f,function(d){c=d(a,b)});return c};c&&(a.assign=function(a,b,d){return c(a,d,b)});e&&(a.inputs=e);return a},recurse:function(a,b,d){var c,e,f=this,g;if(a.input)return this.inputs(a.input,a.watchId);switch(a.type){case s.Literal:return this.value(a.value,b);case s.UnaryExpression:return e=this.recurse(a.argument),this["unary"+a.operator](e,b);case s.BinaryExpression:return c=this.recurse(a.left),e=this.recurse(a.right),this["binary"+
+a.operator](c,e,b);case s.LogicalExpression:return c=this.recurse(a.left),e=this.recurse(a.right),this["binary"+a.operator](c,e,b);case s.ConditionalExpression:return this["ternary?:"](this.recurse(a.test),this.recurse(a.alternate),this.recurse(a.consequent),b);case s.Identifier:return f.identifier(a.name,b,d);case s.MemberExpression:return c=this.recurse(a.object,!1,!!d),a.computed||(e=a.property.name),a.computed&&(e=this.recurse(a.property)),a.computed?this.computedMember(c,e,b,d):this.nonComputedMember(c,
+e,b,d);case s.CallExpression:return g=[],q(a.arguments,function(a){g.push(f.recurse(a))}),a.filter&&(e=this.$filter(a.callee.name)),a.filter||(e=this.recurse(a.callee,!0)),a.filter?function(a,c,d,f){for(var n=[],p=0;p<g.length;++p)n.push(g[p](a,c,d,f));a=e.apply(void 0,n,f);return b?{context:void 0,name:void 0,value:a}:a}:function(a,c,d,f){var n=e(a,c,d,f),p;if(null!=n.value){p=[];for(var r=0;r<g.length;++r)p.push(g[r](a,c,d,f));p=n.value.apply(n.context,p)}return b?{value:p}:p};case s.AssignmentExpression:return c=
+this.recurse(a.left,!0,1),e=this.recurse(a.right),function(a,d,f,g){var n=c(a,d,f,g);a=e(a,d,f,g);n.context[n.name]=a;return b?{value:a}:a};case s.ArrayExpression:return g=[],q(a.elements,function(a){g.push(f.recurse(a))}),function(a,c,d,e){for(var f=[],p=0;p<g.length;++p)f.push(g[p](a,c,d,e));return b?{value:f}:f};case s.ObjectExpression:return g=[],q(a.properties,function(a){a.computed?g.push({key:f.recurse(a.key),computed:!0,value:f.recurse(a.value)}):g.push({key:a.key.type===s.Identifier?a.key.name:
+""+a.key.value,computed:!1,value:f.recurse(a.value)})}),function(a,c,d,e){for(var f={},p=0;p<g.length;++p)g[p].computed?f[g[p].key(a,c,d,e)]=g[p].value(a,c,d,e):f[g[p].key]=g[p].value(a,c,d,e);return b?{value:f}:f};case s.ThisExpression:return function(a){return b?{value:a}:a};case s.LocalsExpression:return function(a,c){return b?{value:c}:c};case s.NGValueParameter:return function(a,c,d){return b?{value:d}:d}}},"unary+":function(a,b){return function(d,c,e,f){d=a(d,c,e,f);d=u(d)?+d:0;return b?{value:d}:
+d}},"unary-":function(a,b){return function(d,c,e,f){d=a(d,c,e,f);d=u(d)?-d:-0;return b?{value:d}:d}},"unary!":function(a,b){return function(d,c,e,f){d=!a(d,c,e,f);return b?{value:d}:d}},"binary+":function(a,b,d){return function(c,e,f,g){var h=a(c,e,f,g);c=b(c,e,f,g);h=Dd(h,c);return d?{value:h}:h}},"binary-":function(a,b,d){return function(c,e,f,g){var h=a(c,e,f,g);c=b(c,e,f,g);h=(u(h)?h:0)-(u(c)?c:0);return d?{value:h}:h}},"binary*":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)*b(c,e,f,g);
+return d?{value:c}:c}},"binary/":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)/b(c,e,f,g);return d?{value:c}:c}},"binary%":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)%b(c,e,f,g);return d?{value:c}:c}},"binary===":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)===b(c,e,f,g);return d?{value:c}:c}},"binary!==":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)!==b(c,e,f,g);return d?{value:c}:c}},"binary==":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)==b(c,e,f,g);return d?
+{value:c}:c}},"binary!=":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)!=b(c,e,f,g);return d?{value:c}:c}},"binary<":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)<b(c,e,f,g);return d?{value:c}:c}},"binary>":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)>b(c,e,f,g);return d?{value:c}:c}},"binary<=":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)<=b(c,e,f,g);return d?{value:c}:c}},"binary>=":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)>=b(c,e,f,g);return d?{value:c}:
+c}},"binary&&":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)&&b(c,e,f,g);return d?{value:c}:c}},"binary||":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)||b(c,e,f,g);return d?{value:c}:c}},"ternary?:":function(a,b,d,c){return function(e,f,g,h){e=a(e,f,g,h)?b(e,f,g,h):d(e,f,g,h);return c?{value:e}:e}},value:function(a,b){return function(){return b?{context:void 0,name:void 0,value:a}:a}},identifier:function(a,b,d){return function(c,e,f,g){c=e&&a in e?e:c;d&&1!==d&&c&&null==c[a]&&(c[a]=
+{});e=c?c[a]:void 0;return b?{context:c,name:a,value:e}:e}},computedMember:function(a,b,d,c){return function(e,f,g,h){var k=a(e,f,g,h),l,m;null!=k&&(l=b(e,f,g,h),l+="",c&&1!==c&&k&&!k[l]&&(k[l]={}),m=k[l]);return d?{context:k,name:l,value:m}:m}},nonComputedMember:function(a,b,d,c){return function(e,f,g,h){e=a(e,f,g,h);c&&1!==c&&e&&null==e[b]&&(e[b]={});f=null!=e?e[b]:void 0;return d?{context:e,name:b,value:f}:f}},inputs:function(a,b){return function(d,c,e,f){return f?f[b]:a(d,c,e)}}};uc.prototype=
+{constructor:uc,parse:function(a){a=this.ast.ast(a);var b=this.astCompiler.compile(a);b.literal=0===a.body.length||1===a.body.length&&(a.body[0].expression.type===s.Literal||a.body[0].expression.type===s.ArrayExpression||a.body[0].expression.type===s.ObjectExpression);b.constant=a.constant;return b}};var ta=L("$sce"),oa={HTML:"html",CSS:"css",URL:"url",RESOURCE_URL:"resourceUrl",JS:"js"},xc=/_([a-z])/g,Dg=L("$compile"),aa=x.document.createElement("a"),Md=Ca(x.location.href);Nd.$inject=["$document"];
+cd.$inject=["$provide"];var Ud=22,Td=".",zc="0";Od.$inject=["$locale"];Qd.$inject=["$locale"];var Og={yyyy:Y("FullYear",4,0,!1,!0),yy:Y("FullYear",2,0,!0,!0),y:Y("FullYear",1,0,!1,!0),MMMM:mb("Month"),MMM:mb("Month",!0),MM:Y("Month",2,1),M:Y("Month",1,1),LLLL:mb("Month",!1,!0),dd:Y("Date",2),d:Y("Date",1),HH:Y("Hours",2),H:Y("Hours",1),hh:Y("Hours",2,-12),h:Y("Hours",1,-12),mm:Y("Minutes",2),m:Y("Minutes",1),ss:Y("Seconds",2),s:Y("Seconds",1),sss:Y("Milliseconds",3),EEEE:mb("Day"),EEE:mb("Day",!0),
+a:function(a,b){return 12>a.getHours()?b.AMPMS[0]:b.AMPMS[1]},Z:function(a,b,d){a=-1*d;return a=(0<=a?"+":"")+(Kb(Math[0<a?"floor":"ceil"](a/60),2)+Kb(Math.abs(a%60),2))},ww:Wd(2),w:Wd(1),G:Ac,GG:Ac,GGG:Ac,GGGG:function(a,b){return 0>=a.getFullYear()?b.ERANAMES[0]:b.ERANAMES[1]}},Ng=/((?:[^yMLdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|L+|d+|H+|h+|m+|s+|a|Z|G+|w+))([\s\S]*)/,Mg=/^-?\d+$/;Pd.$inject=["$locale"];var Hg=la(Q),Ig=la(ub);Rd.$inject=["$parse"];var Fe=la({restrict:"E",compile:function(a,
+b){if(!b.href&&!b.xlinkHref)return function(a,b){if("a"===b[0].nodeName.toLowerCase()){var e="[object SVGAnimatedString]"===ma.call(b.prop("href"))?"xlink:href":"href";b.on("click",function(a){b.attr(e)||a.preventDefault()})}}}}),vb={};q(Fb,function(a,b){function d(a,d,e){a.$watch(e[c],function(a){e.$set(b,!!a)})}if("multiple"!==a){var c=Ba("ng-"+b),e=d;"checked"===a&&(e=function(a,b,e){e.ngModel!==e[c]&&d(a,b,e)});vb[c]=function(){return{restrict:"A",priority:100,link:e}}}});q(rd,function(a,b){vb[b]=
+function(){return{priority:100,link:function(a,c,e){if("ngPattern"===b&&"/"===e.ngPattern.charAt(0)&&(c=e.ngPattern.match(Sg))){e.$set("ngPattern",new RegExp(c[1],c[2]));return}a.$watch(e[b],function(a){e.$set(b,a)})}}}});q(["src","srcset","href"],function(a){var b=Ba("ng-"+a);vb[b]=function(){return{priority:99,link:function(d,c,e){var f=a,g=a;"href"===a&&"[object SVGAnimatedString]"===ma.call(c.prop("href"))&&(g="xlinkHref",e.$attr[g]="xlink:href",f=null);e.$observe(b,function(b){b?(e.$set(g,b),
+za&&f&&c.prop(f,e[g])):"href"===a&&e.$set(g,null)})}}}});var Mb={$addControl:z,$$renameControl:function(a,b){a.$name=b},$removeControl:z,$setValidity:z,$setDirty:z,$setPristine:z,$setSubmitted:z};Lb.$inject=["$element","$attrs","$scope","$animate","$interpolate"];Lb.prototype={$rollbackViewValue:function(){q(this.$$controls,function(a){a.$rollbackViewValue()})},$commitViewValue:function(){q(this.$$controls,function(a){a.$commitViewValue()})},$addControl:function(a){Ka(a.$name,"input");this.$$controls.push(a);
+a.$name&&(this[a.$name]=a);a.$$parentForm=this},$$renameControl:function(a,b){var d=a.$name;this[d]===a&&delete this[d];this[b]=a;a.$name=b},$removeControl:function(a){a.$name&&this[a.$name]===a&&delete this[a.$name];q(this.$pending,function(b,d){this.$setValidity(d,null,a)},this);q(this.$error,function(b,d){this.$setValidity(d,null,a)},this);q(this.$$success,function(b,d){this.$setValidity(d,null,a)},this);$a(this.$$controls,a);a.$$parentForm=Mb},$setDirty:function(){this.$$animate.removeClass(this.$$element,
+Va);this.$$animate.addClass(this.$$element,Rb);this.$dirty=!0;this.$pristine=!1;this.$$parentForm.$setDirty()},$setPristine:function(){this.$$animate.setClass(this.$$element,Va,Rb+" ng-submitted");this.$dirty=!1;this.$pristine=!0;this.$submitted=!1;q(this.$$controls,function(a){a.$setPristine()})},$setUntouched:function(){q(this.$$controls,function(a){a.$setUntouched()})},$setSubmitted:function(){this.$$animate.addClass(this.$$element,"ng-submitted");this.$submitted=!0;this.$$parentForm.$setSubmitted()}};
+Zd({clazz:Lb,set:function(a,b,d){var c=a[b];c?-1===c.indexOf(d)&&c.push(d):a[b]=[d]},unset:function(a,b,d){var c=a[b];c&&($a(c,d),0===c.length&&delete a[b])}});var ge=function(a){return["$timeout","$parse",function(b,d){function c(a){return""===a?d('this[""]').assign:d(a).assign||z}return{name:"form",restrict:a?"EAC":"E",require:["form","^^?form"],controller:Lb,compile:function(d,f){d.addClass(Va).addClass(nb);var g=f.name?"name":a&&f.ngForm?"ngForm":!1;return{pre:function(a,d,e,f){var n=f[0];if(!("action"in
+e)){var p=function(b){a.$apply(function(){n.$commitViewValue();n.$setSubmitted()});b.preventDefault()};d[0].addEventListener("submit",p);d.on("$destroy",function(){b(function(){d[0].removeEventListener("submit",p)},0,!1)})}(f[1]||n.$$parentForm).$addControl(n);var r=g?c(n.$name):z;g&&(r(a,n),e.$observe(g,function(b){n.$name!==b&&(r(a,void 0),n.$$parentForm.$$renameControl(n,b),r=c(n.$name),r(a,n))}));d.on("$destroy",function(){n.$$parentForm.$removeControl(n);r(a,void 0);S(n,Mb)})}}}}}]},Ge=ge(),
+Se=ge(!0),Pg=/^\d{4,}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+(?:[+-][0-2]\d:[0-5]\d|Z)$/,ah=/^[a-z][a-z\d.+-]*:\/*(?:[^:@]+(?::[^@]+)?@)?(?:[^\s:/?#]+|\[[a-f\d:]+])(?::\d+)?(?:\/[^?#]*)?(?:\?[^#]*)?(?:#.*)?$/i,bh=/^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+(\.[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(\.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*$/,Qg=/^\s*(-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/,he=/^(\d{4,})-(\d{2})-(\d{2})$/,ie=/^(\d{4,})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,
+Hc=/^(\d{4,})-W(\d\d)$/,je=/^(\d{4,})-(\d\d)$/,ke=/^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,ae=V();q(["date","datetime-local","month","time","week"],function(a){ae[a]=!0});var le={text:function(a,b,d,c,e,f){Ra(a,b,d,c,e,f);Cc(c)},date:ob("date",he,Nb(he,["yyyy","MM","dd"]),"yyyy-MM-dd"),"datetime-local":ob("datetimelocal",ie,Nb(ie,"yyyy MM dd HH mm ss sss".split(" ")),"yyyy-MM-ddTHH:mm:ss.sss"),time:ob("time",ke,Nb(ke,["HH","mm","ss","sss"]),"HH:mm:ss.sss"),week:ob("week",Hc,function(a,b){if(ga(a))return a;
+if(F(a)){Hc.lastIndex=0;var d=Hc.exec(a);if(d){var c=+d[1],e=+d[2],f=d=0,g=0,h=0,k=Vd(c),e=7*(e-1);b&&(d=b.getHours(),f=b.getMinutes(),g=b.getSeconds(),h=b.getMilliseconds());return new Date(c,0,k.getDate()+e,d,f,g,h)}}return NaN},"yyyy-Www"),month:ob("month",je,Nb(je,["yyyy","MM"]),"yyyy-MM"),number:function(a,b,d,c,e,f){Dc(a,b,d,c);be(c);Ra(a,b,d,c,e,f);var g,h;if(u(d.min)||d.ngMin)c.$validators.min=function(a){return c.$isEmpty(a)||w(g)||a>=g},d.$observe("min",function(a){g=Sa(a);c.$validate()});
+if(u(d.max)||d.ngMax)c.$validators.max=function(a){return c.$isEmpty(a)||w(h)||a<=h},d.$observe("max",function(a){h=Sa(a);c.$validate()});if(u(d.step)||d.ngStep){var k;c.$validators.step=function(a,b){return c.$isEmpty(b)||w(k)||ce(b,g||0,k)};d.$observe("step",function(a){k=Sa(a);c.$validate()})}},url:function(a,b,d,c,e,f){Ra(a,b,d,c,e,f);Cc(c);c.$$parserName="url";c.$validators.url=function(a,b){var d=a||b;return c.$isEmpty(d)||ah.test(d)}},email:function(a,b,d,c,e,f){Ra(a,b,d,c,e,f);Cc(c);c.$$parserName=
+"email";c.$validators.email=function(a,b){var d=a||b;return c.$isEmpty(d)||bh.test(d)}},radio:function(a,b,d,c){var e=!d.ngTrim||"false"!==T(d.ngTrim);w(d.name)&&b.attr("name",++qb);b.on("click",function(a){var g;b[0].checked&&(g=d.value,e&&(g=T(g)),c.$setViewValue(g,a&&a.type))});c.$render=function(){var a=d.value;e&&(a=T(a));b[0].checked=a===c.$viewValue};d.$observe("value",c.$render)},range:function(a,b,d,c,e,f){function g(a,c){b.attr(a,d[a]);d.$observe(a,c)}function h(a){n=Sa(a);da(c.$modelValue)||
+(m?(a=b.val(),n>a&&(a=n,b.val(a)),c.$setViewValue(a)):c.$validate())}function k(a){p=Sa(a);da(c.$modelValue)||(m?(a=b.val(),p<a&&(b.val(p),a=p<n?n:p),c.$setViewValue(a)):c.$validate())}function l(a){r=Sa(a);da(c.$modelValue)||(m&&c.$viewValue!==b.val()?c.$setViewValue(b.val()):c.$validate())}Dc(a,b,d,c);be(c);Ra(a,b,d,c,e,f);var m=c.$$hasNativeValidators&&"range"===b[0].type,n=m?0:void 0,p=m?100:void 0,r=m?1:void 0,q=b[0].validity;a=u(d.min);e=u(d.max);f=u(d.step);var s=c.$render;c.$render=m&&u(q.rangeUnderflow)&&
+u(q.rangeOverflow)?function(){s();c.$setViewValue(b.val())}:s;a&&(c.$validators.min=m?function(){return!0}:function(a,b){return c.$isEmpty(b)||w(n)||b>=n},g("min",h));e&&(c.$validators.max=m?function(){return!0}:function(a,b){return c.$isEmpty(b)||w(p)||b<=p},g("max",k));f&&(c.$validators.step=m?function(){return!q.stepMismatch}:function(a,b){return c.$isEmpty(b)||w(r)||ce(b,n||0,r)},g("step",l))},checkbox:function(a,b,d,c,e,f,g,h){var k=de(h,a,"ngTrueValue",d.ngTrueValue,!0),l=de(h,a,"ngFalseValue",
+d.ngFalseValue,!1);b.on("click",function(a){c.$setViewValue(b[0].checked,a&&a.type)});c.$render=function(){b[0].checked=c.$viewValue};c.$isEmpty=function(a){return!1===a};c.$formatters.push(function(a){return sa(a,k)});c.$parsers.push(function(a){return a?k:l})},hidden:z,button:z,submit:z,reset:z,file:z},Xc=["$browser","$sniffer","$filter","$parse",function(a,b,d,c){return{restrict:"E",require:["?ngModel"],link:{pre:function(e,f,g,h){h[0]&&(le[Q(g.type)]||le.text)(e,f,g,h[0],b,a,d,c)}}}}],ch=/^(true|false|\d+)$/,
+kf=function(){function a(a,d,c){var e=u(c)?c:9===za?"":null;a.prop("value",e);d.$set("value",c)}return{restrict:"A",priority:100,compile:function(b,d){return ch.test(d.ngValue)?function(b,d,f){b=b.$eval(f.ngValue);a(d,f,b)}:function(b,d,f){b.$watch(f.ngValue,function(b){a(d,f,b)})}}}},Ke=["$compile",function(a){return{restrict:"AC",compile:function(b){a.$$addBindingClass(b);return function(b,c,e){a.$$addBindingInfo(c,e.ngBind);c=c[0];b.$watch(e.ngBind,function(a){c.textContent=$b(a)})}}}}],Me=["$interpolate",
+"$compile",function(a,b){return{compile:function(d){b.$$addBindingClass(d);return function(c,d,f){c=a(d.attr(f.$attr.ngBindTemplate));b.$$addBindingInfo(d,c.expressions);d=d[0];f.$observe("ngBindTemplate",function(a){d.textContent=w(a)?"":a})}}}}],Le=["$sce","$parse","$compile",function(a,b,d){return{restrict:"A",compile:function(c,e){var f=b(e.ngBindHtml),g=b(e.ngBindHtml,function(b){return a.valueOf(b)});d.$$addBindingClass(c);return function(b,c,e){d.$$addBindingInfo(c,e.ngBindHtml);b.$watch(g,
+function(){var d=f(b);c.html(a.getTrustedHtml(d)||"")})}}}}],jf=la({restrict:"A",require:"ngModel",link:function(a,b,d,c){c.$viewChangeListeners.push(function(){a.$eval(d.ngChange)})}}),Ne=Fc("",!0),Pe=Fc("Odd",0),Oe=Fc("Even",1),Qe=Qa({compile:function(a,b){b.$set("ngCloak",void 0);a.removeClass("ng-cloak")}}),Re=[function(){return{restrict:"A",scope:!0,controller:"@",priority:500}}],bd={},dh={blur:!0,focus:!0};q("click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste".split(" "),
+function(a){var b=Ba("ng-"+a);bd[b]=["$parse","$rootScope",function(d,c){return{restrict:"A",compile:function(e,f){var g=d(f[b]);return function(b,d){d.on(a,function(d){var e=function(){g(b,{$event:d})};dh[a]&&c.$$phase?b.$evalAsync(e):b.$apply(e)})}}}}]});var Ue=["$animate","$compile",function(a,b){return{multiElement:!0,transclude:"element",priority:600,terminal:!0,restrict:"A",$$tlb:!0,link:function(d,c,e,f,g){var h,k,l;d.$watch(e.ngIf,function(d){d?k||g(function(d,f){k=f;d[d.length++]=b.$$createComment("end ngIf",
+e.ngIf);h={clone:d};a.enter(d,c.parent(),c)}):(l&&(l.remove(),l=null),k&&(k.$destroy(),k=null),h&&(l=tb(h.clone),a.leave(l).done(function(a){!1!==a&&(l=null)}),h=null))})}}}],Ve=["$templateRequest","$anchorScroll","$animate",function(a,b,d){return{restrict:"ECA",priority:400,terminal:!0,transclude:"element",controller:ea.noop,compile:function(c,e){var f=e.ngInclude||e.src,g=e.onload||"",h=e.autoscroll;return function(c,e,m,n,p){var r=0,q,s,t,w=function(){s&&(s.remove(),s=null);q&&(q.$destroy(),q=
+null);t&&(d.leave(t).done(function(a){!1!==a&&(s=null)}),s=t,t=null)};c.$watch(f,function(f){var m=function(a){!1===a||!u(h)||h&&!c.$eval(h)||b()},s=++r;f?(a(f,!0).then(function(a){if(!c.$$destroyed&&s===r){var b=c.$new();n.template=a;a=p(b,function(a){w();d.enter(a,null,e).done(m)});q=b;t=a;q.$emit("$includeContentLoaded",f);c.$eval(g)}},function(){c.$$destroyed||s!==r||(w(),c.$emit("$includeContentError",f))}),c.$emit("$includeContentRequested",f)):(w(),n.template=null)})}}}}],mf=["$compile",function(a){return{restrict:"ECA",
+priority:-400,require:"ngInclude",link:function(b,d,c,e){ma.call(d[0]).match(/SVG/)?(d.empty(),a(dd(e.template,x.document).childNodes)(b,function(a){d.append(a)},{futureParentElement:d})):(d.html(e.template),a(d.contents())(b))}}}],We=Qa({priority:450,compile:function(){return{pre:function(a,b,d){a.$eval(d.ngInit)}}}}),hf=function(){return{restrict:"A",priority:100,require:"ngModel",link:function(a,b,d,c){var e=d.ngList||", ",f="false"!==d.ngTrim,g=f?T(e):e;c.$parsers.push(function(a){if(!w(a)){var b=
+[];a&&q(a.split(g),function(a){a&&b.push(f?T(a):a)});return b}});c.$formatters.push(function(a){if(H(a))return a.join(e)});c.$isEmpty=function(a){return!a||!a.length}}}},nb="ng-valid",Yd="ng-invalid",Va="ng-pristine",Rb="ng-dirty",pb=L("ngModel");Ob.$inject="$scope $exceptionHandler $attrs $element $parse $animate $timeout $q $interpolate".split(" ");Ob.prototype={$$initGetterSetters:function(){if(this.$options.getOption("getterSetter")){var a=this.$$parse(this.$$attr.ngModel+"()"),b=this.$$parse(this.$$attr.ngModel+
+"($$$p)");this.$$ngModelGet=function(b){var c=this.$$parsedNgModel(b);D(c)&&(c=a(b));return c};this.$$ngModelSet=function(a,c){D(this.$$parsedNgModel(a))?b(a,{$$$p:c}):this.$$parsedNgModelAssign(a,c)}}else if(!this.$$parsedNgModel.assign)throw pb("nonassign",this.$$attr.ngModel,xa(this.$$element));},$render:z,$isEmpty:function(a){return w(a)||""===a||null===a||a!==a},$$updateEmptyClasses:function(a){this.$isEmpty(a)?(this.$$animate.removeClass(this.$$element,"ng-not-empty"),this.$$animate.addClass(this.$$element,
+"ng-empty")):(this.$$animate.removeClass(this.$$element,"ng-empty"),this.$$animate.addClass(this.$$element,"ng-not-empty"))},$setPristine:function(){this.$dirty=!1;this.$pristine=!0;this.$$animate.removeClass(this.$$element,Rb);this.$$animate.addClass(this.$$element,Va)},$setDirty:function(){this.$dirty=!0;this.$pristine=!1;this.$$animate.removeClass(this.$$element,Va);this.$$animate.addClass(this.$$element,Rb);this.$$parentForm.$setDirty()},$setUntouched:function(){this.$touched=!1;this.$untouched=
+!0;this.$$animate.setClass(this.$$element,"ng-untouched","ng-touched")},$setTouched:function(){this.$touched=!0;this.$untouched=!1;this.$$animate.setClass(this.$$element,"ng-touched","ng-untouched")},$rollbackViewValue:function(){this.$$timeout.cancel(this.$$pendingDebounce);this.$viewValue=this.$$lastCommittedViewValue;this.$render()},$validate:function(){if(!da(this.$modelValue)){var a=this.$$lastCommittedViewValue,b=this.$$rawModelValue,d=this.$valid,c=this.$modelValue,e=this.$options.getOption("allowInvalid"),
+f=this;this.$$runValidators(b,a,function(a){e||d===a||(f.$modelValue=a?b:void 0,f.$modelValue!==c&&f.$$writeModelToScope())})}},$$runValidators:function(a,b,d){function c(){var c=!0;q(k.$validators,function(d,e){var g=Boolean(d(a,b));c=c&&g;f(e,g)});return c?!0:(q(k.$asyncValidators,function(a,b){f(b,null)}),!1)}function e(){var c=[],d=!0;q(k.$asyncValidators,function(e,g){var k=e(a,b);if(!k||!D(k.then))throw pb("nopromise",k);f(g,void 0);c.push(k.then(function(){f(g,!0)},function(){d=!1;f(g,!1)}))});
+c.length?k.$$q.all(c).then(function(){g(d)},z):g(!0)}function f(a,b){h===k.$$currentValidationRunId&&k.$setValidity(a,b)}function g(a){h===k.$$currentValidationRunId&&d(a)}this.$$currentValidationRunId++;var h=this.$$currentValidationRunId,k=this;(function(){var a=k.$$parserName||"parse";if(w(k.$$parserValid))f(a,null);else return k.$$parserValid||(q(k.$validators,function(a,b){f(b,null)}),q(k.$asyncValidators,function(a,b){f(b,null)})),f(a,k.$$parserValid),k.$$parserValid;return!0})()?c()?e():g(!1):
+g(!1)},$commitViewValue:function(){var a=this.$viewValue;this.$$timeout.cancel(this.$$pendingDebounce);if(this.$$lastCommittedViewValue!==a||""===a&&this.$$hasNativeValidators)this.$$updateEmptyClasses(a),this.$$lastCommittedViewValue=a,this.$pristine&&this.$setDirty(),this.$$parseAndValidate()},$$parseAndValidate:function(){var a=this.$$lastCommittedViewValue,b=this;if(this.$$parserValid=w(a)?void 0:!0)for(var d=0;d<this.$parsers.length;d++)if(a=this.$parsers[d](a),w(a)){this.$$parserValid=!1;break}da(this.$modelValue)&&
+(this.$modelValue=this.$$ngModelGet(this.$$scope));var c=this.$modelValue,e=this.$options.getOption("allowInvalid");this.$$rawModelValue=a;e&&(this.$modelValue=a,b.$modelValue!==c&&b.$$writeModelToScope());this.$$runValidators(a,this.$$lastCommittedViewValue,function(d){e||(b.$modelValue=d?a:void 0,b.$modelValue!==c&&b.$$writeModelToScope())})},$$writeModelToScope:function(){this.$$ngModelSet(this.$$scope,this.$modelValue);q(this.$viewChangeListeners,function(a){try{a()}catch(b){this.$$exceptionHandler(b)}},
+this)},$setViewValue:function(a,b){this.$viewValue=a;this.$options.getOption("updateOnDefault")&&this.$$debounceViewValueCommit(b)},$$debounceViewValueCommit:function(a){var b=this.$options.getOption("debounce");ba(b[a])?b=b[a]:ba(b["default"])&&(b=b["default"]);this.$$timeout.cancel(this.$$pendingDebounce);var d=this;0<b?this.$$pendingDebounce=this.$$timeout(function(){d.$commitViewValue()},b):this.$$scope.$root.$$phase?this.$commitViewValue():this.$$scope.$apply(function(){d.$commitViewValue()})},
+$overrideModelOptions:function(a){this.$options=this.$options.createChild(a)}};Zd({clazz:Ob,set:function(a,b){a[b]=!0},unset:function(a,b){delete a[b]}});var gf=["$rootScope",function(a){return{restrict:"A",require:["ngModel","^?form","^?ngModelOptions"],controller:Ob,priority:1,compile:function(b){b.addClass(Va).addClass("ng-untouched").addClass(nb);return{pre:function(a,b,e,f){var g=f[0];b=f[1]||g.$$parentForm;if(f=f[2])g.$options=f.$options;g.$$initGetterSetters();b.$addControl(g);e.$observe("name",
+function(a){g.$name!==a&&g.$$parentForm.$$renameControl(g,a)});a.$on("$destroy",function(){g.$$parentForm.$removeControl(g)})},post:function(b,c,e,f){function g(){h.$setTouched()}var h=f[0];if(h.$options.getOption("updateOn"))c.on(h.$options.getOption("updateOn"),function(a){h.$$debounceViewValueCommit(a&&a.type)});c.on("blur",function(){h.$touched||(a.$$phase?b.$evalAsync(g):b.$apply(g))})}}}}}],Pb,eh=/(\s+|^)default(\s+|$)/;Gc.prototype={getOption:function(a){return this.$$options[a]},createChild:function(a){var b=
+!1;a=S({},a);q(a,function(d,c){"$inherit"===d?"*"===c?b=!0:(a[c]=this.$$options[c],"updateOn"===c&&(a.updateOnDefault=this.$$options.updateOnDefault)):"updateOn"===c&&(a.updateOnDefault=!1,a[c]=T(d.replace(eh,function(){a.updateOnDefault=!0;return" "})))},this);b&&(delete a["*"],ee(a,this.$$options));ee(a,Pb.$$options);return new Gc(a)}};Pb=new Gc({updateOn:"",updateOnDefault:!0,debounce:0,getterSetter:!1,allowInvalid:!1,timezone:null});var lf=function(){function a(a,d){this.$$attrs=a;this.$$scope=
+d}a.$inject=["$attrs","$scope"];a.prototype={$onInit:function(){var a=this.parentCtrl?this.parentCtrl.$options:Pb,d=this.$$scope.$eval(this.$$attrs.ngModelOptions);this.$options=a.createChild(d)}};return{restrict:"A",priority:10,require:{parentCtrl:"?^^ngModelOptions"},bindToController:!0,controller:a}},Xe=Qa({terminal:!0,priority:1E3}),fh=L("ngOptions"),gh=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?(?:\s+disable\s+when\s+([\s\S]+?))?\s+for\s+(?:([$\w][$\w]*)|(?:\(\s*([$\w][$\w]*)\s*,\s*([$\w][$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,
+ef=["$compile","$document","$parse",function(a,b,d){function c(a,b,c){function e(a,b,c,d,f){this.selectValue=a;this.viewValue=b;this.label=c;this.group=d;this.disabled=f}function f(a){var b;if(!q&&qa(a))b=a;else{b=[];for(var c in a)a.hasOwnProperty(c)&&"$"!==c.charAt(0)&&b.push(c)}return b}var n=a.match(gh);if(!n)throw fh("iexp",a,xa(b));var p=n[5]||n[7],q=n[6];a=/ as /.test(n[0])&&n[1];var s=n[9];b=d(n[2]?n[1]:p);var v=a&&d(a)||b,t=s&&d(s),u=s?function(a,b){return t(c,b)}:function(a){return Pa(a)},
+w=function(a,b){return u(a,G(a,b))},A=d(n[2]||n[1]),x=d(n[3]||""),I=d(n[4]||""),K=d(n[8]),E={},G=q?function(a,b){E[q]=b;E[p]=a;return E}:function(a){E[p]=a;return E};return{trackBy:s,getTrackByValue:w,getWatchables:d(K,function(a){var b=[];a=a||[];for(var d=f(a),e=d.length,g=0;g<e;g++){var h=a===d?g:d[g],l=a[h],h=G(l,h),l=u(l,h);b.push(l);if(n[2]||n[1])l=A(c,h),b.push(l);n[4]&&(h=I(c,h),b.push(h))}return b}),getOptions:function(){for(var a=[],b={},d=K(c)||[],g=f(d),h=g.length,n=0;n<h;n++){var p=d===
+g?n:g[n],q=G(d[p],p),r=v(c,q),p=u(r,q),t=A(c,q),E=x(c,q),q=I(c,q),r=new e(p,r,t,E,q);a.push(r);b[p]=r}return{items:a,selectValueMap:b,getOptionFromViewValue:function(a){return b[w(a)]},getViewValueFromOption:function(a){return s?ra(a.viewValue):a.viewValue}}}}}var e=x.document.createElement("option"),f=x.document.createElement("optgroup");return{restrict:"A",terminal:!0,require:["select","ngModel"],link:{pre:function(a,b,c,d){d[0].registerOption=z},post:function(d,h,k,l){function m(a){var b=(a=A.getOptionFromViewValue(a))&&
+a.element;b&&!b.selected&&(b.selected=!0);return a}function n(a,b){a.element=b;b.disabled=a.disabled;a.label!==b.label&&(b.label=a.label,b.textContent=a.label);b.value=a.selectValue}function p(){var a=A&&r.readValue();if(A)for(var b=A.items.length-1;0<=b;b--){var c=A.items[b];u(c.group)?Eb(c.element.parentNode):Eb(c.element)}A=z.getOptions();var d={};x&&h.prepend(r.emptyOption);A.items.forEach(function(a){var b;if(u(a.group)){b=d[a.group];b||(b=f.cloneNode(!1),I.appendChild(b),b.label=null===a.group?
+"null":a.group,d[a.group]=b);var c=e.cloneNode(!1)}else b=I,c=e.cloneNode(!1);b.appendChild(c);n(a,c)});h[0].appendChild(I);s.$render();s.$isEmpty(a)||(b=r.readValue(),(z.trackBy||v?sa(a,b):a===b)||(s.$setViewValue(b),s.$render()))}var r=l[0],s=l[1],v=k.multiple;l=0;for(var t=h.children(),w=t.length;l<w;l++)if(""===t[l].value){r.hasEmptyOption=!0;r.emptyOption=t.eq(l);break}var x=!!r.emptyOption;B(e.cloneNode(!1)).val("?");var A,z=c(k.ngOptions,h,d),I=b[0].createDocumentFragment();r.generateUnknownOptionValue=
+function(a){return"?"};v?(r.writeValue=function(a){var b=a&&a.map(m)||[];A.items.forEach(function(a){a.element.selected&&-1===Array.prototype.indexOf.call(b,a)&&(a.element.selected=!1)})},r.readValue=function(){var a=h.val()||[],b=[];q(a,function(a){(a=A.selectValueMap[a])&&!a.disabled&&b.push(A.getViewValueFromOption(a))});return b},z.trackBy&&d.$watchCollection(function(){if(H(s.$viewValue))return s.$viewValue.map(function(a){return z.getTrackByValue(a)})},function(){s.$render()})):(r.writeValue=
+function(a){var b=A.selectValueMap[h.val()],c=A.getOptionFromViewValue(a);b&&b.element.removeAttribute("selected");c?(h[0].value!==c.selectValue&&(r.removeUnknownOption(),r.unselectEmptyOption(),h[0].value=c.selectValue,c.element.selected=!0),c.element.setAttribute("selected","selected")):x?r.selectEmptyOption():r.unknownOption.parent().length?r.updateUnknownOption(a):r.renderUnknownOption(a)},r.readValue=function(){var a=A.selectValueMap[h.val()];return a&&!a.disabled?(r.unselectEmptyOption(),r.removeUnknownOption(),
+A.getViewValueFromOption(a)):null},z.trackBy&&d.$watch(function(){return z.getTrackByValue(s.$viewValue)},function(){s.$render()}));x&&(r.emptyOption.remove(),a(r.emptyOption)(d),8===r.emptyOption[0].nodeType?(r.hasEmptyOption=!1,r.registerOption=function(a,b){""===b.val()&&(r.hasEmptyOption=!0,r.emptyOption=b,r.emptyOption.removeClass("ng-scope"),s.$render(),b.on("$destroy",function(){r.hasEmptyOption=!1;r.emptyOption=void 0}))}):r.emptyOption.removeClass("ng-scope"));h.empty();p();d.$watchCollection(z.getWatchables,
+p)}}}}],Ye=["$locale","$interpolate","$log",function(a,b,d){var c=/{}/g,e=/^when(Minus)?(.+)$/;return{link:function(f,g,h){function k(a){g.text(a||"")}var l=h.count,m=h.$attr.when&&g.attr(h.$attr.when),n=h.offset||0,p=f.$eval(m)||{},r={},s=b.startSymbol(),v=b.endSymbol(),t=s+l+"-"+n+v,u=ea.noop,x;q(h,function(a,b){var c=e.exec(b);c&&(c=(c[1]?"-":"")+Q(c[2]),p[c]=g.attr(h.$attr[b]))});q(p,function(a,d){r[d]=b(a.replace(c,t))});f.$watch(l,function(b){var c=parseFloat(b),e=da(c);e||c in p||(c=a.pluralCat(c-
+n));c===x||e&&da(x)||(u(),e=r[c],w(e)?(null!=b&&d.debug("ngPluralize: no rule defined for '"+c+"' in "+m),u=z,k()):u=f.$watch(e,k),x=c)})}}}],Ze=["$parse","$animate","$compile",function(a,b,d){var c=L("ngRepeat"),e=function(a,b,c,d,e,m,n){a[c]=d;e&&(a[e]=m);a.$index=b;a.$first=0===b;a.$last=b===n-1;a.$middle=!(a.$first||a.$last);a.$odd=!(a.$even=0===(b&1))};return{restrict:"A",multiElement:!0,transclude:"element",priority:1E3,terminal:!0,$$tlb:!0,compile:function(f,g){var h=g.ngRepeat,k=d.$$createComment("end ngRepeat",
+h),l=h.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+track\s+by\s+([\s\S]+?))?\s*$/);if(!l)throw c("iexp",h);var m=l[1],n=l[2],p=l[3],r=l[4],l=m.match(/^(?:(\s*[$\w]+)|\(\s*([$\w]+)\s*,\s*([$\w]+)\s*\))$/);if(!l)throw c("iidexp",m);var s=l[3]||l[1],v=l[2];if(p&&(!/^[$a-zA-Z_][$a-zA-Z0-9_]*$/.test(p)||/^(null|undefined|this|\$index|\$first|\$middle|\$last|\$even|\$odd|\$parent|\$root|\$id)$/.test(p)))throw c("badident",p);var t,u,w,x,z={$id:Pa};r?t=a(r):(w=function(a,b){return Pa(b)},
+x=function(a){return a});return function(a,d,f,g,l){t&&(u=function(b,c,d){v&&(z[v]=b);z[s]=c;z.$index=d;return t(a,z)});var m=V();a.$watchCollection(n,function(f){var g,n,r=d[0],t,z=V(),B,D,F,C,G,E,H;p&&(a[p]=f);if(qa(f))G=f,n=u||w;else for(H in n=u||x,G=[],f)ua.call(f,H)&&"$"!==H.charAt(0)&&G.push(H);B=G.length;H=Array(B);for(g=0;g<B;g++)if(D=f===G?g:G[g],F=f[D],C=n(D,F,g),m[C])E=m[C],delete m[C],z[C]=E,H[g]=E;else{if(z[C])throw q(H,function(a){a&&a.scope&&(m[a.id]=a)}),c("dupes",h,C,F);H[g]={id:C,
+scope:void 0,clone:void 0};z[C]=!0}for(t in m){E=m[t];C=tb(E.clone);b.leave(C);if(C[0].parentNode)for(g=0,n=C.length;g<n;g++)C[g].$$NG_REMOVED=!0;E.scope.$destroy()}for(g=0;g<B;g++)if(D=f===G?g:G[g],F=f[D],E=H[g],E.scope){t=r;do t=t.nextSibling;while(t&&t.$$NG_REMOVED);E.clone[0]!==t&&b.move(tb(E.clone),null,r);r=E.clone[E.clone.length-1];e(E.scope,g,s,F,v,D,B)}else l(function(a,c){E.scope=c;var d=k.cloneNode(!1);a[a.length++]=d;b.enter(a,null,r);r=d;E.clone=a;z[E.id]=E;e(E.scope,g,s,F,v,D,B)});m=
+z})}}}}],$e=["$animate",function(a){return{restrict:"A",multiElement:!0,link:function(b,d,c){b.$watch(c.ngShow,function(b){a[b?"removeClass":"addClass"](d,"ng-hide",{tempClasses:"ng-hide-animate"})})}}}],Te=["$animate",function(a){return{restrict:"A",multiElement:!0,link:function(b,d,c){b.$watch(c.ngHide,function(b){a[b?"addClass":"removeClass"](d,"ng-hide",{tempClasses:"ng-hide-animate"})})}}}],af=Qa(function(a,b,d){a.$watch(d.ngStyle,function(a,d){d&&a!==d&&q(d,function(a,c){b.css(c,"")});a&&b.css(a)},
+!0)}),bf=["$animate","$compile",function(a,b){return{require:"ngSwitch",controller:["$scope",function(){this.cases={}}],link:function(d,c,e,f){var g=[],h=[],k=[],l=[],m=function(a,b){return function(c){!1!==c&&a.splice(b,1)}};d.$watch(e.ngSwitch||e.on,function(c){for(var d,e;k.length;)a.cancel(k.pop());d=0;for(e=l.length;d<e;++d){var s=tb(h[d].clone);l[d].$destroy();(k[d]=a.leave(s)).done(m(k,d))}h.length=0;l.length=0;(g=f.cases["!"+c]||f.cases["?"])&&q(g,function(c){c.transclude(function(d,e){l.push(e);
+var f=c.element;d[d.length++]=b.$$createComment("end ngSwitchWhen");h.push({clone:d});a.enter(d,f.parent(),f)})})})}}}],cf=Qa({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(a,b,d,c,e){a=d.ngSwitchWhen.split(d.ngSwitchWhenSeparator).sort().filter(function(a,b,c){return c[b-1]!==a});q(a,function(a){c.cases["!"+a]=c.cases["!"+a]||[];c.cases["!"+a].push({transclude:e,element:b})})}}),df=Qa({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(a,
+b,d,c,e){c.cases["?"]=c.cases["?"]||[];c.cases["?"].push({transclude:e,element:b})}}),hh=L("ngTransclude"),ff=["$compile",function(a){return{restrict:"EAC",terminal:!0,compile:function(b){var d=a(b.contents());b.empty();return function(a,b,f,g,h){function k(){d(a,function(a){b.append(a)})}if(!h)throw hh("orphan",xa(b));f.ngTransclude===f.$attr.ngTransclude&&(f.ngTransclude="");f=f.ngTransclude||f.ngTranscludeSlot;h(function(a,c){var d;if(d=a.length)a:{d=0;for(var f=a.length;d<f;d++){var g=a[d];if(g.nodeType!==
+Ia||g.nodeValue.trim()){d=!0;break a}}d=void 0}d?b.append(a):(k(),c.$destroy())},null,f);f&&!h.isSlotFilled(f)&&k()}}}}],He=["$templateCache",function(a){return{restrict:"E",terminal:!0,compile:function(b,d){"text/ng-template"===d.type&&a.put(d.id,b[0].text)}}}],ih={$setViewValue:z,$render:z},jh=["$element","$scope",function(a,b){function d(){g||(g=!0,b.$$postDigest(function(){g=!1;e.ngModelCtrl.$render()}))}function c(a){h||(h=!0,b.$$postDigest(function(){b.$$destroyed||(h=!1,e.ngModelCtrl.$setViewValue(e.readValue()),
+a&&e.ngModelCtrl.$render())}))}var e=this,f=new Gb;e.selectValueMap={};e.ngModelCtrl=ih;e.multiple=!1;e.unknownOption=B(x.document.createElement("option"));e.hasEmptyOption=!1;e.emptyOption=void 0;e.renderUnknownOption=function(b){b=e.generateUnknownOptionValue(b);e.unknownOption.val(b);a.prepend(e.unknownOption);Ta(e.unknownOption,!0);a.val(b)};e.updateUnknownOption=function(b){b=e.generateUnknownOptionValue(b);e.unknownOption.val(b);Ta(e.unknownOption,!0);a.val(b)};e.generateUnknownOptionValue=
+function(a){return"? "+Pa(a)+" ?"};e.removeUnknownOption=function(){e.unknownOption.parent()&&e.unknownOption.remove()};e.selectEmptyOption=function(){e.emptyOption&&(a.val(""),Ta(e.emptyOption,!0))};e.unselectEmptyOption=function(){e.hasEmptyOption&&e.emptyOption.removeAttr("selected")};b.$on("$destroy",function(){e.renderUnknownOption=z});e.readValue=function(){var b=a.val(),b=b in e.selectValueMap?e.selectValueMap[b]:b;return e.hasOption(b)?b:null};e.writeValue=function(b){var c=a[0].options[a[0].selectedIndex];
+c&&Ta(B(c),!1);e.hasOption(b)?(e.removeUnknownOption(),c=Pa(b),a.val(c in e.selectValueMap?c:b),Ta(B(a[0].options[a[0].selectedIndex]),!0)):null==b&&e.emptyOption?(e.removeUnknownOption(),e.selectEmptyOption()):e.unknownOption.parent().length?e.updateUnknownOption(b):e.renderUnknownOption(b)};e.addOption=function(a,b){if(8!==b[0].nodeType){Ka(a,'"option value"');""===a&&(e.hasEmptyOption=!0,e.emptyOption=b);var c=f.get(a)||0;f.set(a,c+1);d()}};e.removeOption=function(a){var b=f.get(a);b&&(1===b?(f.delete(a),
+""===a&&(e.hasEmptyOption=!1,e.emptyOption=void 0)):f.set(a,b-1))};e.hasOption=function(a){return!!f.get(a)};var g=!1,h=!1;e.registerOption=function(a,b,f,g,h){if(f.$attr.ngValue){var q,s=NaN;f.$observe("value",function(a){var d,f=b.prop("selected");u(s)&&(e.removeOption(q),delete e.selectValueMap[s],d=!0);s=Pa(a);q=a;e.selectValueMap[s]=a;e.addOption(a,b);b.attr("value",s);d&&f&&c()})}else g?f.$observe("value",function(a){e.readValue();var d,f=b.prop("selected");u(q)&&(e.removeOption(q),d=!0);q=
+a;e.addOption(a,b);d&&f&&c()}):h?a.$watch(h,function(a,d){f.$set("value",a);var g=b.prop("selected");d!==a&&e.removeOption(d);e.addOption(a,b);d&&g&&c()}):e.addOption(f.value,b);f.$observe("disabled",function(a){if("true"===a||a&&b.prop("selected"))e.multiple?c(!0):(e.ngModelCtrl.$setViewValue(null),e.ngModelCtrl.$render())});b.on("$destroy",function(){var a=e.readValue(),b=f.value;e.removeOption(b);d();(e.multiple&&a&&-1!==a.indexOf(b)||a===b)&&c(!0)})}}],Ie=function(){return{restrict:"E",require:["select",
+"?ngModel"],controller:jh,priority:1,link:{pre:function(a,b,d,c){var e=c[0],f=c[1];if(f){if(e.ngModelCtrl=f,b.on("change",function(){e.removeUnknownOption();a.$apply(function(){f.$setViewValue(e.readValue())})}),d.multiple){e.multiple=!0;e.readValue=function(){var a=[];q(b.find("option"),function(b){b.selected&&!b.disabled&&(b=b.value,a.push(b in e.selectValueMap?e.selectValueMap[b]:b))});return a};e.writeValue=function(a){q(b.find("option"),function(b){var c=!!a&&(-1!==Array.prototype.indexOf.call(a,
+b.value)||-1!==Array.prototype.indexOf.call(a,e.selectValueMap[b.value]));c!==b.selected&&Ta(B(b),c)})};var g,h=NaN;a.$watch(function(){h!==f.$viewValue||sa(g,f.$viewValue)||(g=pa(f.$viewValue),f.$render());h=f.$viewValue});f.$isEmpty=function(a){return!a||0===a.length}}}else e.registerOption=z},post:function(a,b,d,c){var e=c[1];if(e){var f=c[0];e.$render=function(){f.writeValue(e.$viewValue)}}}}}},Je=["$interpolate",function(a){return{restrict:"E",priority:100,compile:function(b,d){var c,e;u(d.ngValue)||
+(u(d.value)?c=a(d.value,!0):(e=a(b.text(),!0))||d.$set("value",b.text()));return function(a,b,d){var k=b.parent();(k=k.data("$selectController")||k.parent().data("$selectController"))&&k.registerOption(a,b,d,c,e)}}}}],Zc=function(){return{restrict:"A",require:"?ngModel",link:function(a,b,d,c){c&&(d.required=!0,c.$validators.required=function(a,b){return!d.required||!c.$isEmpty(b)},d.$observe("required",function(){c.$validate()}))}}},Yc=function(){return{restrict:"A",require:"?ngModel",link:function(a,
+b,d,c){if(c){var e,f=d.ngPattern||d.pattern;d.$observe("pattern",function(a){F(a)&&0<a.length&&(a=new RegExp("^"+a+"$"));if(a&&!a.test)throw L("ngPattern")("noregexp",f,a,xa(b));e=a||void 0;c.$validate()});c.$validators.pattern=function(a,b){return c.$isEmpty(b)||w(e)||e.test(b)}}}}},ad=function(){return{restrict:"A",require:"?ngModel",link:function(a,b,d,c){if(c){var e=-1;d.$observe("maxlength",function(a){a=Z(a);e=da(a)?-1:a;c.$validate()});c.$validators.maxlength=function(a,b){return 0>e||c.$isEmpty(b)||
+b.length<=e}}}}},$c=function(){return{restrict:"A",require:"?ngModel",link:function(a,b,d,c){if(c){var e=0;d.$observe("minlength",function(a){e=Z(a)||0;c.$validate()});c.$validators.minlength=function(a,b){return c.$isEmpty(b)||b.length>=e}}}}};x.angular.bootstrap?x.console&&console.log("WARNING: Tried to load angular more than once."):(ze(),Ce(ea),ea.module("ngLocale",[],["$provide",function(a){function b(a){a+="";var b=a.indexOf(".");return-1==b?0:a.length-b-1}a.value("$locale",{DATETIME_FORMATS:{AMPMS:["AM",
+"PM"],DAY:"Sunday Monday Tuesday Wednesday Thursday Friday Saturday".split(" "),ERANAMES:["Before Christ","Anno Domini"],ERAS:["BC","AD"],FIRSTDAYOFWEEK:6,MONTH:"January February March April May June July August September October November December".split(" "),SHORTDAY:"Sun Mon Tue Wed Thu Fri Sat".split(" "),SHORTMONTH:"Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),STANDALONEMONTH:"January February March April May June July August September October November December".split(" "),WEEKENDRANGE:[5,
+6],fullDate:"EEEE, MMMM d, y",longDate:"MMMM d, y",medium:"MMM d, y h:mm:ss a",mediumDate:"MMM d, y",mediumTime:"h:mm:ss a","short":"M/d/yy h:mm a",shortDate:"M/d/yy",shortTime:"h:mm a"},NUMBER_FORMATS:{CURRENCY_SYM:"$",DECIMAL_SEP:".",GROUP_SEP:",",PATTERNS:[{gSize:3,lgSize:3,maxFrac:3,minFrac:0,minInt:1,negPre:"-",negSuf:"",posPre:"",posSuf:""},{gSize:3,lgSize:3,maxFrac:2,minFrac:2,minInt:1,negPre:"-\u00a4",negSuf:"",posPre:"\u00a4",posSuf:""}]},id:"en-us",localeID:"en_US",pluralCat:function(a,
+c){var e=a|0,f=c;void 0===f&&(f=Math.min(b(a),3));Math.pow(10,f);return 1==e&&0==f?"one":"other"}})}]),B(function(){ue(x.document,Sc)}))})(window);!window.angular.$$csp().noInlineStyle&&window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
+//# sourceMappingURL=angular.min.js.map
diff --git a/tests/end2end/data/hints/html/angular1.html b/tests/end2end/data/hints/html/angular.html
similarity index 84%
rename from tests/end2end/data/hints/html/angular1.html
rename to tests/end2end/data/hints/html/angular.html
index de7712c0b..bc6b10340 100644
--- a/tests/end2end/data/hints/html/angular1.html
+++ b/tests/end2end/data/hints/html/angular.html
@@ -11,7 +11,7 @@
 			<p>The button has been clicked {{count}} times.</p>
 		</div>
 
-		<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular.min.js"></script>
+		<script src="../angular1/angular.min.js"></script>
 		<script>
 			angular.module('myApp', [])
 			.controller('myCtrl', ['$scope', function($scope) {

From ec08a19e7d8ab9651f3dd960e09bb0f241a1fb59 Mon Sep 17 00:00:00 2001
From: Nemanja Nedeljkovic <nemanjan00@gmail.com>
Date: Sun, 7 Jan 2018 11:23:28 +0100
Subject: [PATCH 080/574] Rename angular.html to angular1.html

---
 tests/end2end/data/hints/html/{angular.html => angular1.html} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tests/end2end/data/hints/html/{angular.html => angular1.html} (100%)

diff --git a/tests/end2end/data/hints/html/angular.html b/tests/end2end/data/hints/html/angular1.html
similarity index 100%
rename from tests/end2end/data/hints/html/angular.html
rename to tests/end2end/data/hints/html/angular1.html

From 957d5b3f028d285edbae7d37bd2dd0a09a60aaca Mon Sep 17 00:00:00 2001
From: Nemanja Nedeljkovic <nemanjan00@gmail.com>
Date: Sun, 7 Jan 2018 11:58:02 +0100
Subject: [PATCH 081/574] Add more angular1 selectors

---
 qutebrowser/browser/webelem.py              | 2 +-
 tests/end2end/data/hints/html/angular1.html | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/qutebrowser/browser/webelem.py b/qutebrowser/browser/webelem.py
index bcea5aeb0..2b11bee40 100644
--- a/qutebrowser/browser/webelem.py
+++ b/qutebrowser/browser/webelem.py
@@ -42,7 +42,7 @@ Group = enum.Enum('Group', ['all', 'links', 'images', 'url', 'inputs'])
 SELECTORS = {
     Group.all: ('a, area, textarea, select, input:not([type=hidden]), button, '
                 'frame, iframe, link, [onclick], [onmousedown], [role=link], '
-                '[role=option], [role=button], img, [ng-click]'),
+                '[role=option], [role=button], img, [ng-click], [ngClick], [data-ng-click], [x-ng-click]'),
     Group.links: 'a[href], area[href], link[href], [role=link][href]',
     Group.images: 'img',
     Group.url: '[src], [href]',
diff --git a/tests/end2end/data/hints/html/angular1.html b/tests/end2end/data/hints/html/angular1.html
index bc6b10340..4693a634a 100644
--- a/tests/end2end/data/hints/html/angular1.html
+++ b/tests/end2end/data/hints/html/angular1.html
@@ -6,18 +6,14 @@
 	<body ng-app="myApp">
 
 		<div ng-controller="myCtrl">
-			<p>Click the button to run a function:</p>
 			<p id="link" ng-click="myFunc()">OK</p>
-			<p>The button has been clicked {{count}} times.</p>
 		</div>
 
 		<script src="../angular1/angular.min.js"></script>
 		<script>
 			angular.module('myApp', [])
 			.controller('myCtrl', ['$scope', function($scope) {
-				$scope.count = 0;
 				$scope.myFunc = function() {
-					$scope.count++;
 					window.location = "/data/hello.txt";
 				};
 			}]);

From 5f3ee66775f5bc081993a88a0a53897170b8fb94 Mon Sep 17 00:00:00 2001
From: Nemanja Nedeljkovic <nemanjan00@gmail.com>
Date: Sun, 7 Jan 2018 12:06:36 +0100
Subject: [PATCH 082/574] Code style improvement and documentation

---
 qutebrowser/browser/webelem.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/webelem.py b/qutebrowser/browser/webelem.py
index 2b11bee40..30355ad1a 100644
--- a/qutebrowser/browser/webelem.py
+++ b/qutebrowser/browser/webelem.py
@@ -42,7 +42,9 @@ Group = enum.Enum('Group', ['all', 'links', 'images', 'url', 'inputs'])
 SELECTORS = {
     Group.all: ('a, area, textarea, select, input:not([type=hidden]), button, '
                 'frame, iframe, link, [onclick], [onmousedown], [role=link], '
-                '[role=option], [role=button], img, [ng-click], [ngClick], [data-ng-click], [x-ng-click]'),
+                '[role=option], [role=button], img, '
+                # Angular 1 selectors
+                '[ng-click], [ngClick], [data-ng-click], [x-ng-click]'),
     Group.links: 'a[href], area[href], link[href], [role=link][href]',
     Group.images: 'img',
     Group.url: '[src], [href]',

From 0101596148ad823e0be4c576187fa4e2a37dcf4b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 8 Jan 2018 16:39:12 +0100
Subject: [PATCH 083/574] Update codecov from 2.0.10 to 2.0.13

---
 misc/requirements/requirements-codecov.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-codecov.txt b/misc/requirements/requirements-codecov.txt
index 6601cfb12..df7a12ed6 100644
--- a/misc/requirements/requirements-codecov.txt
+++ b/misc/requirements/requirements-codecov.txt
@@ -2,7 +2,7 @@
 
 certifi==2017.11.5
 chardet==3.0.4
-codecov==2.0.10
+codecov==2.0.13
 coverage==4.4.2
 idna==2.6
 requests==2.18.4

From 6c91633293832ba7bf1364924782011e7d133146 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 8 Jan 2018 16:39:14 +0100
Subject: [PATCH 084/574] Update flake8-docstrings from 1.1.0 to 1.3.0

---
 misc/requirements/requirements-flake8.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index f73294005..6acc0c022 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -8,7 +8,7 @@ flake8-comprehensions==1.4.1
 flake8-copyright==0.2.0
 flake8-debugger==3.0.0
 flake8-deprecated==1.3
-flake8-docstrings==1.1.0
+flake8-docstrings==1.3.0
 flake8-future-import==0.4.3
 flake8-mock==0.3
 flake8-per-file-ignores==0.4

From f836b615c1fc7e4333793dc8459420788b62ecdf Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 8 Jan 2018 16:39:15 +0100
Subject: [PATCH 085/574] Update flake8-future-import from 0.4.3 to 0.4.4

---
 misc/requirements/requirements-flake8.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index 6acc0c022..0448bee52 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -9,7 +9,7 @@ flake8-copyright==0.2.0
 flake8-debugger==3.0.0
 flake8-deprecated==1.3
 flake8-docstrings==1.3.0
-flake8-future-import==0.4.3
+flake8-future-import==0.4.4
 flake8-mock==0.3
 flake8-per-file-ignores==0.4
 flake8-polyfill==1.0.2

From 8459c662e7cc992780f8c3af92b8d4809131d226 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 8 Jan 2018 16:39:17 +0100
Subject: [PATCH 086/574] Update pep8-naming from 0.4.1 to 0.5.0

---
 misc/requirements/requirements-flake8.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index 0448bee52..0ae43d663 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -17,7 +17,7 @@ flake8-string-format==0.2.3
 flake8-tidy-imports==1.1.0
 flake8-tuple==0.2.13
 mccabe==0.6.1
-pep8-naming==0.4.1
+pep8-naming==0.5.0
 pycodestyle==2.3.1
 pydocstyle==2.1.1
 pyflakes==1.6.0

From 6a3b5a9d4e8bb25bdd340ca095cbba9571e70b51 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 8 Jan 2018 16:39:18 +0100
Subject: [PATCH 087/574] Update setuptools from 38.2.5 to 38.4.0

---
 misc/requirements/requirements-pip.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pip.txt b/misc/requirements/requirements-pip.txt
index 42fae6bc9..54cacc3c3 100644
--- a/misc/requirements/requirements-pip.txt
+++ b/misc/requirements/requirements-pip.txt
@@ -3,6 +3,6 @@
 appdirs==1.4.3
 packaging==16.8
 pyparsing==2.2.0
-setuptools==38.2.5
+setuptools==38.4.0
 six==1.11.0
 wheel==0.30.0

From 70ad02b79b55983db691748a75b6403b4eba3532 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 8 Jan 2018 16:39:20 +0100
Subject: [PATCH 088/574] Update hypothesis from 3.44.4 to 3.44.13

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 42a5f2b7d..211506ae5 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -11,7 +11,7 @@ fields==5.0.0
 Flask==0.12.2
 glob2==0.6
 hunter==2.0.2
-hypothesis==3.44.4
+hypothesis==3.44.13
 itsdangerous==0.24
 # Jinja2==2.10
 Mako==1.0.7

From 7b348fe17c7297826dd71fe637fa1d29b9ee25be Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 8 Jan 2018 16:39:21 +0100
Subject: [PATCH 089/574] Update pytest-qt from 2.3.0 to 2.3.1

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 211506ae5..e5f9d35af 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -28,7 +28,7 @@ pytest-cov==2.5.1
 pytest-faulthandler==1.3.1
 pytest-instafail==0.3.0
 pytest-mock==1.6.3
-pytest-qt==2.3.0
+pytest-qt==2.3.1
 pytest-repeat==0.4.1
 pytest-rerunfailures==4.0
 pytest-travis-fold==1.3.0

From dea0aa9f7c68ae9ff5732325573369cd0a86688d Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Sun, 31 Dec 2017 14:38:20 +0100
Subject: [PATCH 090/574] Add tabs page

---
 qutebrowser/browser/qutescheme.py | 25 ++++++++++++++
 qutebrowser/html/tabs.html        | 56 +++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 qutebrowser/html/tabs.html

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 8bcb7ff37..57c32999b 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -201,6 +201,31 @@ def qute_bookmarks(_url):
     return 'text/html', html
 
 
+def _tab_fields_to_tabs_page_info(fields):
+    return (fields['title'], fields['current_url'])
+
+
+@add_handler('tabs')
+def qute_tabs(_url):
+    """Handler for qute://tabs. Display information about all open tabs."""
+    tabs = {}
+    for win_id in objreg.window_registry:
+        win_id_str = str(win_id)
+        tabs[win_id_str] = []
+        tabbed_browser = objreg.get('tabbed-browser',
+                                    scope='window',
+                                    window=win_id)
+        for tab_idx in range(tabbed_browser.count()):
+            tabs[win_id_str].append(
+                _tab_fields_to_tabs_page_info(
+                    tabbed_browser.get_tab_fields(tab_idx)))
+
+    html = jinja.render('tabs.html',
+                        title='Tabs',
+                        tab_list_by_window=tabs)
+    return 'text/html', html
+
+
 def history_data(start_time, offset=None):
     """Return history data.
 
diff --git a/qutebrowser/html/tabs.html b/qutebrowser/html/tabs.html
new file mode 100644
index 000000000..80244ef51
--- /dev/null
+++ b/qutebrowser/html/tabs.html
@@ -0,0 +1,56 @@
+{% extends "styled.html" %}
+
+{% block style %}
+{{super()}}
+h1 {
+    margin-bottom: 10px;
+}
+
+.url a {
+    color: #444;
+}
+
+th {
+    text-align: left;
+}
+
+.qmarks .name {
+    padding-left: 5px;
+}
+
+.empty-msg {
+    background-color: #f8f8f8;
+    color: #444;
+    display: inline-block;
+    text-align: center;
+    width: 100%;
+}
+{% endblock %}
+
+{% block content %}
+
+<h1>Tab list</h1>
+{% for win_id, tabs in tab_list_by_window.items() %}
+<h2>Window {{ win_id }}</h2>
+<table class="tabs_win{{win_id}}">
+    <tbody>
+    {% for name, url in tabs %}
+    <tr>
+        <td class="name"><a href="{{url}}">{{name}}</a></td>
+        <td class="url"><a href="{{url}}">{{url}}</a></td>
+    </tr>
+    {% endfor %}
+    </tbody>
+</table>
+{% endfor %}
+
+<h2>Raw list</h2>
+<code>
+{% for win_id, tabs in tab_list_by_window.items() %}
+    {% for name, url in tabs %}
+    {{url}}</br>
+    {% endfor %}
+{% endfor %}
+</code>
+
+{% endblock %}

From c1855e1741298f4a27d89ba71e243c403233a6da Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 10 Jan 2018 09:34:00 +0100
Subject: [PATCH 091/574] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 4e51f1c5b..47bf1e8e8 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -134,6 +134,7 @@ Fixed
 - Fix crash when a subprocess outputs data which is not decodable as UTF-8.
 - Fix crash when closing a tab immediately after hinting.
 - Worked around issues in Qt 5.10 with loading progress never being finished.
+- Fixed a crash when writing a flag before a command (e.g. `:-w open `).
 
 Deprecated
 ~~~~~~~~~~

From 1f8d6e21682a4c18c305aa28f3c6a1135b44aade Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 10 Jan 2018 09:39:46 +0100
Subject: [PATCH 092/574] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 47bf1e8e8..8c3a533a2 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -110,6 +110,7 @@ Changed
   order, and mixed matches on URL/tite are possible.
 - The system's default encoding (rather than UTF-8) is now used to decode
   subprocess output.
+- qutebrowser now ensures it's focused again after an external editor is closed.
 
 Fixed
 ~~~~~

From 5003432a554aa3714954aa41d67705ecf1fbd1fa Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Wed, 10 Jan 2018 19:59:34 +0100
Subject: [PATCH 093/574] option to close commandline by deleting the prefix

---
 .vscode/launch.json                         | 186 ++++++++++++++++++++
 .vscode/settings.json                       |   3 +
 qutebrowser/config/configdata.yml           |   7 +-
 qutebrowser/mainwindow/statusbar/command.py |  16 +-
 4 files changed, 209 insertions(+), 3 deletions(-)
 create mode 100644 .vscode/launch.json
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 000000000..65608537d
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,186 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${file}",
+            "cwd": "${workspaceFolder}",
+            "env": {},
+            "envFile": "${workspaceFolder}/.env",
+            "debugOptions": [
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "Python: Attach",
+            "type": "python",
+            "request": "attach",
+            "localRoot": "${workspaceFolder}",
+            "remoteRoot": "${workspaceFolder}",
+            "port": 3000,
+            "secret": "my_secret",
+            "host": "localhost"
+        },
+        {
+            "name": "Python: Terminal (integrated)",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${file}",
+            "cwd": "",
+            "console": "integratedTerminal",
+            "env": {},
+            "envFile": "${workspaceFolder}/.env",
+            "debugOptions": []
+        },
+        {
+            "name": "Python: Terminal (external)",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${file}",
+            "cwd": "",
+            "console": "externalTerminal",
+            "env": {},
+            "envFile": "${workspaceFolder}/.env",
+            "debugOptions": []
+        },
+        {
+            "name": "Python: Django",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${workspaceFolder}/manage.py",
+            "cwd": "${workspaceFolder}",
+            "args": [
+                "runserver",
+                "--noreload",
+                "--nothreading"
+            ],
+            "env": {},
+            "envFile": "${workspaceFolder}/.env",
+            "debugOptions": [
+                "RedirectOutput",
+                "DjangoDebugging"
+            ]
+        },
+        {
+            "name": "Python: Flask (0.11.x or later)",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": false,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "fully qualified path fo 'flask' executable. Generally located along with python interpreter",
+            "cwd": "${workspaceFolder}",
+            "env": {
+                "FLASK_APP": "${workspaceFolder}/quickstart/app.py"
+            },
+            "args": [
+                "run",
+                "--no-debugger",
+                "--no-reload"
+            ],
+            "envFile": "${workspaceFolder}/.env",
+            "debugOptions": [
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "Python: Flask (0.10.x or earlier)",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": false,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${workspaceFolder}/run.py",
+            "cwd": "${workspaceFolder}",
+            "args": [],
+            "env": {},
+            "envFile": "${workspaceFolder}/.env",
+            "debugOptions": [
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "Python: PySpark",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "osx": {
+                "pythonPath": "${env:SPARK_HOME}/bin/spark-submit"
+            },
+            "windows": {
+                "pythonPath": "${env:SPARK_HOME}/bin/spark-submit.cmd"
+            },
+            "linux": {
+                "pythonPath": "${env:SPARK_HOME}/bin/spark-submit"
+            },
+            "program": "${file}",
+            "cwd": "${workspaceFolder}",
+            "env": {},
+            "envFile": "${workspaceFolder}/.env",
+            "debugOptions": [
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "Python: Module",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "module": "module.name",
+            "cwd": "${workspaceFolder}",
+            "env": {},
+            "envFile": "${workspaceFolder}/.env",
+            "debugOptions": [
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "Python: Pyramid",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "cwd": "${workspaceFolder}",
+            "env": {},
+            "envFile": "${workspaceFolder}/.env",
+            "args": [
+                "${workspaceFolder}/development.ini"
+            ],
+            "debugOptions": [
+                "RedirectOutput",
+                "Pyramid"
+            ]
+        },
+        {
+            "name": "Python: Watson",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${workspaceFolder}/console.py",
+            "cwd": "${workspaceFolder}",
+            "args": [
+                "dev",
+                "runserver",
+                "--noreload=True"
+            ],
+            "env": {},
+            "envFile": "${workspaceFolder}/.env",
+            "debugOptions": [
+                "RedirectOutput"
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..a3e76b466
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "python.pythonPath": "${workspaceFolder}/.venv/bin/python"
+}
\ No newline at end of file
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index a118a8b59..a3ae79e2d 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -740,6 +740,11 @@ completion.use_best_match:
   default: false
   desc: Execute the best-matching command on a partial match.
 
+completion.exit_prefix:
+  type: Bool
+  default: false
+  desc: Exit command mode if the prefix gets deleted.
+
 ## downloads
 
 downloads.location.directory:
@@ -2493,4 +2498,4 @@ bindings.commands:
       keyboard.
 
     * register: Entered when qutebrowser is waiting for a register name/key for
-      commands like `:set-mark`.
+      commands like `:set-mark`.
\ No newline at end of file
diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index ab8ac7b5d..4611a186c 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -31,7 +31,6 @@ from qutebrowser.config import config
 
 
 class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
-
     """The commandline part of the statusbar.
 
     Attributes:
@@ -55,6 +54,8 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
     show_cmd = pyqtSignal()
     hide_cmd = pyqtSignal()
 
+    prefixes = '/ : ?'
+
     def __init__(self, *, win_id, private, parent=None):
         misc.CommandLineEdit.__init__(self, parent=parent)
         misc.MinimalLineEditMixin.__init__(self)
@@ -68,6 +69,7 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         self.textChanged.connect(self.update_completion)
         self.textChanged.connect(self.updateGeometry)
         self.textChanged.connect(self._incremental_search)
+        self.textChanged.connect(self._exit_prefix)
 
     def prefix(self):
         """Get the currently entered command prefix."""
@@ -219,7 +221,10 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         if not text:
             pass
         elif text[0] in modeparsers.STARTCHARS:
-            super().set_prompt(text[0])
+            if config.val.completion.exit_prefix:
+                super().set_prompt('')
+            else:
+                super().set_prompt(text[0])
         else:
             raise utils.Unreachable("setText got called with invalid text "
                                     "'{}'!".format(text))
@@ -259,3 +264,10 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
 
         if self.prefix() in ['/', '?']:
             self.got_cmd[str].emit(search_prefixes[text[0]] + text[1:])
+
+    @pyqtSlot(str)
+    def _exit_prefix(self, text):
+        if config.val.completion.exit_prefix and
+        (not text or text[0] not in self.prefixes):
+            modeman.leave(self._win_id, usertypes.KeyMode.command,
+                          'prefix deleted', maybe=True)

From be5b8e26329108b6b65ccead3602fa5f3f1841e9 Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Wed, 10 Jan 2018 20:02:39 +0100
Subject: [PATCH 094/574] option to close commandline by deleting the prefix

---
 qutebrowser/mainwindow/statusbar/command.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 4611a186c..145ef3808 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -267,7 +267,6 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
 
     @pyqtSlot(str)
     def _exit_prefix(self, text):
-        if config.val.completion.exit_prefix and
-        (not text or text[0] not in self.prefixes):
+        if config.val.completion.exit_prefix and (not text or text[0] not in self.prefixes):
             modeman.leave(self._win_id, usertypes.KeyMode.command,
                           'prefix deleted', maybe=True)

From 2c4d2beea347ce19edd4965ec2ba332ca0d38284 Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Wed, 10 Jan 2018 20:14:09 +0100
Subject: [PATCH 095/574] option to close commandline by deleting the prefix

---
 .vscode/launch.json   | 186 ------------------------------------------
 .vscode/settings.json |   3 -
 2 files changed, 189 deletions(-)
 delete mode 100644 .vscode/launch.json
 delete mode 100644 .vscode/settings.json

diff --git a/.vscode/launch.json b/.vscode/launch.json
deleted file mode 100644
index 65608537d..000000000
--- a/.vscode/launch.json
+++ /dev/null
@@ -1,186 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Python",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": true,
-            "pythonPath": "${config:python.pythonPath}",
-            "program": "${file}",
-            "cwd": "${workspaceFolder}",
-            "env": {},
-            "envFile": "${workspaceFolder}/.env",
-            "debugOptions": [
-                "RedirectOutput"
-            ]
-        },
-        {
-            "name": "Python: Attach",
-            "type": "python",
-            "request": "attach",
-            "localRoot": "${workspaceFolder}",
-            "remoteRoot": "${workspaceFolder}",
-            "port": 3000,
-            "secret": "my_secret",
-            "host": "localhost"
-        },
-        {
-            "name": "Python: Terminal (integrated)",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": true,
-            "pythonPath": "${config:python.pythonPath}",
-            "program": "${file}",
-            "cwd": "",
-            "console": "integratedTerminal",
-            "env": {},
-            "envFile": "${workspaceFolder}/.env",
-            "debugOptions": []
-        },
-        {
-            "name": "Python: Terminal (external)",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": true,
-            "pythonPath": "${config:python.pythonPath}",
-            "program": "${file}",
-            "cwd": "",
-            "console": "externalTerminal",
-            "env": {},
-            "envFile": "${workspaceFolder}/.env",
-            "debugOptions": []
-        },
-        {
-            "name": "Python: Django",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": true,
-            "pythonPath": "${config:python.pythonPath}",
-            "program": "${workspaceFolder}/manage.py",
-            "cwd": "${workspaceFolder}",
-            "args": [
-                "runserver",
-                "--noreload",
-                "--nothreading"
-            ],
-            "env": {},
-            "envFile": "${workspaceFolder}/.env",
-            "debugOptions": [
-                "RedirectOutput",
-                "DjangoDebugging"
-            ]
-        },
-        {
-            "name": "Python: Flask (0.11.x or later)",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": false,
-            "pythonPath": "${config:python.pythonPath}",
-            "program": "fully qualified path fo 'flask' executable. Generally located along with python interpreter",
-            "cwd": "${workspaceFolder}",
-            "env": {
-                "FLASK_APP": "${workspaceFolder}/quickstart/app.py"
-            },
-            "args": [
-                "run",
-                "--no-debugger",
-                "--no-reload"
-            ],
-            "envFile": "${workspaceFolder}/.env",
-            "debugOptions": [
-                "RedirectOutput"
-            ]
-        },
-        {
-            "name": "Python: Flask (0.10.x or earlier)",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": false,
-            "pythonPath": "${config:python.pythonPath}",
-            "program": "${workspaceFolder}/run.py",
-            "cwd": "${workspaceFolder}",
-            "args": [],
-            "env": {},
-            "envFile": "${workspaceFolder}/.env",
-            "debugOptions": [
-                "RedirectOutput"
-            ]
-        },
-        {
-            "name": "Python: PySpark",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": true,
-            "osx": {
-                "pythonPath": "${env:SPARK_HOME}/bin/spark-submit"
-            },
-            "windows": {
-                "pythonPath": "${env:SPARK_HOME}/bin/spark-submit.cmd"
-            },
-            "linux": {
-                "pythonPath": "${env:SPARK_HOME}/bin/spark-submit"
-            },
-            "program": "${file}",
-            "cwd": "${workspaceFolder}",
-            "env": {},
-            "envFile": "${workspaceFolder}/.env",
-            "debugOptions": [
-                "RedirectOutput"
-            ]
-        },
-        {
-            "name": "Python: Module",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": true,
-            "pythonPath": "${config:python.pythonPath}",
-            "module": "module.name",
-            "cwd": "${workspaceFolder}",
-            "env": {},
-            "envFile": "${workspaceFolder}/.env",
-            "debugOptions": [
-                "RedirectOutput"
-            ]
-        },
-        {
-            "name": "Python: Pyramid",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": true,
-            "pythonPath": "${config:python.pythonPath}",
-            "cwd": "${workspaceFolder}",
-            "env": {},
-            "envFile": "${workspaceFolder}/.env",
-            "args": [
-                "${workspaceFolder}/development.ini"
-            ],
-            "debugOptions": [
-                "RedirectOutput",
-                "Pyramid"
-            ]
-        },
-        {
-            "name": "Python: Watson",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": true,
-            "pythonPath": "${config:python.pythonPath}",
-            "program": "${workspaceFolder}/console.py",
-            "cwd": "${workspaceFolder}",
-            "args": [
-                "dev",
-                "runserver",
-                "--noreload=True"
-            ],
-            "env": {},
-            "envFile": "${workspaceFolder}/.env",
-            "debugOptions": [
-                "RedirectOutput"
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index a3e76b466..000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "python.pythonPath": "${workspaceFolder}/.venv/bin/python"
-}
\ No newline at end of file

From 1db4309eec97f58956f99338be6c1c181e633a9c Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Wed, 10 Jan 2018 21:29:31 +0100
Subject: [PATCH 096/574] review 1

---
 qutebrowser/config/configdata.yml           |  8 ++------
 qutebrowser/mainwindow/statusbar/command.py | 19 ++-----------------
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index a3ae79e2d..1d94f1000 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -740,11 +740,6 @@ completion.use_best_match:
   default: false
   desc: Execute the best-matching command on a partial match.
 
-completion.exit_prefix:
-  type: Bool
-  default: false
-  desc: Exit command mode if the prefix gets deleted.
-
 ## downloads
 
 downloads.location.directory:
@@ -2498,4 +2493,5 @@ bindings.commands:
       keyboard.
 
     * register: Entered when qutebrowser is waiting for a register name/key for
-      commands like `:set-mark`.
\ No newline at end of file
+      commands like `:set-mark`.
+
diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 145ef3808..c0accd3f4 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -31,6 +31,7 @@ from qutebrowser.config import config
 
 
 class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
+
     """The commandline part of the statusbar.
 
     Attributes:
@@ -54,8 +55,6 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
     show_cmd = pyqtSignal()
     hide_cmd = pyqtSignal()
 
-    prefixes = '/ : ?'
-
     def __init__(self, *, win_id, private, parent=None):
         misc.CommandLineEdit.__init__(self, parent=parent)
         misc.MinimalLineEditMixin.__init__(self)
@@ -216,20 +215,6 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
             self.clear_completion_selection.emit()
             self.hide_completion.emit()
 
-    def setText(self, text):
-        """Extend setText to set prefix and make sure the prompt is ok."""
-        if not text:
-            pass
-        elif text[0] in modeparsers.STARTCHARS:
-            if config.val.completion.exit_prefix:
-                super().set_prompt('')
-            else:
-                super().set_prompt(text[0])
-        else:
-            raise utils.Unreachable("setText got called with invalid text "
-                                    "'{}'!".format(text))
-        super().setText(text)
-
     def keyPressEvent(self, e):
         """Override keyPressEvent to ignore Return key presses.
 
@@ -267,6 +252,6 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
 
     @pyqtSlot(str)
     def _exit_prefix(self, text):
-        if config.val.completion.exit_prefix and (not text or text[0] not in self.prefixes):
+        if not text:
             modeman.leave(self._win_id, usertypes.KeyMode.command,
                           'prefix deleted', maybe=True)

From 9fd2ad9909e9351526319458aa6fdf03653fd2dc Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Wed, 10 Jan 2018 21:34:19 +0100
Subject: [PATCH 097/574] review 1

---
 qutebrowser/config/configdata.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 1d94f1000..a118a8b59 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -2494,4 +2494,3 @@ bindings.commands:
 
     * register: Entered when qutebrowser is waiting for a register name/key for
       commands like `:set-mark`.
-

From 860b22c0e05cba376c6cc6320eb7d21a1c5c9ffe Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Wed, 10 Jan 2018 22:05:14 +0100
Subject: [PATCH 098/574] review 1

---
 qutebrowser/mainwindow/statusbar/command.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index c0accd3f4..acdfebfa1 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -26,7 +26,7 @@ from qutebrowser.keyinput import modeman, modeparsers
 from qutebrowser.commands import cmdexc, cmdutils
 from qutebrowser.misc import cmdhistory, editor
 from qutebrowser.misc import miscwidgets as misc
-from qutebrowser.utils import usertypes, log, objreg, message, utils
+from qutebrowser.utils import usertypes, log, objreg, message
 from qutebrowser.config import config
 
 

From 4932323d3b120275f3abd1e5092462235c2b63fe Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Thu, 11 Jan 2018 12:40:20 +0100
Subject: [PATCH 099/574] review 1 setText

---
 qutebrowser/mainwindow/statusbar/command.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index acdfebfa1..e78db4c3f 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -26,7 +26,7 @@ from qutebrowser.keyinput import modeman, modeparsers
 from qutebrowser.commands import cmdexc, cmdutils
 from qutebrowser.misc import cmdhistory, editor
 from qutebrowser.misc import miscwidgets as misc
-from qutebrowser.utils import usertypes, log, objreg, message
+from qutebrowser.utils import usertypes, log, objreg, message, utils
 from qutebrowser.config import config
 
 
@@ -215,6 +215,13 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
             self.clear_completion_selection.emit()
             self.hide_completion.emit()
 
+    def setText(self, text):
+        """Extend setText to make sure the prefix is valid."""
+        if text and text[0] not in modeparsers.STARTCHARS:
+            raise utils.Unreachable("setText got called with invalid text "
+                                    "'{}'!".format(text))
+        super().setText(text)
+
     def keyPressEvent(self, e):
         """Override keyPressEvent to ignore Return key presses.
 
@@ -252,6 +259,6 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
 
     @pyqtSlot(str)
     def _exit_prefix(self, text):
-        if not text:
+        if not text or text[0] not in modeparsers.STARTCHARS:
             modeman.leave(self._win_id, usertypes.KeyMode.command,
                           'prefix deleted', maybe=True)

From 66d05916846833994fdb5bfd6e72e628fa84e2c1 Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Thu, 11 Jan 2018 14:03:43 +0100
Subject: [PATCH 100/574] new method

---
 .vscode/settings.json                       |  3 +++
 qutebrowser/mainwindow/statusbar/command.py | 23 ++++++++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..73eaca730
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "python.pythonPath": "${workspaceFolder}/.venv/bin/python3.5"
+}
\ No newline at end of file
diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index e78db4c3f..76e829a45 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -68,7 +68,6 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         self.textChanged.connect(self.update_completion)
         self.textChanged.connect(self.updateGeometry)
         self.textChanged.connect(self._incremental_search)
-        self.textChanged.connect(self._exit_prefix)
 
     def prefix(self):
         """Get the currently entered command prefix."""
@@ -222,6 +221,17 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
                                     "'{}'!".format(text))
         super().setText(text)
 
+    def setText(self, text):
+        """Extend setText to set prefix and make sure the prompt is ok."""
+        if not text:
+            pass
+        elif text[0] in modeparsers.STARTCHARS:
+            super().set_prompt(text[0])
+        else:
+            raise utils.Unreachable("setText got called with invalid text "
+                                    "'{}'!".format(text))
+        super().setText(text)
+
     def keyPressEvent(self, e):
         """Override keyPressEvent to ignore Return key presses.
 
@@ -229,6 +239,11 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         Enter/Shift+Enter/etc. will cause QLineEdit to think it's finished
         without command_accept to be called.
         """
+        text = self.text()
+        if text in modeparsers.STARTCHARS and e.key() == Qt.Key_Backspace:
+            modeman.leave(self._win_id, usertypes.KeyMode.command,
+                          'prefix deleted')
+
         if e.key() == Qt.Key_Return:
             e.ignore()
             return
@@ -256,9 +271,3 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
 
         if self.prefix() in ['/', '?']:
             self.got_cmd[str].emit(search_prefixes[text[0]] + text[1:])
-
-    @pyqtSlot(str)
-    def _exit_prefix(self, text):
-        if not text or text[0] not in modeparsers.STARTCHARS:
-            modeman.leave(self._win_id, usertypes.KeyMode.command,
-                          'prefix deleted', maybe=True)

From e654abf1282a013e8e3df9fba26845c98c276101 Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Thu, 11 Jan 2018 14:05:18 +0100
Subject: [PATCH 101/574] deleted folder

---
 .vscode/settings.json | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 73eaca730..000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "python.pythonPath": "${workspaceFolder}/.venv/bin/python3.5"
-}
\ No newline at end of file

From 2d7dd391a3f134c0bd467aae1863c340a15d038d Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Thu, 11 Jan 2018 14:08:17 +0100
Subject: [PATCH 102/574] review 1

---
 qutebrowser/mainwindow/statusbar/command.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 76e829a45..4e8c55d9c 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -213,14 +213,7 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
             self.hide_cmd.emit()
             self.clear_completion_selection.emit()
             self.hide_completion.emit()
-
-    def setText(self, text):
-        """Extend setText to make sure the prefix is valid."""
-        if text and text[0] not in modeparsers.STARTCHARS:
-            raise utils.Unreachable("setText got called with invalid text "
-                                    "'{}'!".format(text))
-        super().setText(text)
-
+       
     def setText(self, text):
         """Extend setText to set prefix and make sure the prompt is ok."""
         if not text:

From 200b36bd362ebb7225eb6175396030ca37eca2cc Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Thu, 11 Jan 2018 14:09:08 +0100
Subject: [PATCH 103/574] review 1

---
 qutebrowser/mainwindow/statusbar/command.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 4e8c55d9c..6ea9b5552 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -213,7 +213,7 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
             self.hide_cmd.emit()
             self.clear_completion_selection.emit()
             self.hide_completion.emit()
-       
+
     def setText(self, text):
         """Extend setText to set prefix and make sure the prompt is ok."""
         if not text:

From 57e8b428c3b81037091a82758248313bebad3fac Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Thu, 11 Jan 2018 15:45:44 +0100
Subject: [PATCH 104/574] e.accept() and return

---
 qutebrowser/mainwindow/statusbar/command.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 6ea9b5552..056203290 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -234,9 +234,10 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         """
         text = self.text()
         if text in modeparsers.STARTCHARS and e.key() == Qt.Key_Backspace:
+            e.accept()
             modeman.leave(self._win_id, usertypes.KeyMode.command,
                           'prefix deleted')
-
+            return 
         if e.key() == Qt.Key_Return:
             e.ignore()
             return

From d9741d56c5ab9b1fd72920ce70c45e269e7bf26f Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Thu, 11 Jan 2018 16:38:55 +0100
Subject: [PATCH 105/574] removed a trailing whitespace

---
 qutebrowser/mainwindow/statusbar/command.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 056203290..26ba802c0 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -237,7 +237,7 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
             e.accept()
             modeman.leave(self._win_id, usertypes.KeyMode.command,
                           'prefix deleted')
-            return 
+            return
         if e.key() == Qt.Key_Return:
             e.ignore()
             return

From 699abef159a9fb8c5cedbc496ac29f45ab24b788 Mon Sep 17 00:00:00 2001
From: Christian Helbling <helbling@search.ch>
Date: Fri, 12 Jan 2018 10:54:05 +0100
Subject: [PATCH 106/574] fix regression of #2778 which reappeared with qt 5.10
 in combination with up-to-date KDE this should also avoid an unneccessary KDE
 maximize animation when exiting fullscreen into maximized

---
 qutebrowser/browser/commands.py      | 2 +-
 qutebrowser/mainwindow/mainwindow.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 3fffbcfb7..34b7fa340 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -2201,6 +2201,6 @@ class CommandDispatcher:
                 window.state_before_fullscreen & ~Qt.WindowFullScreen)
         else:
             window.state_before_fullscreen = window.windowState()
-            window.showFullScreen()
+            window.setWindowState(Qt.WindowFullScreen | window.state_before_fullscreen)
         log.misc.debug('state before fullscreen: {}'.format(
             debug.qflags_key(Qt, window.state_before_fullscreen)))
diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index dff465c41..e853c3ea8 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -498,7 +498,7 @@ class MainWindow(QWidget):
         if not config.val.content.windowed_fullscreen:
             if on:
                 self.state_before_fullscreen = self.windowState()
-                self.showFullScreen()
+                self.setWindowState(Qt.WindowFullScreen | self.state_before_fullscreen)
             elif self.isFullScreen():
                 self.setWindowState(self.state_before_fullscreen)
         log.misc.debug('on: {}, state before fullscreen: {}'.format(

From 559059d244ccf95c56bd1c6f982f700ce13aa038 Mon Sep 17 00:00:00 2001
From: Christian Helbling <helbling@search.ch>
Date: Fri, 12 Jan 2018 11:21:55 +0100
Subject: [PATCH 107/574] simplify code - state_before_fullscreen seems not to
 be needed anymore

---
 qutebrowser/browser/commands.py      |  8 ++------
 qutebrowser/mainwindow/mainwindow.py | 10 ++--------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 34b7fa340..139ed93fc 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -2197,10 +2197,6 @@ class CommandDispatcher:
 
         window = self._tabbed_browser.window()
         if window.isFullScreen():
-            window.setWindowState(
-                window.state_before_fullscreen & ~Qt.WindowFullScreen)
+            window.setWindowState(window.windowState() & ~Qt.WindowFullScreen)
         else:
-            window.state_before_fullscreen = window.windowState()
-            window.setWindowState(Qt.WindowFullScreen | window.state_before_fullscreen)
-        log.misc.debug('state before fullscreen: {}'.format(
-            debug.qflags_key(Qt, window.state_before_fullscreen)))
+            window.setWindowState(window.windowState() | Qt.WindowFullScreen)
diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index e853c3ea8..726a2f152 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -134,7 +134,6 @@ class MainWindow(QWidget):
     Attributes:
         status: The StatusBar widget.
         tabbed_browser: The TabbedBrowser widget.
-        state_before_fullscreen: window state before activation of fullscreen.
         _downloadview: The DownloadView widget.
         _vbox: The main QVBoxLayout.
         _commandrunner: The main CommandRunner instance.
@@ -234,8 +233,6 @@ class MainWindow(QWidget):
 
         objreg.get("app").new_window.emit(self)
 
-        self.state_before_fullscreen = self.windowState()
-
     def _init_geometry(self, geometry):
         """Initialize the window geometry or load it from disk."""
         if geometry is not None:
@@ -497,12 +494,9 @@ class MainWindow(QWidget):
     def _on_fullscreen_requested(self, on):
         if not config.val.content.windowed_fullscreen:
             if on:
-                self.state_before_fullscreen = self.windowState()
-                self.setWindowState(Qt.WindowFullScreen | self.state_before_fullscreen)
+                self.setWindowState(self.windowState() | Qt.WindowFullScreen)
             elif self.isFullScreen():
-                self.setWindowState(self.state_before_fullscreen)
-        log.misc.debug('on: {}, state before fullscreen: {}'.format(
-            on, debug.qflags_key(Qt, self.state_before_fullscreen)))
+                self.setWindowState(self.windowState() & ~Qt.WindowFullScreen)
 
     @cmdutils.register(instance='main-window', scope='window')
     @pyqtSlot()

From f7a08dfd345659114d07e0e0bebe79523da82558 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 12 Jan 2018 16:57:05 -0500
Subject: [PATCH 108/574] use tabs.mode_on_change to persist or restore mode

---
 qutebrowser/mainwindow/tabbedbrowser.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index c51a7aaff..9c140f8a7 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -649,17 +649,23 @@ class TabbedBrowser(tabwidget.TabWidget):
             log.webview.debug("on_current_changed got called with invalid "
                               "index {}".format(idx))
             return
+        if self._now_focused and config.val.tabs.mode_on_change == 'restore':
+            current_mode = modeman.instance(self._win_id).mode
+            if not current_mode in (usertypes.KeyMode.insert,usertypes.KeyMode.passthrough):
+                current_mode = usertypes.KeyMode.normal
+            self._now_focused.data.input_mode = current_mode
 
         log.modes.debug("Current tab changed, focusing {!r}".format(tab))
         tab.setFocus()
 
         modes_to_leave = [usertypes.KeyMode.hint, usertypes.KeyMode.caret]
-        if not config.val.tabs.persist_mode_on_change:
+        if not config.val.tabs.mode_on_change == 'persist':
             modes_to_leave += [usertypes.KeyMode.insert,
                                usertypes.KeyMode.passthrough]
         for mode in modes_to_leave:
             modeman.leave(self._win_id, mode, 'tab changed', maybe=True)
-
+        if config.val.tabs.mode_on_change == 'restore':
+            modeman.enter(self._win_id, tab.data.input_mode, 'restore input mode for tab')
         if self._now_focused is not None:
             objreg.register('last-focused-tab', self._now_focused, update=True,
                             scope='window', window=self._win_id)

From c87d8d0d8f6c2a383ee98500f28991ecca76ad4a Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 12 Jan 2018 17:02:34 -0500
Subject: [PATCH 109/574] add propery to save tab input mode

---
 qutebrowser/browser/browsertab.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index eb0e55c4b..9b59f64fc 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -107,6 +107,7 @@ class TabData:
     override_target = attr.ib(None)
     pinned = attr.ib(False)
     fullscreen = attr.ib(False)
+    input_mode = usertypes.KeyMode.normal
 
 
 class AbstractAction:

From 5dbfff016e70941f86c3a2a95dd90e4bb644c2f4 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 12 Jan 2018 17:05:47 -0500
Subject: [PATCH 110/574] replace persist_mode_on_change with mode_on_change

supports old persist_mode_on_change functionality or new save/restore mode
---
 qutebrowser/config/configdata.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index a118a8b59..ebe52b7ea 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -1251,10 +1251,15 @@ tabs.padding:
   type: Padding
   desc: Padding (in pixels) around text for tabs.
 
-tabs.persist_mode_on_change:
-  default: false
-  type: Bool
-  desc: Stay in insert/passthrough mode when switching tabs.
+tabs.mode_on_change:
+  default: normal
+  type:
+    name: String
+    valid_values:
+      - persist: "retain the current mode."
+      - restore: "restore previously saved mode"
+      - normal:  "always revert to normal mode"
+  desc: When switching tabs, what input mode is applied.
 
 tabs.position:
   default: top

From 4ae33deebddfd10d542040cf7d6c2c9f78f06068 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 12 Jan 2018 17:24:20 -0500
Subject: [PATCH 111/574] add handler for qute://bindings

---
 qutebrowser/browser/qutescheme.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 8bcb7ff37..09ddba850 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -37,7 +37,7 @@ from PyQt5.QtCore import QUrlQuery, QUrl
 import qutebrowser
 from qutebrowser.config import config, configdata, configexc, configdiff
 from qutebrowser.utils import (version, utils, jinja, log, message, docutils,
-                               objreg, urlutils)
+                               objreg, urlutils, usertypes)
 from qutebrowser.misc import objects
 
 
@@ -423,6 +423,20 @@ def _qute_settings_set(url):
         return 'text/html', b'error: ' + str(e).encode('utf-8')
 
 
+@add_handler('bindings')
+def qute_bindings(url):
+    """Handler for qute://bindings View qute bindings."""
+
+    bindings = {}
+    html = ''
+    for mode in "normal hint command insert passthrough".split():
+        bindings[mode] = config.key_instance.get_bindings_for(mode)
+
+    html = jinja.render('bindings.html', title='bindings',
+                        bindings=bindings)
+    return 'text/html', html
+
+
 @add_handler('settings')
 def qute_settings(url):
     """Handler for qute://settings. View/change qute configuration."""

From 8940e05baf210bdeb9e24c7c0125d0e5b12a3e36 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 12 Jan 2018 17:27:44 -0500
Subject: [PATCH 112/574] bind without agruments shows current bindings

---
 qutebrowser/config/configcommands.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py
index 7d9adb475..8b6c3ce3f 100644
--- a/qutebrowser/config/configcommands.py
+++ b/qutebrowser/config/configcommands.py
@@ -96,7 +96,8 @@ class ConfigCommands:
     @cmdutils.register(instance='config-commands', maxsplit=1,
                        no_cmd_split=True, no_replace_variables=True)
     @cmdutils.argument('command', completion=configmodel.bind)
-    def bind(self, key, command=None, *, mode='normal', default=False):
+    @cmdutils.argument('win_id', win_id=True)
+    def bind(self, win_id, key=None, command=None, *, mode='normal', default=False):
         """Bind a key to a command.
 
         Args:
@@ -108,6 +109,13 @@ class ConfigCommands:
                   available modes.
             default: If given, restore a default binding.
         """
+
+        if key is None:
+            tabbed_browser = objreg.get('tabbed-browser', scope='window',
+                                        window=win_id)
+            tabbed_browser.openurl(QUrl('qute://bindings'), newtab=True)
+            return
+
         if command is None:
             if default:
                 # :bind --default: Restore default

From 3a7ac51a0018afbd5e6c8cf1def2799d013e17cb Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 12 Jan 2018 17:28:56 -0500
Subject: [PATCH 113/574] html template to render qute://bindings

---
 qutebrowser/html/bindings.html | 36 ++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 qutebrowser/html/bindings.html

diff --git a/qutebrowser/html/bindings.html b/qutebrowser/html/bindings.html
new file mode 100644
index 000000000..29c3f1883
--- /dev/null
+++ b/qutebrowser/html/bindings.html
@@ -0,0 +1,36 @@
+{% extends "base.html" %}
+
+{% block style %}
+html { margin:20px; }
+table { width:100%; border: 1px solid grey; border-collapse: collapse; margin:10px; }
+tr,td,p { margin:0; padding: 1px; }
+th, td { border: 1px solid grey; }
+th { background: lightgrey; }
+th pre { color: grey; text-align: left; }
+.key { width: 25%; }
+.command { width: 75% }
+{% endblock %}
+
+{% block content %}
+<header><h1>{{ title }}</h1></header>
+{% for mode, binding in bindings.items() %}
+<h2>Mode = {{ mode }}</h2>
+<table>
+    <tr>
+        <th>Key</th>
+        <th>Command</th>
+    </tr>
+  {% for key,command in binding.items() %}
+    <tr>
+      <td class="key">
+        <p>{{ key }}</p>
+      </td>
+      <td class="command">
+        <p>{{ command }}</p>
+      </td>
+    </tr>
+  {% endfor %}
+</table>
+{% endfor %}
+
+{% endblock %}

From 1e8694f3cc043179bac84b27d01c2d3537ce65aa Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 12 Jan 2018 17:35:04 -0500
Subject: [PATCH 114/574] remove unused module

---
 qutebrowser/browser/qutescheme.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 09ddba850..3d80c7b37 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -37,7 +37,7 @@ from PyQt5.QtCore import QUrlQuery, QUrl
 import qutebrowser
 from qutebrowser.config import config, configdata, configexc, configdiff
 from qutebrowser.utils import (version, utils, jinja, log, message, docutils,
-                               objreg, urlutils, usertypes)
+                               objreg, urlutils)
 from qutebrowser.misc import objects
 
 

From 4848182204c234f082e3e508588bc852873c78da Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 13 Jan 2018 01:39:05 -0500
Subject: [PATCH 115/574] code cleanup

- move qute_bindings block AFTER qute_settings block
- remove unnecessary variable declaration
---
 qutebrowser/browser/qutescheme.py | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 3d80c7b37..231af90bf 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -423,20 +423,6 @@ def _qute_settings_set(url):
         return 'text/html', b'error: ' + str(e).encode('utf-8')
 
 
-@add_handler('bindings')
-def qute_bindings(url):
-    """Handler for qute://bindings View qute bindings."""
-
-    bindings = {}
-    html = ''
-    for mode in "normal hint command insert passthrough".split():
-        bindings[mode] = config.key_instance.get_bindings_for(mode)
-
-    html = jinja.render('bindings.html', title='bindings',
-                        bindings=bindings)
-    return 'text/html', html
-
-
 @add_handler('settings')
 def qute_settings(url):
     """Handler for qute://settings. View/change qute configuration."""
@@ -449,6 +435,19 @@ def qute_settings(url):
     return 'text/html', html
 
 
+@add_handler('bindings')
+def qute_bindings(url):
+    """Handler for qute://bindings View qute bindings."""
+
+    bindings = {}
+    for mode in "normal hint command insert passthrough".split():
+        bindings[mode] = config.key_instance.get_bindings_for(mode)
+
+    html = jinja.render('bindings.html', title='bindings',
+                        bindings=bindings)
+    return 'text/html', html
+
+
 @add_handler('back')
 def qute_back(url):
     """Handler for qute://back.

From 141d020ede5a26cd7626d3c4555e0f2917edd342 Mon Sep 17 00:00:00 2001
From: Christian Helbling <helbling@search.ch>
Date: Sat, 13 Jan 2018 10:07:21 +0100
Subject: [PATCH 116/574] import debug is not needed anymore

---
 qutebrowser/browser/commands.py      | 2 +-
 qutebrowser/mainwindow/mainwindow.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 139ed93fc..edc25ea49 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -39,7 +39,7 @@ from qutebrowser.browser import (urlmarks, browsertab, inspector, navigate,
                                  webelem, downloads)
 from qutebrowser.keyinput import modeman
 from qutebrowser.utils import (message, usertypes, log, qtutils, urlutils,
-                               objreg, utils, debug, standarddir)
+                               objreg, utils, standarddir)
 from qutebrowser.utils.usertypes import KeyMode
 from qutebrowser.misc import editor, guiprocess
 from qutebrowser.completion.models import urlmodel, miscmodels
diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index 726a2f152..a5faf6dd1 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -30,7 +30,7 @@ from PyQt5.QtWidgets import QWidget, QVBoxLayout, QApplication, QSizePolicy
 from qutebrowser.commands import runners, cmdutils
 from qutebrowser.config import config, configfiles
 from qutebrowser.utils import (message, log, usertypes, qtutils, objreg, utils,
-                               jinja, debug)
+                               jinja)
 from qutebrowser.mainwindow import messageview, prompt
 from qutebrowser.completion import completionwidget, completer
 from qutebrowser.keyinput import modeman

From cd20c32973d44ea8b27957165936b87c459d1925 Mon Sep 17 00:00:00 2001
From: Christian Helbling <helbling@search.ch>
Date: Sat, 13 Jan 2018 10:26:41 +0100
Subject: [PATCH 117/574] simplify more

---
 qutebrowser/browser/commands.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index edc25ea49..f6f36b68e 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -2196,7 +2196,4 @@ class CommandDispatcher:
             return
 
         window = self._tabbed_browser.window()
-        if window.isFullScreen():
-            window.setWindowState(window.windowState() & ~Qt.WindowFullScreen)
-        else:
-            window.setWindowState(window.windowState() | Qt.WindowFullScreen)
+        window.setWindowState(window.windowState() ^ Qt.WindowFullScreen)

From 48b6c160f5ac5a1db2e30e5f3ba58109e180aa39 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 13 Jan 2018 15:52:49 -0500
Subject: [PATCH 118/574] improve styling as suggested by @jgkamat

---
 qutebrowser/browser/qutescheme.py | 2 +-
 qutebrowser/html/bindings.html    | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 3d80c7b37..487982c51 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -432,7 +432,7 @@ def qute_bindings(url):
     for mode in "normal hint command insert passthrough".split():
         bindings[mode] = config.key_instance.get_bindings_for(mode)
 
-    html = jinja.render('bindings.html', title='bindings',
+    html = jinja.render('bindings.html', title='Bindings',
                         bindings=bindings)
     return 'text/html', html
 
diff --git a/qutebrowser/html/bindings.html b/qutebrowser/html/bindings.html
index 29c3f1883..ef52e538f 100644
--- a/qutebrowser/html/bindings.html
+++ b/qutebrowser/html/bindings.html
@@ -1,12 +1,7 @@
-{% extends "base.html" %}
+{% extends "styled.html" %}
 
 {% block style %}
-html { margin:20px; }
-table { width:100%; border: 1px solid grey; border-collapse: collapse; margin:10px; }
-tr,td,p { margin:0; padding: 1px; }
-th, td { border: 1px solid grey; }
-th { background: lightgrey; }
-th pre { color: grey; text-align: left; }
+th { text-align:left; }
 .key { width: 25%; }
 .command { width: 75% }
 {% endblock %}

From 81b85994a12dd2cbf19b6b118496743eb6f7135b Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sun, 14 Jan 2018 13:29:51 -0500
Subject: [PATCH 119/574] document code a bit more

---
 qutebrowser/browser/browsertab.py       | 1 +
 qutebrowser/mainwindow/tabbedbrowser.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 9b59f64fc..c9d2f540a 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -99,6 +99,7 @@ class TabData:
                          Only used for QtWebKit.
         pinned: Flag to pin the tab.
         fullscreen: Whether the tab has a video shown fullscreen currently.
+        input_mode: current input mode for the tab. (insert, passthrough, normal)
     """
 
     keep_icon = attr.ib(False)
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 9c140f8a7..896e2f8ab 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -651,6 +651,7 @@ class TabbedBrowser(tabwidget.TabWidget):
             return
         if self._now_focused and config.val.tabs.mode_on_change == 'restore':
             current_mode = modeman.instance(self._win_id).mode
+            # only save insert & passthrough mode. otherwise default to normal
             if not current_mode in (usertypes.KeyMode.insert,usertypes.KeyMode.passthrough):
                 current_mode = usertypes.KeyMode.normal
             self._now_focused.data.input_mode = current_mode

From 8c8cb3bc293dab0908706b6034aab1d2dcddd4e5 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 14 Jan 2018 20:20:51 +0100
Subject: [PATCH 120/574] Fix crash when clicking <form> element with
 name="value" child

https://stackoverflow.com/q/22942689/2085149

Fixes #2877
See #2569
---
 doc/changelog.asciidoc                    |  1 +
 qutebrowser/javascript/.eslintrc.yaml     |  2 +-
 qutebrowser/javascript/webelem.js         | 17 +++++++++++++++--
 tests/end2end/data/issue2569.html         |  4 ++++
 tests/end2end/features/javascript.feature |  6 ++++++
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 8c3a533a2..ac7b33ec8 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -136,6 +136,7 @@ Fixed
 - Fix crash when closing a tab immediately after hinting.
 - Worked around issues in Qt 5.10 with loading progress never being finished.
 - Fixed a crash when writing a flag before a command (e.g. `:-w open `).
+- Fixed a crash when clicking certain form elements with QtWebEngine.
 
 Deprecated
 ~~~~~~~~~~
diff --git a/qutebrowser/javascript/.eslintrc.yaml b/qutebrowser/javascript/.eslintrc.yaml
index 6fdd16639..2e4de98fc 100644
--- a/qutebrowser/javascript/.eslintrc.yaml
+++ b/qutebrowser/javascript/.eslintrc.yaml
@@ -33,7 +33,7 @@ rules:
      no-extra-parens: off
      id-length: ["error", {"exceptions": ["i", "k", "x", "y"]}]
      object-shorthand: "off"
-     max-statements: ["error", {"max": 30}]
+     max-statements: ["error", {"max": 40}]
      quotes: ["error", "double", {"avoidEscape": true}]
      object-property-newline: ["error", {"allowMultiplePropertiesPerLine": true}]
      comma-dangle: ["error", "always-multiline"]
diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index b5fd936b2..61b537504 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -66,13 +66,14 @@ window._qutebrowser.webelem = (function() {
 
         const out = {
             "id": id,
-            "value": elem.value,
-            "outer_xml": elem.outerHTML,
             "rects": [],  // Gets filled up later
             "caret_position": caret_position,
         };
 
+        // Deal with various fun things which can happen in form elements
         // https://github.com/qutebrowser/qutebrowser/issues/2569
+        // https://github.com/qutebrowser/qutebrowser/issues/2877
+        // https://stackoverflow.com/q/22942689/2085149
         if (typeof elem.tagName === "string") {
             out.tag_name = elem.tagName;
         } else if (typeof elem.nodeName === "string") {
@@ -88,6 +89,18 @@ window._qutebrowser.webelem = (function() {
             out.class_name = "";
         }
 
+        if (typeof elem.value === "string" || typeof elem.value === "number") {
+            out.value = elem.value;
+        } else {
+            out.value = "";
+        }
+
+        if (typeof elem.outerHTML === "string") {
+            out.outer_xml = elem.outerHTML;
+        } else {
+            out.outer_xml = "";
+        }
+
         if (typeof elem.textContent === "string") {
             out.text = elem.textContent;
         } else if (typeof elem.text === "string") {
diff --git a/tests/end2end/data/issue2569.html b/tests/end2end/data/issue2569.html
index 8f613be2d..a21690bd6 100644
--- a/tests/end2end/data/issue2569.html
+++ b/tests/end2end/data/issue2569.html
@@ -15,6 +15,10 @@
         <form id="textform">
             <input name="text" type="text">
         </form>
+        <!-- Happens on the GitHub "new file" page -->
+        <form id="valueform">
+            <input name="value" type="text">
+        </form>
         <!-- Some regressions after we added type checking -->
         <svg xmlns="http://www.w3.org/2000/svg" width="30" height="20" viewBox="0 0 3 2" id="icon">
             <rect width="1" height="2" x="0" fill="#008d46" />
diff --git a/tests/end2end/features/javascript.feature b/tests/end2end/features/javascript.feature
index 3ccd50efb..c74811b4b 100644
--- a/tests/end2end/features/javascript.feature
+++ b/tests/end2end/features/javascript.feature
@@ -90,6 +90,12 @@ Feature: Javascript stuff
         And I wait for "Sending fake click to *" in the log
         Then no crash should happen
 
+    Scenario: Clicking on form element with value child
+        When I open data/issue2569.html
+        And I run :click-element id valueform
+        And I wait for "Sending fake click to *" in the log
+        Then no crash should happen
+
     Scenario: Clicking on svg element
         When I open data/issue2569.html
         And I run :click-element id icon

From 05d076ba9f9c40e414ed0ca40326d35044d7005d Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 15 Jan 2018 09:00:06 -0500
Subject: [PATCH 121/574] fix asciidoc for tabs.mode_on_change

---
 doc/help/settings.asciidoc        | 18 ++++++++++++------
 qutebrowser/config/configdata.yml |  6 +++---
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 53af8399d..6b5fe34c9 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -241,7 +241,7 @@
 |<<tabs.new_position.related,tabs.new_position.related>>|Position of new tabs opened from another tab.
 |<<tabs.new_position.unrelated,tabs.new_position.unrelated>>|Position of new tabs which aren't opened from another tab.
 |<<tabs.padding,tabs.padding>>|Padding (in pixels) around text for tabs.
-|<<tabs.persist_mode_on_change,tabs.persist_mode_on_change>>|Stay in insert/passthrough mode when switching tabs.
+|<<tabs.mode_on_change,tabs.mode_on_change>>|Set input mode behavior when switching tab.
 |<<tabs.pinned.shrink,tabs.pinned.shrink>>|Shrink pinned tabs down to their contents.
 |<<tabs.position,tabs.position>>|Position of the tab bar.
 |<<tabs.select_on_remove,tabs.select_on_remove>>|Which tab to select when the focused tab is removed.
@@ -2824,13 +2824,19 @@ Default:
 - +pass:[right]+: +pass:[5]+
 - +pass:[top]+: +pass:[0]+
 
-[[tabs.persist_mode_on_change]]
-=== tabs.persist_mode_on_change
-Stay in insert/passthrough mode when switching tabs.
+[[tabs.mode_on_change]]
+=== tabs.mode_on_change
+When switching tabs, what input mode is applied.
 
-Type: <<types,Bool>>
+Type: <<types,String>>
 
-Default: +pass:[false]+
+Valid values:
+
+ * +persist+: Retain the current mode.
+ * +restore+: Restore previously saved mode.
+ * +normal+: Always revert to normal mode.
+
+Default: +pass:[normal]+
 
 [[tabs.pinned.shrink]]
 === tabs.pinned.shrink
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index ebe52b7ea..921034288 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -1256,9 +1256,9 @@ tabs.mode_on_change:
   type:
     name: String
     valid_values:
-      - persist: "retain the current mode."
-      - restore: "restore previously saved mode"
-      - normal:  "always revert to normal mode"
+      - persist: "Retain the current mode."
+      - restore: "Restore previously saved mode."
+      - normal:  "Always revert to normal mode."
   desc: When switching tabs, what input mode is applied.
 
 tabs.position:

From f2beaa455e0d40c94ed4a8f28e3e081cefd0bb12 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 15 Jan 2018 16:44:12 +0100
Subject: [PATCH 122/574] Update hypothesis from 3.44.13 to 3.44.16

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index e5f9d35af..574dbdb28 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -11,7 +11,7 @@ fields==5.0.0
 Flask==0.12.2
 glob2==0.6
 hunter==2.0.2
-hypothesis==3.44.13
+hypothesis==3.44.16
 itsdangerous==0.24
 # Jinja2==2.10
 Mako==1.0.7

From d3f3be03ddeba658a3e244aefd9a62e25c444bef Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 15 Jan 2018 19:29:14 +0100
Subject: [PATCH 123/574] Update changelog for v1.1.0

---
 doc/changelog.asciidoc | 101 +++++++++++++++++++++--------------------
 1 file changed, 52 insertions(+), 49 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index ac7b33ec8..de5697679 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -15,8 +15,8 @@ breaking changes (such as renamed commands) can happen in minor releases.
 // `Fixed` for any bug fixes.
 // `Security` to invite users to upgrade in case of vulnerabilities.
 
-v1.1.0 (unreleased)
--------------------
+v1.1.0
+------
 
 Added
 ~~~~~
@@ -26,43 +26,50 @@ Added
 - There's now a `misc/Makefile` file in releases, which should help
   distributions which package qutebrowser, as they can run something like
   `make -f misc/Makefile DESTDIR="$pkgdir" install` now.
-- New `{current_url}` field for `window.title_format` and `tabs.title.format`.
-- New `colors.statusbar.passthrough.fg`/`.bg` settings.
-- New `completion.delay` and `completion.min_chars` settings to update the
-  completion less often.
-- New `completion.use_best_match` setting to automatically use the best-matching
-  command in the completion.
-- New `:tab-give` and `:tab-take` commands, to give tabs to another window, or
-  take them from another window.
+- New fields for `window.title_format` and `tabs.title.format`:
+  * `{current_url}`
+  * `{protocol}`
+- New settings:
+  * `colors.statusbar.passthrough.fg`/`.bg`
+  * `completion.delay` and `completion.min_chars` to update the completion less
+    often.
+  * `completion.use_best_match` to automatically use the best-matching
+    command in the completion.
+  * `keyhint.radius` to configure the edge rounding for the key hint widget.
+  * `qt.highdpi` to turn on Qt's High-DPI scaling.
+  * `tabs.pinned.shrink` (`true` by default) to make it possible
+    for pinned tabs and normal tabs to have the same size.
+  * `content.windowed_fullscreen` to show e.g. a fullscreened video in the
+    window without fullscreening that window.
+  * `tabs.persist_mode_on_change` to keep the current mode when
+    switching tabs.
+  * `session.lazy_restore` which allows to not load pages immediately
+    when restoring a session.
+- New commands:
+  * `:tab-give` and `:tab-take`, to give tabs to another window, or take them
+    from another window.
+  * `:completion-item-yank` (bound to `<Ctrl-C>`) to yank the current
+    completion item text.
+  * `:edit-command` to edit the commandline in an editor.
+  * `search.incremental` for incremental text search.
+- New flags for existing commands:
+  * `-o` flag for `:spawn` to show stdout/stderr in a new tab.
+  * `--rapid` flag for `:command-accept` (bound to `Ctrl-Enter` by default),
+    which allows executing a command in the completion without closing it.
+  * `--private` and `--related` flags for `:edit-url`, which have the
+    same effect they have with `:open`.
+  * `--history` for `:completion-item-focus` which causes it to go
+    through the command history when no text was entered. The default bindings for
+    cursor keys in the completion changed to use that, so that they can be used
+    again to navigate through completion items when a text was entered.
+  * `--file` for `:debug-pyeval` which makes it take a filename instead of a
+    line of code.
 - New `config.source(...)` method for `config.py` to source another file.
-- New `keyhint.radius` option to configure the edge rounding for the key hint
-  widget.
-- `:edit-url` now handles the `--private` and `--related` flags, which have the
-  same effect they have with `:open`.
 - New `{line}` and `{column}` replacements for `editor.command` to position the
   cursor correctly.
 - New `qute-pass` userscript as alternative to `password_fill` which allows
   selecting accounts via rofi or any other dmenu-compatile application.
-- New `qt.highdpi` setting to turn on Qt's High-DPI scaling.
-- New `:completion-item-yank` command (bound to `<Ctrl-C>`) to yank the current
-  completion item text.
-- New `tabs.pinned.shrink` setting to (`true` by default) to make it possible
-  for pinned tabs and normal tabs to have the same size.
-- New `content.windowed_fullscreen` setting to show e.g. a fullscreened video in
-  the window without fullscreening that window.
-- New `:edit-command` command to edit the commandline in an editor.
-- New `tabs.persist_mode_on_change` setting to keep the current mode when
-  switching tabs.
-- New `session.lazy_restore` setting which allows to not load pages immediately
-  when restoring a session.
 - New `hist_importer.py` script to import history from Firefox/Chromium.
-- New `{protocol}` replacement for `tabs.title.format` and friends.
-- New `-o` flag for `:spawn` to show stdout/stderr in a new tab.
-- Support for incremental search, with a new `search.incremental` setting.
-- New `--rapid` flag for `:command-accept` (bound to `Ctrl-Enter` by default),
-  which allows executing a command in the completion without closing it.
-- The `colors.completion.fg` setting can now be a list, allowing to specify
-  different colors for the three completion columns.
 
 Changed
 ~~~~~~~
@@ -73,13 +80,15 @@ Changed
   * `tabs.indicator_padding` -> `tabs.indicator.padding`
   * `session_default_name` -> `session.default_name`
   * `ignore_case` -> `search.ignore_case`
+- Much improved user stylesheet handling for QtWebEngine which reduces
+  flickering and updates immediately after setting a stylesheet.
 - High-DPI favicons are now used when available.
 - The `asciidoc2html.py` script now uses Pygments (which is already a dependency
   of qutebrowser) instead of `source-highlight` for syntax highlighting.
 - The `:buffer` command now doesn't require quoting anymore, similar to `:open`.
 - The `importer.py` script was largely rewritten and now also supports importing
   from Firefox' `places.sqlite` file and Chrome/Chromium profiles.
-- Various internal refactorings to use Python 3.5 and ECMAscript 6 features
+- Various internal refactorings to use Python 3.5 and ECMAscript 6 features.
 - If the `window.hide_wayland_decoration` setting is False, but
   `QT_WAYLAND_DISABLE_WINDOWDECORATION` is set in the environment,
   the decorations are still hidden.
@@ -91,17 +100,9 @@ Changed
 - The `qute://version` page now also shows the uptime of qutebrowser.
 - qutebrowser now prompts to create a non-existing directory when starting a
   download.
-- Much improved user stylesheet handling which reduces flickering
-  and updates immediately after setting a stylesheet.
-- `:completion-item-focus` now has a `--history` flag which causes it to go
-  through the command history when no text was entered. The default bindings for
-  cursor keys in the completion changed to use that, so that they can be used
-  again to navigate through completion items when a text was entered.
-- `:debug-pyeval` now has a `--file` argument so it takes a filename instead of
-  a line of code.
-- `:jseval --file` now searches relative paths in a js/ subdir in qutebrowser's
-  data dir, e.g. `~/.local/share/qutebrowser/js`.
-- The current/default bindings are now shown in the :bind completion.
+- `:jseval --file` now searches relative paths in a `js/` subdir in
+  qutebrowser's data dir, e.g. `~/.local/share/qutebrowser/js`.
+- The current/default bindings are now shown in the ``:bind` completion.
 - Empty categories are now hidden in the `:open` completion.
 - Search terms for URLs and titles can now be mixed when filtering the
   completion.
@@ -111,27 +112,29 @@ Changed
 - The system's default encoding (rather than UTF-8) is now used to decode
   subprocess output.
 - qutebrowser now ensures it's focused again after an external editor is closed.
+- The `colors.completion.fg` setting can now be a list, allowing to specify
+  different colors for the three completion columns.
 
 Fixed
 ~~~~~
 
 - More consistent sizing for favicons with vertical tabs.
 - Using `:home` on pinned tabs is now prevented.
-- Fix crash with unknown file types loaded via qute://help.
+- Fix crash with unknown file types loaded via `qute://help`.
 - Scrolling performance improvements.
 - Sites like `qute://help` now redirect to `qute://help/` to make sure links
   work properly.
 - Fixes for the size calculation of pinned tabs in the tab bar.
 - Worked around a crash with PyQt 5.9.1 compiled against Qt < 5.9.1 when using
-  :yank or qute:// URLs.
-- Fixed crash when opening `qute://help/img`
+  `:yank` or `qute://` URLs.
+- Fixed crash when opening `qute://help/img`.
 - Fixed `gU` (`:navigate up`) on `qute://help` and webservers not handling `..`
   in a URL.
 - Using e.g. `-s backend webkit` to set the backend now works correctly.
 - Fixed crash when closing the tab an external editor was opened in.
 - When using `:search-next` before a search is finished, no warning about no
   results being found is shown anymore.
-- Fix :click-element with an ID containing non-alphanumeric characters.
+- Fix `:click-element` with an ID containing non-alphanumeric characters.
 - Fix crash when a subprocess outputs data which is not decodable as UTF-8.
 - Fix crash when closing a tab immediately after hinting.
 - Worked around issues in Qt 5.10 with loading progress never being finished.

From fbbb9ae9408d2e4bdabd0b90e3275af387c383d8 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 15 Jan 2018 19:39:16 +0100
Subject: [PATCH 124/574] Release v1.1.0

---
 qutebrowser/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/__init__.py b/qutebrowser/__init__.py
index 6859abedc..1b1ec4c40 100644
--- a/qutebrowser/__init__.py
+++ b/qutebrowser/__init__.py
@@ -26,7 +26,7 @@ __copyright__ = "Copyright 2014-2017 Florian Bruhin (The Compiler)"
 __license__ = "GPL"
 __maintainer__ = __author__
 __email__ = "mail@qutebrowser.org"
-__version_info__ = (1, 0, 4)
+__version_info__ = (1, 1, 0)
 __version__ = '.'.join(str(e) for e in __version_info__)
 __description__ = "A keyboard-driven, vim-like browser based on PyQt5."
 

From 7d620a4bfc80c3120071d91cb3492111621ed3de Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 15 Jan 2018 13:39:42 -0500
Subject: [PATCH 125/574] fix pylint/flake8 errors

---
 qutebrowser/mainwindow/tabbedbrowser.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 896e2f8ab..b325b5e1c 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -652,7 +652,8 @@ class TabbedBrowser(tabwidget.TabWidget):
         if self._now_focused and config.val.tabs.mode_on_change == 'restore':
             current_mode = modeman.instance(self._win_id).mode
             # only save insert & passthrough mode. otherwise default to normal
-            if not current_mode in (usertypes.KeyMode.insert,usertypes.KeyMode.passthrough):
+            input_modes = (usertypes.KeyMode.insert, usertypes.KeyMode.passthrough)
+            if current_mode not in input_modes:
                 current_mode = usertypes.KeyMode.normal
             self._now_focused.data.input_mode = current_mode
 

From f6cfb0c529436cd3fee53325a91b9e3df7e33049 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 15 Jan 2018 15:44:21 -0500
Subject: [PATCH 126/574] add missing super() call

---
 qutebrowser/html/bindings.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qutebrowser/html/bindings.html b/qutebrowser/html/bindings.html
index ef52e538f..28bbb2baf 100644
--- a/qutebrowser/html/bindings.html
+++ b/qutebrowser/html/bindings.html
@@ -1,6 +1,7 @@
 {% extends "styled.html" %}
 
 {% block style %}
+{{ super() }}
 th { text-align:left; }
 .key { width: 25%; }
 .command { width: 75% }

From 9b473093b1c5e17ea2ae5c4b8a7d8fddb703b30c Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 15 Jan 2018 15:45:29 -0500
Subject: [PATCH 127/574] silence pylint warning

---
 qutebrowser/browser/qutescheme.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index bae9a16dd..e1b6c390a 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -439,6 +439,7 @@ def qute_settings(url):
 def qute_bindings(url):
     """Handler for qute://bindings View qute bindings."""
 
+    _url = url
     bindings = {}
     for mode in "normal hint command insert passthrough".split():
         bindings[mode] = config.key_instance.get_bindings_for(mode)

From 528b48dab6639f98afe19ea0231c263dba8faa78 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 15 Jan 2018 15:51:14 -0500
Subject: [PATCH 128/574] fix line too

---
 qutebrowser/config/configcommands.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py
index 8b6c3ce3f..014235bf7 100644
--- a/qutebrowser/config/configcommands.py
+++ b/qutebrowser/config/configcommands.py
@@ -97,7 +97,8 @@ class ConfigCommands:
                        no_cmd_split=True, no_replace_variables=True)
     @cmdutils.argument('command', completion=configmodel.bind)
     @cmdutils.argument('win_id', win_id=True)
-    def bind(self, win_id, key=None, command=None, *, mode='normal', default=False):
+    def bind(self, win_id, key=None, command=None, *, mode='normal',
+             default=False):
         """Bind a key to a command.
 
         Args:

From 2a274f0d8bfde14869e2922a29dc810c92c9ab8a Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 15 Jan 2018 15:52:15 -0500
Subject: [PATCH 129/574] add test for bind without args and fix other tests to
 include win_id

---
 tests/unit/config/test_configcommands.py | 28 ++++++++++++++++--------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/tests/unit/config/test_configcommands.py b/tests/unit/config/test_configcommands.py
index 4c0c833a1..92796e8e5 100644
--- a/tests/unit/config/test_configcommands.py
+++ b/tests/unit/config/test_configcommands.py
@@ -429,6 +429,16 @@ class TestBind:
         """Get a dict with no bindings."""
         return {'normal': {}}
 
+    def test_bind_no_args(self, commands, config_stub, no_bindings,
+                          tabbed_browser_stubs):
+        """Run ':bind'.
+
+        Should open qute://bindings."""
+        config_stub.val.bindings.default = no_bindings
+        config_stub.val.bindings.commands = no_bindings
+        commands.bind(win_id=0)
+        assert tabbed_browser_stubs[0].opened_url == QUrl('qute://bindings')
+
     @pytest.mark.parametrize('command', ['nop', 'nope'])
     def test_bind(self, commands, config_stub, no_bindings, key_config_stub,
                   command):
@@ -437,7 +447,7 @@ class TestBind:
         config_stub.val.bindings.default = no_bindings
         config_stub.val.bindings.commands = no_bindings
 
-        commands.bind('a', command)
+        commands.bind(0, 'a', command)
         assert key_config_stub.get_command('a', 'normal') == command
         yaml_bindings = config_stub._yaml['bindings.commands']['normal']
         assert yaml_bindings['a'] == command
@@ -474,7 +484,7 @@ class TestBind:
             'normal': {'c': 'message-info c'}
         }
 
-        commands.bind(key, mode=mode)
+        commands.bind(0, key, mode=mode)
 
         msg = message_mock.getmsg(usertypes.MessageLevel.info)
         assert msg.text == expected
@@ -486,7 +496,7 @@ class TestBind:
         """
         with pytest.raises(cmdexc.CommandError,
                            match='Invalid mode wrongmode!'):
-            commands.bind('a', 'nop', mode='wrongmode')
+            commands.bind(0, 'a', 'nop', mode='wrongmode')
 
     def test_bind_print_invalid_mode(self, commands):
         """Run ':bind --mode=wrongmode a'.
@@ -495,7 +505,7 @@ class TestBind:
         """
         with pytest.raises(cmdexc.CommandError,
                            match='Invalid mode wrongmode!'):
-            commands.bind('a', mode='wrongmode')
+            commands.bind(0, 'a', mode='wrongmode')
 
     @pytest.mark.parametrize('key', ['a', 'b', '<Ctrl-X>'])
     def test_bind_duplicate(self, commands, config_stub, key_config_stub, key):
@@ -510,12 +520,12 @@ class TestBind:
             'normal': {'b': 'nop'},
         }
 
-        commands.bind(key, 'message-info foo', mode='normal')
+        commands.bind(0, key, 'message-info foo', mode='normal')
         assert key_config_stub.get_command(key, 'normal') == 'message-info foo'
 
     def test_bind_none(self, commands, config_stub):
         config_stub.val.bindings.commands = None
-        commands.bind(',x', 'nop')
+        commands.bind(0, ',x', 'nop')
 
     def test_bind_default(self, commands, key_config_stub, config_stub):
         """Bind a key to its default."""
@@ -525,7 +535,7 @@ class TestBind:
         config_stub.val.bindings.commands = {'normal': {'a': bound_cmd}}
         assert key_config_stub.get_command('a', mode='normal') == bound_cmd
 
-        commands.bind('a', mode='normal', default=True)
+        commands.bind(0, 'a', mode='normal', default=True)
 
         assert key_config_stub.get_command('a', mode='normal') == default_cmd
 
@@ -539,7 +549,7 @@ class TestBind:
         Should show an error.
         """
         with pytest.raises(cmdexc.CommandError, match=expected):
-            commands.bind(key, mode=mode, default=True)
+            commands.bind(0, key, mode=mode, default=True)
 
     def test_unbind_none(self, commands, config_stub):
         config_stub.val.bindings.commands = None
@@ -563,7 +573,7 @@ class TestBind:
         }
         if key == 'c':
             # Test :bind and :unbind
-            commands.bind(key, 'nop')
+            commands.bind(0, key, 'nop')
 
         commands.unbind(key)
         assert key_config_stub.get_command(key, 'normal') is None

From fb0a418d0a0abba10bff7256bd265efdcfa2054d Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 15 Jan 2018 16:03:22 -0500
Subject: [PATCH 130/574] use url even if we do not need it

---
 qutebrowser/browser/qutescheme.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index e1b6c390a..b15c2133b 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -438,8 +438,8 @@ def qute_settings(url):
 @add_handler('bindings')
 def qute_bindings(url):
     """Handler for qute://bindings View qute bindings."""
+    assert url
 
-    _url = url
     bindings = {}
     for mode in "normal hint command insert passthrough".split():
         bindings[mode] = config.key_instance.get_bindings_for(mode)

From 9bb256b54502c1c463a1d631b9fccdd2d88bcc03 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 15 Jan 2018 16:19:38 -0500
Subject: [PATCH 131/574] shorten lines

---
 qutebrowser/browser/browsertab.py       | 2 +-
 qutebrowser/mainwindow/tabbedbrowser.py | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index c9d2f540a..41e4f1eaf 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -99,7 +99,7 @@ class TabData:
                          Only used for QtWebKit.
         pinned: Flag to pin the tab.
         fullscreen: Whether the tab has a video shown fullscreen currently.
-        input_mode: current input mode for the tab. (insert, passthrough, normal)
+        input_mode: current input mode for the tab.
     """
 
     keep_icon = attr.ib(False)
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index b325b5e1c..0d1487f50 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -652,8 +652,8 @@ class TabbedBrowser(tabwidget.TabWidget):
         if self._now_focused and config.val.tabs.mode_on_change == 'restore':
             current_mode = modeman.instance(self._win_id).mode
             # only save insert & passthrough mode. otherwise default to normal
-            input_modes = (usertypes.KeyMode.insert, usertypes.KeyMode.passthrough)
-            if current_mode not in input_modes:
+            modes = (usertypes.KeyMode.insert, usertypes.KeyMode.passthrough)
+            if current_mode not in modes:
                 current_mode = usertypes.KeyMode.normal
             self._now_focused.data.input_mode = current_mode
 
@@ -667,7 +667,8 @@ class TabbedBrowser(tabwidget.TabWidget):
         for mode in modes_to_leave:
             modeman.leave(self._win_id, mode, 'tab changed', maybe=True)
         if config.val.tabs.mode_on_change == 'restore':
-            modeman.enter(self._win_id, tab.data.input_mode, 'restore input mode for tab')
+            modeman.enter(self._win_id, tab.data.input_mode,
+                          'restore input mode for tab')
         if self._now_focused is not None:
             objreg.register('last-focused-tab', self._now_focused, update=True,
                             scope='window', window=self._win_id)

From d06f07af80f1858d960d4ea6edd71546da280d93 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 15 Jan 2018 22:42:12 +0100
Subject: [PATCH 132/574] Fix Makefile and make sure it's tested

Fixes #3492
---
 doc/changelog.asciidoc       | 8 ++++++++
 misc/Makefile                | 2 +-
 scripts/dev/build_release.py | 9 +++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index de5697679..adcf8fdaa 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -15,6 +15,14 @@ breaking changes (such as renamed commands) can happen in minor releases.
 // `Fixed` for any bug fixes.
 // `Security` to invite users to upgrade in case of vulnerabilities.
 
+v1.1.1 (unreleased)
+-------------------
+
+Fixed
+~~~~~
+
+- The Makefile now actually works.
+
 v1.1.0
 ------
 
diff --git a/misc/Makefile b/misc/Makefile
index fe97eb6bf..714223d10 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -21,5 +21,5 @@ install: doc/qutebrowser.1.html
 		$(wildcard misc/userscripts/*)
 	install -Dm755 -t "$(DESTDIR)/usr/share/qutebrowser/scripts/" \
 		$(filter-out scripts/__init__.py scripts/__pycache__ scripts/dev \
-		  scripts/testbrowser_cpp scripts/asciidoc2html.py scripts/setupcommon.py \
+		  scripts/testbrowser scripts/asciidoc2html.py scripts/setupcommon.py \
 			scripts/link_pyqt.py,$(wildcard scripts/*))
diff --git a/scripts/dev/build_release.py b/scripts/dev/build_release.py
index ce0ea2b8e..aa4046adc 100755
--- a/scripts/dev/build_release.py
+++ b/scripts/dev/build_release.py
@@ -328,6 +328,14 @@ def build_sdist():
     return artifacts
 
 
+def test_makefile():
+    """Make sure the Makefile works correctly."""
+    utils.print_title("Testing makefile")
+    with tempfile.TemporaryDirectory() as tmpdir:
+        subprocess.run(['make', '-f', 'misc/Makefile',
+                        'DESTDIR={}'.format(tmpdir), 'install'], check=True)
+
+
 def read_github_token():
     """Read the GitHub API token from disk."""
     token_file = os.path.join(os.path.expanduser('~'), '.gh_token')
@@ -403,6 +411,7 @@ def main():
     elif sys.platform == 'darwin':
         artifacts = build_mac()
     else:
+        test_makefile()
         artifacts = build_sdist()
         upload_to_pypi = True
 

From e25a33790fc3f68f024dd9eae8eccf0dba3102d5 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 15 Jan 2018 20:44:56 -0500
Subject: [PATCH 133/574] remove blank line to satisfy flake8

---
 qutebrowser/config/configcommands.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py
index 014235bf7..cc3eae514 100644
--- a/qutebrowser/config/configcommands.py
+++ b/qutebrowser/config/configcommands.py
@@ -110,7 +110,6 @@ class ConfigCommands:
                   available modes.
             default: If given, restore a default binding.
         """
-
         if key is None:
             tabbed_browser = objreg.get('tabbed-browser', scope='window',
                                         window=win_id)

From d5f7ec437249d05516fa65832bf27906d9000db7 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 17 Jan 2018 11:43:31 +0100
Subject: [PATCH 134/574] Update changelog

---
 doc/changelog.asciidoc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index adcf8fdaa..b451b14e9 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -15,6 +15,15 @@ breaking changes (such as renamed commands) can happen in minor releases.
 // `Fixed` for any bug fixes.
 // `Security` to invite users to upgrade in case of vulnerabilities.
 
+v1.2.0 (unreleased)
+-------------------
+
+Changed
+~~~~~~~
+
+- The `hist_importer.py` script now only imports URL schemes qutebrowser can
+  handle.
+
 v1.1.1 (unreleased)
 -------------------
 

From 54a93dfcf81c280e5168b76d17eabaebafc7011a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 17 Jan 2018 13:27:32 +0100
Subject: [PATCH 135/574] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index b451b14e9..cc53bb2d7 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -23,6 +23,7 @@ Changed
 
 - The `hist_importer.py` script now only imports URL schemes qutebrowser can
   handle.
+- Deleting a prefix (`:`, `/` or `?`) via backspace now leaves command mode.
 
 v1.1.1 (unreleased)
 -------------------

From 06075a49747411c0dad06339e8059856bb56abaa Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 17 Jan 2018 13:38:54 +0100
Subject: [PATCH 136/574] Update docs

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index cc53bb2d7..0fda24662 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -24,6 +24,7 @@ Changed
 - The `hist_importer.py` script now only imports URL schemes qutebrowser can
   handle.
 - Deleting a prefix (`:`, `/` or `?`) via backspace now leaves command mode.
+- Angular 1 elements now get hints assigned.
 
 v1.1.1 (unreleased)
 -------------------

From 23bdee06b3e4184ea734fe55518584f99248c348 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 17 Jan 2018 14:42:13 +0100
Subject: [PATCH 137/574] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 0fda24662..0c5669ba4 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -25,6 +25,7 @@ Changed
   handle.
 - Deleting a prefix (`:`, `/` or `?`) via backspace now leaves command mode.
 - Angular 1 elements now get hints assigned.
+- `:tab-only` with pinned tabs now still closes unpinned tabs.
 
 v1.1.1 (unreleased)
 -------------------

From c86eaa17e2f64f8692ee3d8ca2cca36d0610f8bf Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 17 Jan 2018 15:54:32 +0100
Subject: [PATCH 138/574] Update changelog

---
 doc/changelog.asciidoc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 0c5669ba4..08dc2fbce 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -27,6 +27,11 @@ Changed
 - Angular 1 elements now get hints assigned.
 - `:tab-only` with pinned tabs now still closes unpinned tabs.
 
+Fixed
+~~~~~
+
+- Improved fullscreen handling with Qt 5.10.
+
 v1.1.1 (unreleased)
 -------------------
 

From 5db44936678024e83ba6dabdf53753039991c57b Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Wed, 17 Jan 2018 10:11:32 -0500
Subject: [PATCH 139/574] @The-Compiler requested changes addressed.

---
 qutebrowser/browser/qutescheme.py | 10 +++++-----
 qutebrowser/html/bindings.html    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index b15c2133b..c252c82b8 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -436,12 +436,12 @@ def qute_settings(url):
 
 
 @add_handler('bindings')
-def qute_bindings(url):
-    """Handler for qute://bindings View qute bindings."""
-    assert url
-
+def qute_bindings(_url):
+    """Handler for qute://bindings. View keybindings."""
     bindings = {}
-    for mode in "normal hint command insert passthrough".split():
+    defaults = config.val.bindings.default
+    modes = set(defaults.keys()).union(config.val.bindings.commands)
+    for mode in modes:
         bindings[mode] = config.key_instance.get_bindings_for(mode)
 
     html = jinja.render('bindings.html', title='Bindings',
diff --git a/qutebrowser/html/bindings.html b/qutebrowser/html/bindings.html
index 28bbb2baf..fe6913402 100644
--- a/qutebrowser/html/bindings.html
+++ b/qutebrowser/html/bindings.html
@@ -10,7 +10,7 @@ th { text-align:left; }
 {% block content %}
 <header><h1>{{ title }}</h1></header>
 {% for mode, binding in bindings.items() %}
-<h2>Mode = {{ mode }}</h2>
+<h2>{{ mode | capitalize }} mode</h2>
 <table>
     <tr>
         <th>Key</th>

From c5e688f26c825f1ff15d2f4bb154c0f457d54ff9 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Wed, 17 Jan 2018 13:08:04 -0500
Subject: [PATCH 140/574] Stop iterating over every frame to check if element
 is frame

---
 qutebrowser/javascript/webelem.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index c236a5b0a..72083a121 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -264,13 +264,10 @@ window._qutebrowser.webelem = (function() {
     // Check if elem is an iframe, and if so, return the result of func on it.
     // If no iframes match, return null
     function call_if_frame(elem, func) {
-        for (let i = 0; i < window.frames.length; ++i) {
-            const frame = window.frames[i];
-            if (iframe_same_domain(frame)) {
-                if (frame.frameElement === elem) {
-                    return func(frame);
-                }
-            }
+        const frame = elem.contentWindow;
+        // Check if elem is a frame, and if so, call func on the window
+        if (frame && iframe_same_domain(frame) && frame.frameElement) {
+            return func(frame);
         }
         return null;
     }

From 72c97ca846d4f742af211f4f07a651e20d37c25c Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Wed, 17 Jan 2018 14:25:07 -0500
Subject: [PATCH 141/574] sort modes, "normal" mode first

---
 qutebrowser/browser/qutescheme.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index c252c82b8..08122958a 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -441,6 +441,8 @@ def qute_bindings(_url):
     bindings = {}
     defaults = config.val.bindings.default
     modes = set(defaults.keys()).union(config.val.bindings.commands)
+    modes.remove('normal')
+    modes = ['normal'] + sorted(list(modes))
     for mode in modes:
         bindings[mode] = config.key_instance.get_bindings_for(mode)
 

From 743aa86dfbde224702f6738d41ef72c07cdf84cc Mon Sep 17 00:00:00 2001
From: Slackhead <slackhead@gmail.com>
Date: Wed, 17 Jan 2018 19:32:05 +0000
Subject: [PATCH 142/574] run eslint on cycle-inputs.js

---
 qutebrowser/javascript/cycle-inputs.js | 46 ++++++++++++++++++++++++
 scripts/cycle-inputs.js                | 49 ++++++++++++++------------
 2 files changed, 72 insertions(+), 23 deletions(-)
 create mode 100644 qutebrowser/javascript/cycle-inputs.js

diff --git a/qutebrowser/javascript/cycle-inputs.js b/qutebrowser/javascript/cycle-inputs.js
new file mode 100644
index 000000000..9f4faaa78
--- /dev/null
+++ b/qutebrowser/javascript/cycle-inputs.js
@@ -0,0 +1,46 @@
+/* Cycle <input> text boxes.
+ * works with the types defined in 'types'.
+ * Note: Does not work for <textarea>.
+ *
+ * Example keybind:
+ * CYCLE_INPUTS = "jseval -q -f ~/.config/qutebrowser/cycle-inputs.js"
+ * config.bind('gi', CYCLE_INPUTS)
+ *
+ * By dive on freenode <dave@dawoodfall.net>
+ */
+
+"use strict";
+var inputs = document.getElementsByTagName("input");
+var types = /text|password|date|email|month|number|range|search|tel|time|url|week/;
+var hidden = /hidden/;
+var found = false;
+var ii = 0;
+var jj = 0;
+
+function ishidden(el) {
+    return hidden.test(el.attributes.value) || el.offsetParent === null;
+}
+
+for (ii = 0; ii < inputs.length; ii++) {
+    if (inputs[ii] === document.activeElement) {
+        for (jj = ii + 1; jj < inputs.length; jj++) {
+            if (!ishidden(inputs[jj]) && types.test(inputs[jj].type)) {
+                inputs[jj].focus();
+                found = true;
+                break;
+            }
+        }
+        break;
+    }
+}
+
+if (!found) {
+    for (ii = 0; ii < inputs.length; ii++) {
+        if (!ishidden(inputs[ii]) && types.test(inputs[ii].type)) {
+            inputs[ii].focus();
+            break;
+        }
+    }
+}
+
+// vim: tw=0 expandtab tabstop=4 softtabstop=4 shiftwidth=4
diff --git a/scripts/cycle-inputs.js b/scripts/cycle-inputs.js
index c395f6de2..9f4faaa78 100644
--- a/scripts/cycle-inputs.js
+++ b/scripts/cycle-inputs.js
@@ -1,43 +1,46 @@
 /* Cycle <input> text boxes.
  * works with the types defined in 'types'.
  * Note: Does not work for <textarea>.
- * 
- * Example keybind: 
+ *
+ * Example keybind:
  * CYCLE_INPUTS = "jseval -q -f ~/.config/qutebrowser/cycle-inputs.js"
  * config.bind('gi', CYCLE_INPUTS)
  *
  * By dive on freenode <dave@dawoodfall.net>
  */
 
+"use strict";
 var inputs = document.getElementsByTagName("input");
-var found = false;
 var types = /text|password|date|email|month|number|range|search|tel|time|url|week/;
 var hidden = /hidden/;
+var found = false;
+var ii = 0;
+var jj = 0;
 
 function ishidden(el) {
-	return hidden.test(el.attributes.value) || el.offsetParent === null;
+    return hidden.test(el.attributes.value) || el.offsetParent === null;
 }
 
-for (var i = 0; i < inputs.length; i++) {
-	if (inputs[i] == document.activeElement) {
-		for (var j = i+1; j < inputs.length; j++) {
-			if (! ishidden(inputs[j]) && types.test(inputs[j].type)) {
-				inputs[j].focus();
-				found = true;
-				break;
-			}
-		}
-		break;
-	}
+for (ii = 0; ii < inputs.length; ii++) {
+    if (inputs[ii] === document.activeElement) {
+        for (jj = ii + 1; jj < inputs.length; jj++) {
+            if (!ishidden(inputs[jj]) && types.test(inputs[jj].type)) {
+                inputs[jj].focus();
+                found = true;
+                break;
+            }
+        }
+        break;
+    }
 }
 
-if (! found) {
-	for (i = 0; i < inputs.length; i++) {
-		if (! ishidden(inputs[i]) && types.test(inputs[i].type)) {
-			inputs[i].focus();
-			break;
-		}
-	}
+if (!found) {
+    for (ii = 0; ii < inputs.length; ii++) {
+        if (!ishidden(inputs[ii]) && types.test(inputs[ii].type)) {
+            inputs[ii].focus();
+            break;
+        }
+    }
 }
 
-// vim: tw=0
+// vim: tw=0 expandtab tabstop=4 softtabstop=4 shiftwidth=4

From ef1de133ed9dfb8128277eccaf51452c83e8ad31 Mon Sep 17 00:00:00 2001
From: Slackhead <slackhead@gmail.com>
Date: Wed, 17 Jan 2018 19:41:54 +0000
Subject: [PATCH 143/574] remove old cycle-inputs.js

---
 qutebrowser/javascript/cycle-inputs.js | 46 --------------------------
 scripts/cycle-inputs.js                | 20 +++++------
 2 files changed, 10 insertions(+), 56 deletions(-)
 delete mode 100644 qutebrowser/javascript/cycle-inputs.js

diff --git a/qutebrowser/javascript/cycle-inputs.js b/qutebrowser/javascript/cycle-inputs.js
deleted file mode 100644
index 9f4faaa78..000000000
--- a/qutebrowser/javascript/cycle-inputs.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Cycle <input> text boxes.
- * works with the types defined in 'types'.
- * Note: Does not work for <textarea>.
- *
- * Example keybind:
- * CYCLE_INPUTS = "jseval -q -f ~/.config/qutebrowser/cycle-inputs.js"
- * config.bind('gi', CYCLE_INPUTS)
- *
- * By dive on freenode <dave@dawoodfall.net>
- */
-
-"use strict";
-var inputs = document.getElementsByTagName("input");
-var types = /text|password|date|email|month|number|range|search|tel|time|url|week/;
-var hidden = /hidden/;
-var found = false;
-var ii = 0;
-var jj = 0;
-
-function ishidden(el) {
-    return hidden.test(el.attributes.value) || el.offsetParent === null;
-}
-
-for (ii = 0; ii < inputs.length; ii++) {
-    if (inputs[ii] === document.activeElement) {
-        for (jj = ii + 1; jj < inputs.length; jj++) {
-            if (!ishidden(inputs[jj]) && types.test(inputs[jj].type)) {
-                inputs[jj].focus();
-                found = true;
-                break;
-            }
-        }
-        break;
-    }
-}
-
-if (!found) {
-    for (ii = 0; ii < inputs.length; ii++) {
-        if (!ishidden(inputs[ii]) && types.test(inputs[ii].type)) {
-            inputs[ii].focus();
-            break;
-        }
-    }
-}
-
-// vim: tw=0 expandtab tabstop=4 softtabstop=4 shiftwidth=4
diff --git a/scripts/cycle-inputs.js b/scripts/cycle-inputs.js
index 9f4faaa78..94c50fb72 100644
--- a/scripts/cycle-inputs.js
+++ b/scripts/cycle-inputs.js
@@ -14,18 +14,18 @@ var inputs = document.getElementsByTagName("input");
 var types = /text|password|date|email|month|number|range|search|tel|time|url|week/;
 var hidden = /hidden/;
 var found = false;
-var ii = 0;
-var jj = 0;
+var i = 0;
+var k = 0;
 
 function ishidden(el) {
     return hidden.test(el.attributes.value) || el.offsetParent === null;
 }
 
-for (ii = 0; ii < inputs.length; ii++) {
-    if (inputs[ii] === document.activeElement) {
-        for (jj = ii + 1; jj < inputs.length; jj++) {
-            if (!ishidden(inputs[jj]) && types.test(inputs[jj].type)) {
-                inputs[jj].focus();
+for (i = 0; i < inputs.length; i++) {
+    if (inputs[i] === document.activeElement) {
+        for (k = i + 1; k < inputs.length; k++) {
+            if (!ishidden(inputs[k]) && types.test(inputs[k].type)) {
+                inputs[k].focus();
                 found = true;
                 break;
             }
@@ -35,9 +35,9 @@ for (ii = 0; ii < inputs.length; ii++) {
 }
 
 if (!found) {
-    for (ii = 0; ii < inputs.length; ii++) {
-        if (!ishidden(inputs[ii]) && types.test(inputs[ii].type)) {
-            inputs[ii].focus();
+    for (i = 0; i < inputs.length; i++) {
+        if (!ishidden(inputs[i]) && types.test(inputs[i].type)) {
+            inputs[i].focus();
             break;
         }
     }

From ffda82170d32d525f44bf0a3e4ac64e706b527fa Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Wed, 17 Jan 2018 17:02:53 -0500
Subject: [PATCH 144/574] Fix several style issues

---
 qutebrowser/javascript/webelem.js                 | 12 ++++++------
 tests/end2end/data/hints/html/wrapped.html        |  4 +---
 tests/end2end/data/hints/html/wrapped_button.html |  6 ++----
 tests/end2end/data/hints/iframe_button.html       |  2 +-
 tests/end2end/data/hints/iframe_input.html        |  2 +-
 tests/end2end/data/iframe_search.html             |  2 +-
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index 72083a121..c4da4031d 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -285,10 +285,10 @@ window._qutebrowser.webelem = (function() {
         const frame_elem = call_if_frame(elem,
             (frame) => serialize_elem(frame.document.activeElement, frame));
 
-        if (frame_elem === null) {
-            return serialize_elem(elem);
+        if (frame_elem !== null) {
+            return frame_elem;
         }
-        return frame_elem;
+        return serialize_elem(elem);
     };
 
     funcs.find_at_pos = (x, y) => {
@@ -306,10 +306,10 @@ window._qutebrowser.webelem = (function() {
                         y - frame_offset_rect.top), frame);
             });
 
-        if (frame_elem === null) {
-            return serialize_elem(elem);
+        if (frame_elem !== null) {
+            return frame_elem;
         }
-        return frame_elem;
+        return serialize_elem(elem);
     };
 
     // Function for returning a selection to python (so we can click it)
diff --git a/tests/end2end/data/hints/html/wrapped.html b/tests/end2end/data/hints/html/wrapped.html
index 2af1a28c1..dcc05c8c7 100644
--- a/tests/end2end/data/hints/html/wrapped.html
+++ b/tests/end2end/data/hints/html/wrapped.html
@@ -1,8 +1,6 @@
 <!DOCTYPE html>
 
-<!--
-target: hello.txt
--->
+<!-- target: hello.txt -->
 
 <html>
     <head>
diff --git a/tests/end2end/data/hints/html/wrapped_button.html b/tests/end2end/data/hints/html/wrapped_button.html
index dc96bd1d5..4d5fd81bb 100644
--- a/tests/end2end/data/hints/html/wrapped_button.html
+++ b/tests/end2end/data/hints/html/wrapped_button.html
@@ -1,13 +1,11 @@
 <!DOCTYPE html>
 
-<!--
-target: hello.txt
--->
+<!-- target: hello.txt -->
 
 <html>
     <head>
         <meta charset="utf-8">
-        <title>Link wrapped across multiple lines</title>
+        <title>Button link wrapped across multiple lines</title>
     </head>
     <body>
         <div style="width: 20em;">
diff --git a/tests/end2end/data/hints/iframe_button.html b/tests/end2end/data/hints/iframe_button.html
index cd7bf203c..610ed4c88 100644
--- a/tests/end2end/data/hints/iframe_button.html
+++ b/tests/end2end/data/hints/iframe_button.html
@@ -3,7 +3,7 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <title>Hinting inside an iframe</title>
+        <title>Hinting a button inside an iframe</title>
     </head>
     <body>
         <iframe style="margin: 50px;" src="/data/hints/html/wrapped_button.html"></iframe>
diff --git a/tests/end2end/data/hints/iframe_input.html b/tests/end2end/data/hints/iframe_input.html
index 143577747..903e9a6ee 100644
--- a/tests/end2end/data/hints/iframe_input.html
+++ b/tests/end2end/data/hints/iframe_input.html
@@ -3,7 +3,7 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <title>Hinting inside an iframe</title>
+        <title>Hinting an input field inside an iframe</title>
     </head>
     <body>
         <iframe style="margin: 50px;" src="/data/hints/input.html"></iframe>
diff --git a/tests/end2end/data/iframe_search.html b/tests/end2end/data/iframe_search.html
index a06c0ef3e..78f388eeb 100644
--- a/tests/end2end/data/iframe_search.html
+++ b/tests/end2end/data/iframe_search.html
@@ -3,7 +3,7 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <title>Hinting inside an iframe</title>
+        <title>Searching inside an iframe</title>
     </head>
     <body>
         <iframe style="margin: 50px;" src="/data/search.html"></iframe>

From cb2cd615e013d2a4ec750a8b5171f71e89cc85d0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 18 Jan 2018 07:57:31 +0100
Subject: [PATCH 145/574] Update docs

---
 doc/changelog.asciidoc               | 5 +++++
 doc/help/commands.asciidoc           | 9 +++++----
 qutebrowser/config/configcommands.py | 9 +++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 08dc2fbce..9a312dc0c 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -18,6 +18,11 @@ breaking changes (such as renamed commands) can happen in minor releases.
 v1.2.0 (unreleased)
 -------------------
 
+Added
+~~~~~
+
+- A new `qute://bindings` page, opened by `:bind`, shows all keybindings.
+
 Changed
 ~~~~~~~
 
diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 098ada8af..be7f4d557 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -145,14 +145,15 @@ How many pages to go back.
 
 [[bind]]
 === bind
-Syntax: +:bind [*--mode* 'mode'] [*--default*] 'key' ['command']+
+Syntax: +:bind [*--mode* 'mode'] [*--default*] ['key'] ['command']+
 
 Bind a key to a command.
 
+If no command is given, show the current binding for the given key. Using :bind without any arguments opens a page showing all keybindings.
+
 ==== positional arguments
 * +'key'+: The keychain or special key (inside `<...>`) to bind.
-* +'command'+: The command to execute, with optional args, or not given to print the current binding.
-
+* +'command'+: The command to execute, with optional args.
 
 ==== optional arguments
 * +*-m*+, +*--mode*+: A comma-separated list of modes to bind the key in (default: `normal`). See `:help bindings.commands` for the
@@ -1104,7 +1105,7 @@ Syntax: +:set [*--temp*] [*--print*] ['option'] ['value']+
 
 Set an option.
 
-If the option name ends with '?', the value of the option is shown instead.
+If the option name ends with '?', the value of the option is shown instead. Using :set without any arguments opens a page where settings can be changed interactively.
 
 ==== positional arguments
 * +'option'+: The name of the option.
diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py
index cc3eae514..93a1f7ce0 100644
--- a/qutebrowser/config/configcommands.py
+++ b/qutebrowser/config/configcommands.py
@@ -63,6 +63,9 @@ class ConfigCommands:
         If the option name ends with '?', the value of the option is shown
         instead.
 
+        Using :set without any arguments opens a page where settings can be
+        changed interactively.
+
         Args:
             option: The name of the option.
             value: The value to set.
@@ -101,10 +104,12 @@ class ConfigCommands:
              default=False):
         """Bind a key to a command.
 
+        If no command is given, show the current binding for the given key.
+        Using :bind without any arguments opens a page showing all keybindings.
+
         Args:
             key: The keychain or special key (inside `<...>`) to bind.
-            command: The command to execute, with optional args, or None to
-                     print the current binding.
+            command: The command to execute, with optional args.
             mode: A comma-separated list of modes to bind the key in
                   (default: `normal`). See `:help bindings.commands` for the
                   available modes.

From a2ca59b8225d4b5d46c2a0ac5846259dfab1744d Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Thu, 18 Jan 2018 18:06:47 -0500
Subject: [PATCH 146/574] add netrc support for webengine. resolves #2785.

---
 qutebrowser/browser/browsertab.py             |  4 ++-
 qutebrowser/browser/shared.py                 | 28 ++++++++++++++++++
 qutebrowser/browser/webengine/webenginetab.py | 15 ++++++----
 .../browser/webkit/network/networkmanager.py  | 29 ++++---------------
 4 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index eb0e55c4b..b925d7d7a 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -99,6 +99,7 @@ class TabData:
                          Only used for QtWebKit.
         pinned: Flag to pin the tab.
         fullscreen: Whether the tab has a video shown fullscreen currently.
+        netrc_used: flag to avoid endless loop when using netrc
     """
 
     keep_icon = attr.ib(False)
@@ -107,6 +108,7 @@ class TabData:
     override_target = attr.ib(None)
     pinned = attr.ib(False)
     fullscreen = attr.ib(False)
+    netrc_used = False
 
 
 class AbstractAction:
@@ -724,6 +726,7 @@ class AbstractTab(QWidget):
         self._progress = 0
         self._has_ssl_errors = False
         self.data.viewing_source = False
+        self.data.netrc_used = False
         self._set_load_status(usertypes.LoadStatus.loading)
         self.load_started.emit()
 
@@ -764,7 +767,6 @@ class AbstractTab(QWidget):
         self.load_finished.emit(ok)
         if not self.title():
             self.title_changed.emit(self.url().toDisplayString())
-
         self.zoom.set_current()
 
     @pyqtSlot()
diff --git a/qutebrowser/browser/shared.py b/qutebrowser/browser/shared.py
index b6bfefe7b..e6084a7f8 100644
--- a/qutebrowser/browser/shared.py
+++ b/qutebrowser/browser/shared.py
@@ -19,7 +19,9 @@
 
 """Various utilities shared between webpage/webview subclasses."""
 
+import os
 import html
+import netrc
 
 from qutebrowser.config import config
 from qutebrowser.utils import usertypes, message, log, objreg, jinja, utils
@@ -260,3 +262,29 @@ def get_user_stylesheet():
         css += '\nhtml > ::-webkit-scrollbar { width: 0px; height: 0px; }'
 
     return css
+
+
+def netrc_authentication(url, authenticator):
+    """performs authorization using netrc."""
+    if 'HOME' in os.environ:
+        # We'll get an OSError by netrc if 'HOME' isn't available in
+        # os.environ. We don't want to log that, so we prevent it
+        # altogether.
+        user, password = None, None
+        try:
+            net = netrc.netrc(config.val.content.netrc_file)
+            authenticators = net.authenticators(url.host())
+            if authenticators is not None:
+                (user, _account, password) = authenticators
+        except FileNotFoundError:
+            log.misc.debug("No .netrc file found")
+        except OSError:
+            log.misc.exception("Unable to read the netrc file")
+        except netrc.NetrcParseError:
+            log.misc.exception("Error when parsing the netrc file")
+
+        if user is not None:
+            authenticator.setUser(user)
+            authenticator.setPassword(password)
+            return True
+    return False
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 9328698bc..a50d8e2a3 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -19,6 +19,7 @@
 
 """Wrapper over a QWebEngineView."""
 
+import os
 import math
 import functools
 import html as html_utils
@@ -739,11 +740,15 @@ class WebEngineTab(browsertab.AbstractTab):
 
     @pyqtSlot(QUrl, 'QAuthenticator*')
     def _on_authentication_required(self, url, authenticator):
-        # FIXME:qtwebengine support .netrc
-        answer = shared.authentication_required(
-            url, authenticator, abort_on=[self.shutting_down,
-                                          self.load_started])
-        if answer is None:
+        netrc = None
+        if not self.data.netrc_used and 'HOME' in os.environ:
+            self.data.netrc_used = True
+            netrc = shared.netrc_authentication(url, authenticator)
+        if not netrc:
+            abort_on = [self.shutting_down, self.load_started]
+            answer = shared.authentication_required(url, authenticator,
+                                                    abort_on)
+        if not netrc and answer is None:
             try:
                 # pylint: disable=no-member, useless-suppression
                 sip.assign(authenticator, QAuthenticator())
diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py
index a19687eb1..5e9d6f991 100644
--- a/qutebrowser/browser/webkit/network/networkmanager.py
+++ b/qutebrowser/browser/webkit/network/networkmanager.py
@@ -19,9 +19,7 @@
 
 """Our own QNetworkAccessManager."""
 
-import os
 import collections
-import netrc
 import html
 
 import attr
@@ -270,28 +268,11 @@ class NetworkManager(QNetworkAccessManager):
     @pyqtSlot('QNetworkReply*', 'QAuthenticator*')
     def on_authentication_required(self, reply, authenticator):
         """Called when a website needs authentication."""
-        user, password = None, None
-        if not hasattr(reply, "netrc_used") and 'HOME' in os.environ:
-            # We'll get an OSError by netrc if 'HOME' isn't available in
-            # os.environ. We don't want to log that, so we prevent it
-            # altogether.
-            reply.netrc_used = True
-            try:
-                net = netrc.netrc(config.val.content.netrc_file)
-                authenticators = net.authenticators(reply.url().host())
-                if authenticators is not None:
-                    (user, _account, password) = authenticators
-            except FileNotFoundError:
-                log.misc.debug("No .netrc file found")
-            except OSError:
-                log.misc.exception("Unable to read the netrc file")
-            except netrc.NetrcParseError:
-                log.misc.exception("Error when parsing the netrc file")
-
-        if user is not None:
-            authenticator.setUser(user)
-            authenticator.setPassword(password)
-        else:
+        netrc = False
+        if not hasattr(reply, "netrc_used"):
+            setattr(reply, "netrc_used", True)
+            netrc = shared.netrc_authentication(reply.url(), authenticator)
+        if not netrc:
             abort_on = self._get_abort_signals(reply)
             shared.authentication_required(reply.url(), authenticator,
                                            abort_on=abort_on)

From aeb7bac886e5b4837d37ca778de1879d1a8b1aa6 Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Fri, 19 Jan 2018 02:33:42 +0100
Subject: [PATCH 147/574] added :session-load --delete

---
 qutebrowser/misc/sessions.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index b46b5a26a..cf6a7d0ee 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -457,7 +457,8 @@ class SessionManager(QObject):
 
     @cmdutils.register(instance='session-manager')
     @cmdutils.argument('name', completion=miscmodels.session)
-    def session_load(self, name, clear=False, temp=False, force=False):
+    def session_load(self, name, clear=False, temp=False, force=False,
+                     delete=False):
         """Load a session.
 
         Args:
@@ -466,6 +467,7 @@ class SessionManager(QObject):
             temp: Don't set the current session for :session-save.
             force: Force loading internal sessions (starting with an
                    underline).
+            delete: Delete the saved session once it has loaded.
         """
         if name.startswith('_') and not force:
             raise cmdexc.CommandError("{} is an internal session, use --force "
@@ -473,6 +475,8 @@ class SessionManager(QObject):
         old_windows = list(objreg.window_registry.values())
         try:
             self.load(name, temp=temp)
+            if delete:
+                self.session_delete(name)
         except SessionNotFoundError:
             raise cmdexc.CommandError("Session {} not found!".format(name))
         except SessionError as e:

From bd7054fa2e7fa5e3fd34c6b23b18737d23b4b949 Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Fri, 19 Jan 2018 09:29:37 +0100
Subject: [PATCH 148/574] use self.delete and add test

---
 qutebrowser/misc/sessions.py            | 13 +++++++++++--
 tests/end2end/features/sessions.feature | 10 ++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index cf6a7d0ee..d18cebf32 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -475,8 +475,6 @@ class SessionManager(QObject):
         old_windows = list(objreg.window_registry.values())
         try:
             self.load(name, temp=temp)
-            if delete:
-                self.session_delete(name)
         except SessionNotFoundError:
             raise cmdexc.CommandError("Session {} not found!".format(name))
         except SessionError as e:
@@ -486,6 +484,17 @@ class SessionManager(QObject):
             if clear:
                 for win in old_windows:
                     win.close()
+            if delete:
+                try:
+                    self.delete(name)
+                except SessionError as e:
+                    log.sessions.exception("Error while deleting session!")
+                    raise cmdexc.CommandError(
+                        "Error while deleting session: {}"
+                        .format(e))
+                else:
+                    log.sessions.debug(
+                        "Loaded & deleted session {}.".format(name))
 
     @cmdutils.register(instance='session-manager')
     @cmdutils.argument('name', completion=miscmodels.session)
diff --git a/tests/end2end/features/sessions.feature b/tests/end2end/features/sessions.feature
index 50054c665..cb54e34cf 100644
--- a/tests/end2end/features/sessions.feature
+++ b/tests/end2end/features/sessions.feature
@@ -363,6 +363,16 @@ Feature: Saving and loading sessions
     And I replace "about:blank" by "http://localhost:(port)/data/numbers/2.txt" in the "loaded_session" session file
     And I run :session-load loaded_session
     Then data/numbers/2.txt should be loaded
+  
+  @qtwebengine_flaky
+  Scenario: Loading and deleting a session
+    When I open about:blank
+    And I run :session-save loaded_session
+    And I replace "about:blank" by "http://localhost:(port)/data/numbers/2.txt" in the "loaded_session" session file
+    And I run :session-load --delete loaded_session
+    And I wait for "Loaded & deleted session loaded_session." in the log
+    Then data/numbers/2.txt should be loaded
+    And the session loaded_session should not exist
 
   Scenario: Loading a session which doesn't exist
     When I run :session-load inexistent_session

From 9e258a490e505ab1917bcb669883b0929e5943e3 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 19 Jan 2018 06:59:40 -0500
Subject: [PATCH 149/574] might as well use the same loop prevention mechanism
 for both backends

---
 qutebrowser/browser/webengine/webenginetab.py        | 2 +-
 qutebrowser/browser/webkit/network/networkmanager.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index a50d8e2a3..cf7dc2d98 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -741,7 +741,7 @@ class WebEngineTab(browsertab.AbstractTab):
     @pyqtSlot(QUrl, 'QAuthenticator*')
     def _on_authentication_required(self, url, authenticator):
         netrc = None
-        if not self.data.netrc_used and 'HOME' in os.environ:
+        if not self.data.netrc_used:
             self.data.netrc_used = True
             netrc = shared.netrc_authentication(url, authenticator)
         if not netrc:
diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py
index 5e9d6f991..d41bfbd90 100644
--- a/qutebrowser/browser/webkit/network/networkmanager.py
+++ b/qutebrowser/browser/webkit/network/networkmanager.py
@@ -269,8 +269,8 @@ class NetworkManager(QNetworkAccessManager):
     def on_authentication_required(self, reply, authenticator):
         """Called when a website needs authentication."""
         netrc = False
-        if not hasattr(reply, "netrc_used"):
-            setattr(reply, "netrc_used", True)
+        if not self.data.netrc_used:
+            self.data.netrc_used = True
             netrc = shared.netrc_authentication(reply.url(), authenticator)
         if not netrc:
             abort_on = self._get_abort_signals(reply)

From 4a4a6549d0ca68d25a5a42910212a553048fe144 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 19 Jan 2018 09:34:45 -0500
Subject: [PATCH 150/574] use a temporary attribute of the class to prevent the
 loop; tested to work in both backends

---
 qutebrowser/browser/browsertab.py                    | 9 ++++++---
 qutebrowser/browser/webengine/webenginetab.py        | 5 ++---
 qutebrowser/browser/webkit/network/networkmanager.py | 4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index b925d7d7a..b53cd32ca 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -99,7 +99,6 @@ class TabData:
                          Only used for QtWebKit.
         pinned: Flag to pin the tab.
         fullscreen: Whether the tab has a video shown fullscreen currently.
-        netrc_used: flag to avoid endless loop when using netrc
     """
 
     keep_icon = attr.ib(False)
@@ -108,7 +107,6 @@ class TabData:
     override_target = attr.ib(None)
     pinned = attr.ib(False)
     fullscreen = attr.ib(False)
-    netrc_used = False
 
 
 class AbstractAction:
@@ -726,7 +724,12 @@ class AbstractTab(QWidget):
         self._progress = 0
         self._has_ssl_errors = False
         self.data.viewing_source = False
-        self.data.netrc_used = False
+        if self.backend == usertypes.Backend.QtWebKit:
+            obj = self.networkaccessmanager()
+        else:
+            obj = self
+        if hasattr(obj, 'netrc_used'):
+            delattr(obj, 'netrc_used')
         self._set_load_status(usertypes.LoadStatus.loading)
         self.load_started.emit()
 
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index cf7dc2d98..4a05312f8 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -19,7 +19,6 @@
 
 """Wrapper over a QWebEngineView."""
 
-import os
 import math
 import functools
 import html as html_utils
@@ -741,8 +740,8 @@ class WebEngineTab(browsertab.AbstractTab):
     @pyqtSlot(QUrl, 'QAuthenticator*')
     def _on_authentication_required(self, url, authenticator):
         netrc = None
-        if not self.data.netrc_used:
-            self.data.netrc_used = True
+        if not hasattr(self, 'netrc_used'):
+            setattr(self, 'netrc_used', True)
             netrc = shared.netrc_authentication(url, authenticator)
         if not netrc:
             abort_on = [self.shutting_down, self.load_started]
diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py
index d41bfbd90..90761d0fc 100644
--- a/qutebrowser/browser/webkit/network/networkmanager.py
+++ b/qutebrowser/browser/webkit/network/networkmanager.py
@@ -269,8 +269,8 @@ class NetworkManager(QNetworkAccessManager):
     def on_authentication_required(self, reply, authenticator):
         """Called when a website needs authentication."""
         netrc = False
-        if not self.data.netrc_used:
-            self.data.netrc_used = True
+        if not hasattr(self, 'netrc_used'):
+            setattr(self, 'netrc_used', True)
             netrc = shared.netrc_authentication(reply.url(), authenticator)
         if not netrc:
             abort_on = self._get_abort_signals(reply)

From 4fde8ff204fd95ea08d8c5ee33f3008d6f43582c Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 19 Jan 2018 22:13:47 +0600
Subject: [PATCH 151/574] Add separate function in js to set current platform

---
 qutebrowser/browser/webengine/webenginetab.py |  6 ++---
 qutebrowser/javascript/webengine_caret.js     | 22 ++++++++++++++-----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index ea646cda3..128b4c945 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -21,7 +21,7 @@
 
 import math
 import functools
-import platform
+import sys
 import html as html_utils
 
 import sip
@@ -206,8 +206,8 @@ class WebEngineCaret(browsertab.AbstractCaret):
             return
 
         self._tab.run_js_async(
-            javascript.assemble('caret', 'setInitialCursor',
-                                platform.platform()))
+            javascript.assemble('caret', 'setPlatform', sys.platform))
+        self._js_call('setInitialCursor')
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_left(self):
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 052d3a4c1..7dafd9136 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -707,6 +707,12 @@ window._qutebrowser.caret = (function() {
      */
     CaretBrowsing.blinkFlag = true;
 
+    /**
+     * The os that user is using.
+     * @type {boolean}
+     */
+    CaretBrowsing.platform = null;
+
     /**
      * Check if a node is a control that normally allows the user to interact
      * with it using arrow keys. We won't override the arrow keys when such a
@@ -814,9 +820,9 @@ window._qutebrowser.caret = (function() {
      * If there's no initial selection, set the cursor just before the
      * first text character in the document.
      */
-    CaretBrowsing.setInitialCursor = function(platform) {
-        if (platform) {
-            CaretBrowsing.isWindows = platform.indexOf("Windows") !== -1;
+    CaretBrowsing.setInitialCursor = function() {
+        if (CaretBrowsing.platform) {
+            CaretBrowsing.isWindows = CaretBrowsing.platform.startsWith("win");
         }
         const selectionRange = window.getSelection().toString().length;
         if (selectionRange === 0) {
@@ -1252,7 +1258,7 @@ window._qutebrowser.caret = (function() {
         CaretBrowsing.isCaretVisible =
             (CaretBrowsing.isEnabled && CaretBrowsing.isWindowFocused);
         if (CaretBrowsing.isCaretVisible && !CaretBrowsing.caretElement) {
-            CaretBrowsing.setInitialCursor(CaretBrowsing.isWindows);
+            CaretBrowsing.setInitialCursor();
             CaretBrowsing.updateCaretOrSelection(true);
             if (CaretBrowsing.caretElement) {
                 CaretBrowsing.blinkFunctionId = window.setInterval(
@@ -1304,9 +1310,9 @@ window._qutebrowser.caret = (function() {
 
     const funcs = {};
 
-    funcs.setInitialCursor = (platform) => {
+    funcs.setInitialCursor = () => {
         if (!CaretBrowsing.initiated) {
-            CaretBrowsing.setInitialCursor(platform);
+            CaretBrowsing.setInitialCursor();
             return;
         }
 
@@ -1316,6 +1322,10 @@ window._qutebrowser.caret = (function() {
         CaretBrowsing.toggle();
     };
 
+    funcs.setPlatform = (platform) => {
+        CaretBrowsing.platform = platform;
+    }
+
     funcs.disableCaret = () => {
         CaretBrowsing.toggle(false);
     };

From 859469c600f5d4aa4735a419442672965487bb7b Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 19 Jan 2018 22:15:54 +0600
Subject: [PATCH 152/574] Remove redundancy comment

---
 qutebrowser/javascript/webengine_caret.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 7dafd9136..e998c5fb8 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -586,9 +586,7 @@ window._qutebrowser.caret = (function() {
      * The class handling the Caret Browsing implementation in the page.
      * Sets up communication with the background page, and then when caret
      * browsing is enabled, response to various key events to move the caret
-     * or selection within the text content of the document. Uses the native
-     * Chrome selection wherever possible, but displays its own flashing
-     * caret using a DIV because there's no native caret available.
+     * or selection within the text content of the document.
      * @constructor
      */
     const CaretBrowsing = {};

From 6eb001fc34b075e06fa05b686b766744781eeddb Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 19 Jan 2018 22:24:11 +0600
Subject: [PATCH 153/574] Rename js caret file

---
 qutebrowser/javascript/{webengine_caret.js => caret.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename qutebrowser/javascript/{webengine_caret.js => caret.js} (100%)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/caret.js
similarity index 100%
rename from qutebrowser/javascript/webengine_caret.js
rename to qutebrowser/javascript/caret.js

From 0e522d48ac7f50815fd010fb2ab6bcc08396711e Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 19 Jan 2018 22:25:58 +0600
Subject: [PATCH 154/574] Add myself to `CODEOWNERS` to watch for caret code

---
 .github/CODEOWNERS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e29d2678d..d7da20300 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,3 +8,5 @@ tests/unit/completion/*  @rcorre
 tests/unit/misc/test_sql.py  @rcorre
 
 qutebrowser/config/configdata.yml  @mschilli87
+
+qutebrowser/javascript/caret.js @artur-shaik

From 79766aa65bb4221b5ef95e6fee6f8c57ee489300 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 19 Jan 2018 22:28:49 +0600
Subject: [PATCH 155/574] Add chromium license

---
 qutebrowser/javascript/caret.js | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js
index e998c5fb8..3cbefc77a 100644
--- a/qutebrowser/javascript/caret.js
+++ b/qutebrowser/javascript/caret.js
@@ -1,5 +1,34 @@
 /* eslint-disable max-lines, max-len, max-statements, complexity,
 max-params, default-case, valid-jsdoc */
+
+// Copyright 2014 The Chromium Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 /**
  * Copyright 2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
  *

From 2d2d71512f05507fe9c8a3a02c4629f24574f9c1 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 19 Jan 2018 22:31:12 +0600
Subject: [PATCH 156/574] Add initial comment

---
 qutebrowser/javascript/caret.js | 52 +++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js
index 3cbefc77a..1c31d8cbc 100644
--- a/qutebrowser/javascript/caret.js
+++ b/qutebrowser/javascript/caret.js
@@ -52,8 +52,56 @@ max-params, default-case, valid-jsdoc */
  * Ported chrome-caretbrowsing extension.
  * https://cs.chromium.org/chromium/src/ui/accessibility/extensions/caretbrowsing/
  *
- * Create and control div caret, which listen commands from qutebrowser,
- * change document selection model and div caret position.
+ * The behavior is based on Mozilla's spec whenever possible:
+ *   http://www.mozilla.org/access/keyboard/proposal
+ *
+ * The one exception is that Esc is used to escape out of a form control,
+ * rather than their proposed key (which doesn't seem to work in the
+ * latest Firefox anyway).
+ *
+ * Some details about how Chrome selection works, which will help in
+ * understanding the code:
+ *
+ * The Selection object (window.getSelection()) has four components that
+ * completely describe the state of the caret or selection:
+ *
+ * base and anchor: this is the start of the selection, the fixed point.
+ * extent and focus: this is the end of the selection, the part that
+ *     moves when you hold down shift and press the left or right arrows.
+ *
+ * When the selection is a cursor, the base, anchor, extent, and focus are
+ * all the same.
+ *
+ * There's only one time when the base and anchor are not the same, or the
+ * extent and focus are not the same, and that's when the selection is in
+ * an ambiguous state - i.e. it's not clear which edge is the focus and which
+ * is the anchor. As an example, if you double-click to select a word, then
+ * the behavior is dependent on your next action. If you press Shift+Right,
+ * the right edge becomes the focus. But if you press Shift+Left, the left
+ * edge becomes the focus.
+ *
+ * When the selection is in an ambiguous state, the base and extent are set
+ * to the position where the mouse clicked, and the anchor and focus are set
+ * to the boundaries of the selection.
+ *
+ * The only way to set the selection and give it direction is to use
+ * the non-standard Selection.setBaseAndExtent method. If you try to use
+ * Selection.addRange(), the anchor will always be on the left and the focus
+ * will always be on the right, making it impossible to manipulate
+ * selections that move from right to left.
+ *
+ * Finally, Chrome will throw an exception if you try to set an invalid
+ * selection - a selection where the left and right edges are not the same,
+ * but it doesn't span any visible characters. A common example is that
+ * there are often many whitespace characters in the DOM that are not
+ * visible on the page; trying to select them will fail. Another example is
+ * any node that's invisible or not displayed.
+ *
+ * While there are probably many possible methods to determine what is
+ * selectable, this code uses the method of determining if there's a valid
+ * bounding box for the range or not - keep moving the cursor forwards until
+ * the range from the previous position and candidate next position has a
+ * valid bounding box.
  */
 
 "use strict";

From 22d77fadd736c5b89d49d53ff087a3f924aa8538 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 19 Jan 2018 22:40:47 +0600
Subject: [PATCH 157/574] Eliminate caret blinking

---
 qutebrowser/browser/webengine/webenginetab.py |   2 +-
 qutebrowser/javascript/caret.js               | 110 +-----------------
 2 files changed, 3 insertions(+), 109 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 128b4c945..136270238 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -610,7 +610,7 @@ class WebEngineTab(browsertab.AbstractTab):
             'window._qutebrowser = window._qutebrowser || {};',
             utils.read_file('javascript/scroll.js'),
             utils.read_file('javascript/webelem.js'),
-            utils.read_file('javascript/webengine_caret.js'),
+            utils.read_file('javascript/caret.js'),
         ])
         script = QWebEngineScript()
         script.setInjectionPoint(QWebEngineScript.DocumentCreation)
diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js
index 1c31d8cbc..90557a7af 100644
--- a/qutebrowser/javascript/caret.js
+++ b/qutebrowser/javascript/caret.js
@@ -512,8 +512,7 @@ window._qutebrowser.caret = (function() {
         if (node.constructor === Text) {
             node = node.parentElement;
         }
-        if (node.className === "CaretBrowsing_Caret" ||
-            node.className === "CaretBrowsing_AnimateCaret") {
+        if (node.className === "CaretBrowsing_Caret") {
             return true;
         }
         return false;
@@ -869,22 +868,6 @@ window._qutebrowser.caret = (function() {
             "  z-index: 2147483647;" +
             "  min-height: 10px;" +
             "  background-color: #000;" +
-            "}" +
-            ".CaretBrowsing_AnimateCaret {" +
-            "  position: absolute;" +
-            "  z-index: 2147483647;" +
-            "  min-height: 10px;" +
-            "}" +
-            ".CaretBrowsing_FlashVert {" +
-            "  position: absolute;" +
-            "  z-index: 2147483647;" +
-            "  background: linear-gradient(" +
-            "      270deg," +
-            "      rgba(128, 128, 255, 0) 0%," +
-            "      rgba(128, 128, 255, 0.3) 45%," +
-            "      rgba(128, 128, 255, 0.8) 50%," +
-            "      rgba(128, 128, 255, 0.3) 65%," +
-            "      rgba(128, 128, 255, 0) 100%);" +
             "}";
         const node = document.createElement("style");
         node.innerHTML = style;
@@ -972,58 +955,6 @@ window._qutebrowser.caret = (function() {
         element.style.color = CaretBrowsing.caretForeground;
     };
 
-    /**
-     * Animate the caret element into the normal style.
-     */
-    CaretBrowsing.animateCaretElement = function() {
-        const element = CaretBrowsing.caretElement;
-        element.style.left = `${CaretBrowsing.caretX - 50}px`;
-        element.style.top = `${CaretBrowsing.caretY - 100}px`;
-        element.style.width = `${CaretBrowsing.caretWidth + 100}px`;
-        element.style.height = `${CaretBrowsing.caretHeight + 200}px`;
-        element.className = "CaretBrowsing_AnimateCaret";
-
-        // Start the animation. The setTimeout is so that the old values will get
-        // applied first, so we can animate to the new values.
-        window.setTimeout(() => {
-            if (!CaretBrowsing.caretElement) {
-                return;
-            }
-            CaretBrowsing.setCaretElementNormalStyle();
-            element.style.transition = "all 0.8s ease-in";
-            function listener() {
-                element.removeEventListener(
-                    "transitionend", listener, false);
-                element.style.transition = "none";
-            }
-            element.addEventListener(
-                "transitionend", listener, false);
-        }, 0);
-    };
-
-    /**
-     * Quick flash and then show the normal caret style.
-     */
-    CaretBrowsing.flashCaretElement = function() {
-        const x = CaretBrowsing.caretX;
-        const y = CaretBrowsing.caretY;
-
-        const vert = document.createElement("div");
-        vert.className = "CaretBrowsing_FlashVert";
-        vert.style.left = `${x - 6}px`;
-        vert.style.top = `${y - 100}px`;
-        vert.style.width = "11px";
-        vert.style.height = `${200}px`;
-        document.body.appendChild(vert);
-
-        window.setTimeout(() => {
-            document.body.removeChild(vert);
-            if (CaretBrowsing.caretElement) {
-                CaretBrowsing.setCaretElementNormalStyle();
-            }
-        }, 250);
-    };
-
     /**
      * Create the caret element. This assumes that caretX, caretY,
      * caretWidth, and caretHeight have all been set. The caret is
@@ -1034,14 +965,7 @@ window._qutebrowser.caret = (function() {
         element.className = "CaretBrowsing_Caret";
         document.body.appendChild(element);
         CaretBrowsing.caretElement = element;
-
-        if (CaretBrowsing.onEnable === "anim") {
-            CaretBrowsing.animateCaretElement();
-        } else if (CaretBrowsing.onEnable === "flash") {
-            CaretBrowsing.flashCaretElement();
-        } else {
-            CaretBrowsing.setCaretElementNormalStyle();
-        }
+        CaretBrowsing.setCaretElementNormalStyle();
     };
 
     /**
@@ -1226,15 +1150,6 @@ window._qutebrowser.caret = (function() {
                     window.scroll(0, (caretY - 100));
                 }
             }
-
-            if (Math.abs(previousX - CaretBrowsing.caretX) > 500 ||
-                Math.abs(previousY - CaretBrowsing.caretY) > 100) {
-                if (CaretBrowsing.onJump === "anim") {
-                    CaretBrowsing.animateCaretElement();
-                } else if (CaretBrowsing.onJump === "flash") {
-                    CaretBrowsing.flashCaretElement();
-                }
-            }
         };
 
     CaretBrowsing.move = function(direction, granularity) {
@@ -1308,23 +1223,6 @@ window._qutebrowser.caret = (function() {
         return true;
     };
 
-    /**
-     * Called at a regular interval. Blink the cursor by changing its visibility.
-     */
-    CaretBrowsing.caretBlinkFunction = function() {
-        if (CaretBrowsing.caretElement) {
-            if (CaretBrowsing.blinkFlag) {
-                CaretBrowsing.caretElement.style.backgroundColor =
-                    CaretBrowsing.caretForeground;
-                CaretBrowsing.blinkFlag = false;
-            } else {
-                CaretBrowsing.caretElement.style.backgroundColor =
-                    CaretBrowsing.caretBackground;
-                CaretBrowsing.blinkFlag = true;
-            }
-        }
-    };
-
     /**
      * Update whether or not the caret is visible, based on whether caret browsing
      * is enabled and whether this window / iframe has focus.
@@ -1335,10 +1233,6 @@ window._qutebrowser.caret = (function() {
         if (CaretBrowsing.isCaretVisible && !CaretBrowsing.caretElement) {
             CaretBrowsing.setInitialCursor();
             CaretBrowsing.updateCaretOrSelection(true);
-            if (CaretBrowsing.caretElement) {
-                CaretBrowsing.blinkFunctionId = window.setInterval(
-                    CaretBrowsing.caretBlinkFunction, 500);
-            }
         } else if (!CaretBrowsing.isCaretVisible &&
             CaretBrowsing.caretElement) {
             window.clearInterval(CaretBrowsing.blinkFunctionId);

From 1e3f11ca136abd469b053be948a5ba1ca6a6b36a Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 19 Jan 2018 23:17:03 +0600
Subject: [PATCH 158/574] Fix eslint warnings

---
 qutebrowser/javascript/caret.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js
index 90557a7af..eed5aaa1f 100644
--- a/qutebrowser/javascript/caret.js
+++ b/qutebrowser/javascript/caret.js
@@ -1051,9 +1051,6 @@ window._qutebrowser.caret = (function() {
      */
     CaretBrowsing.updateCaretOrSelection =
         function(scrollToSelection) {
-            const previousX = CaretBrowsing.caretX;
-            const previousY = CaretBrowsing.caretY;
-
             const sel = window.getSelection();
             if (sel.rangeCount === 0) {
                 if (CaretBrowsing.caretElement) {
@@ -1293,7 +1290,7 @@ window._qutebrowser.caret = (function() {
 
     funcs.setPlatform = (platform) => {
         CaretBrowsing.platform = platform;
-    }
+    };
 
     funcs.disableCaret = () => {
         CaretBrowsing.toggle(false);

From 968367b042c95a4aea152b5a2bba518ef76ef83b Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Fri, 19 Jan 2018 15:25:03 -0500
Subject: [PATCH 159/574] Simplify logic for checking if an element is a frame

---
 qutebrowser/javascript/webelem.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index 76296acaa..d635de412 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -278,10 +278,13 @@ window._qutebrowser.webelem = (function() {
     // Check if elem is an iframe, and if so, return the result of func on it.
     // If no iframes match, return null
     function call_if_frame(elem, func) {
-        const frame = elem.contentWindow;
         // Check if elem is a frame, and if so, call func on the window
-        if (frame && iframe_same_domain(frame) && frame.frameElement) {
-            return func(frame);
+        if ("contentWindow" in elem) {
+            const frame = elem.contentWindow;
+            if (iframe_same_domain(frame) &&
+                "frameElement" in elem.contentWindow) {
+                return func(frame);
+            }
         }
         return null;
     }

From b2f95339ce3f42f8724fdf524004b41abcfa793a Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Wed, 27 Dec 2017 22:04:47 +1300
Subject: [PATCH 160/574] Greasemonkey: support regexes in @include and
 @exclude.

Like the spec says, if a value for the @include or @exclude rules starts
and ends with a '/' it should be parsed as a regular expression.
Technically a ECMAScript syntax regular expression, but I am not sure of
the differences and I assume they are far fewer than the similarities.
One that I did see mentioned was that javascript RegExp doesn't support
unicode. Although it apparently does support a 'u' flag now.

Note that code will only be ran for QtWebkit and QWebEngine < 5.8
we rely on the builtin support for metadata it QWebEngine for most
things greasemonkey related. Sadly it seems that they missed the regex
requirement too. I've opened a ticket to track that https://bugreports.qt.io/browse/QTBUG-65484
---
 qutebrowser/browser/greasemonkey.py        | 19 +++++++++++----
 tests/unit/javascript/test_greasemonkey.py | 28 +++++++++++++++++++++-
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index 9a82d6a93..579cca82b 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -23,7 +23,6 @@ import re
 import os
 import json
 import fnmatch
-import functools
 import glob
 
 import attr
@@ -196,11 +195,21 @@ class GreasemonkeyManager(QObject):
         """
         if url.scheme() not in self.greaseable_schemes:
             return MatchingScripts(url, [], [], [])
-        match = functools.partial(fnmatch.fnmatch,
-                                  url.toString(QUrl.FullyEncoded))
+
+        def _match(pattern):
+            # For include and exclude rules if they start and end with '/' they
+            # should be treated as a (ecma syntax) regular expression.
+            string_url = url.toString(QUrl.FullyEncoded)
+            if pattern.startswith('/') and pattern.endswith('/'):
+                return re.search(pattern[1:-1], string_url) is not None
+
+            # Otherwise they are glob expressions.
+            return fnmatch.fnmatch(string_url, pattern)
+
         tester = (lambda script:
-                  any(match(pat) for pat in script.includes) and
-                  not any(match(pat) for pat in script.excludes))
+                  any(_match(pat) for pat in script.includes) and
+                  not any(_match(pat) for pat in script.excludes))
+
         return MatchingScripts(
             url,
             [script for script in self._run_start if tester(script)],
diff --git a/tests/unit/javascript/test_greasemonkey.py b/tests/unit/javascript/test_greasemonkey.py
index 0f5fe476c..1aaa3380f 100644
--- a/tests/unit/javascript/test_greasemonkey.py
+++ b/tests/unit/javascript/test_greasemonkey.py
@@ -19,6 +19,7 @@
 """Tests for qutebrowser.browser.greasemonkey."""
 
 import logging
+import textwrap
 
 import pytest
 import py.path  # pylint: disable=no-name-in-module
@@ -26,7 +27,7 @@ from PyQt5.QtCore import QUrl
 
 from qutebrowser.browser import greasemonkey
 
-test_gm_script = """
+test_gm_script = r"""
 // ==UserScript==
 // @name qutebrowser test userscript
 // @namespace invalid.org
@@ -75,6 +76,31 @@ def test_get_scripts_by_url(url, expected_matches):
             expected_matches)
 
 
+@pytest.mark.parametrize("url, expected_matches", [
+    # included
+    ('https://github.com/qutebrowser/qutebrowser/', 1),
+    # neither included nor excluded
+    ('http://aaaaaaaaaa.com/', 0),
+    # excluded takes priority
+    ('http://github.com/foo', 0),
+])
+def test_regex_includes_scripts_for(url, expected_matches):
+    """Ensure our GM @*clude support supports regular expressions."""
+    gh_dark_example = textwrap.dedent(r"""
+        // ==UserScript==
+        // @include     /^https?://((gist|guides|help|raw|status|developer)\.)?github\.com/((?!generated_pages\/preview).)*$/
+        // @exclude     /https?://github\.com/foo/
+        // @run-at document-start
+        // ==/UserScript==
+    """)
+    _save_script(gh_dark_example, 'test.user.js')
+    gm_manager = greasemonkey.GreasemonkeyManager()
+
+    scripts = gm_manager.scripts_for(QUrl(url))
+    assert (len(scripts.start + scripts.end + scripts.idle) ==
+            expected_matches)
+
+
 def test_no_metadata(caplog):
     """Run on all sites at document-end is the default."""
     _save_script("var nothing = true;\n", 'nothing.user.js')

From 971b41399160c26335b7a364348ca8b929e6538a Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Wed, 17 Jan 2018 18:17:14 +1300
Subject: [PATCH 161/574] Greasemonkey: make *clude regexes case insensitive

Sometimes I don't read specs so good.
---
 qutebrowser/browser/greasemonkey.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index 579cca82b..753d13c56 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -201,7 +201,8 @@ class GreasemonkeyManager(QObject):
             # should be treated as a (ecma syntax) regular expression.
             string_url = url.toString(QUrl.FullyEncoded)
             if pattern.startswith('/') and pattern.endswith('/'):
-                return re.search(pattern[1:-1], string_url) is not None
+                matches = re.search(pattern[1:-1], string_url, flags=re.I)
+                return matches is not None
 
             # Otherwise they are glob expressions.
             return fnmatch.fnmatch(string_url, pattern)

From d5d22783eadda873e955911d17c137117a4cd9bf Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Sat, 20 Jan 2018 13:32:16 +1300
Subject: [PATCH 162/574] Greasemonkey: optimize pattern matching a little

Moving `QUrl.toString()` out of the `_match()` function which is called
for every pattern in every stript seems to make it ~40% faster.
---
 qutebrowser/browser/greasemonkey.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index 753d13c56..8a9624148 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -196,10 +196,11 @@ class GreasemonkeyManager(QObject):
         if url.scheme() not in self.greaseable_schemes:
             return MatchingScripts(url, [], [], [])
 
+        string_url = url.toString(QUrl.FullyEncoded)
+
         def _match(pattern):
             # For include and exclude rules if they start and end with '/' they
             # should be treated as a (ecma syntax) regular expression.
-            string_url = url.toString(QUrl.FullyEncoded)
             if pattern.startswith('/') and pattern.endswith('/'):
                 matches = re.search(pattern[1:-1], string_url, flags=re.I)
                 return matches is not None

From aebc1a7d48b9583ee4b246dbfb6b1afcba91048e Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Sat, 20 Jan 2018 13:34:51 +1300
Subject: [PATCH 163/574] Greasemonkey: don't complain about an unset run-at

Apparently is is not an unusual situation to leave it unset and rely on
the default. Logging a warning about this could be unnecerasily
confusing for users.

I'm leaving the log message in there if it is set to something weird
like `window-load` or `document-complete` which scriptish may support.
---
 qutebrowser/browser/greasemonkey.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index 8a9624148..7ee843b0b 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -177,10 +177,10 @@ class GreasemonkeyManager(QObject):
                 elif script.run_at == 'document-idle':
                     self._run_idle.append(script)
                 else:
-                    log.greasemonkey.warning("Script {} has invalid run-at "
-                                             "defined, defaulting to "
-                                             "document-end"
-                                             .format(script_path))
+                    if script.run_at:
+                        log.greasemonkey.warning(
+                            "Script {} has invalid run-at defined, "
+                            "defaulting to document-end".format(script_path))
                     # Default as per
                     # https://wiki.greasespot.net/Metadata_Block#.40run-at
                     self._run_end.append(script)

From 182bf1d688a6bcf32776b3e40749085d61c1146e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Sat, 20 Jan 2018 16:43:39 +0100
Subject: [PATCH 164/574] Simplify platform handling

---
 qutebrowser/javascript/caret.js | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js
index eed5aaa1f..3a7bb5bde 100644
--- a/qutebrowser/javascript/caret.js
+++ b/qutebrowser/javascript/caret.js
@@ -781,12 +781,6 @@ window._qutebrowser.caret = (function() {
      */
     CaretBrowsing.blinkFlag = true;
 
-    /**
-     * The os that user is using.
-     * @type {boolean}
-     */
-    CaretBrowsing.platform = null;
-
     /**
      * Check if a node is a control that normally allows the user to interact
      * with it using arrow keys. We won't override the arrow keys when such a
@@ -879,9 +873,6 @@ window._qutebrowser.caret = (function() {
      * first text character in the document.
      */
     CaretBrowsing.setInitialCursor = function() {
-        if (CaretBrowsing.platform) {
-            CaretBrowsing.isWindows = CaretBrowsing.platform.startsWith("win");
-        }
         const selectionRange = window.getSelection().toString().length;
         if (selectionRange === 0) {
             positionCaret();
@@ -1289,7 +1280,7 @@ window._qutebrowser.caret = (function() {
     };
 
     funcs.setPlatform = (platform) => {
-        CaretBrowsing.platform = platform;
+        CaretBrowsing.isWindows = platform.startsWith("win");
     };
 
     funcs.disableCaret = () => {

From 4b3a237e2adaa4d487ae1e433e9f5fba890afcac Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 20 Jan 2018 18:29:23 +0100
Subject: [PATCH 165/574] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 9a312dc0c..bc12746e8 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -21,6 +21,7 @@ v1.2.0 (unreleased)
 Added
 ~~~~~
 
+- Caret/visual mode is now supported for QtWebEngine.
 - A new `qute://bindings` page, opened by `:bind`, shows all keybindings.
 
 Changed

From 748de85ba2cc7bd8557a87fce88aab0ac3f3ad27 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 20 Jan 2018 18:50:17 +0100
Subject: [PATCH 166/574] Fix crash when getting signals for closed tabs

Fixes #3498
---
 qutebrowser/browser/browsertab.py             | 4 ++++
 qutebrowser/browser/webengine/webenginetab.py | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index db251bf45..324895100 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -749,6 +749,10 @@ class AbstractTab(QWidget):
 
     @pyqtSlot(bool)
     def _on_load_finished(self, ok):
+        if sip.isdeleted(self._widget):
+            # https://github.com/qutebrowser/qutebrowser/issues/3498
+            return
+
         sess_manager = objreg.get('session-manager')
         sess_manager.save_autosave()
 
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 136270238..0523972df 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -631,6 +631,9 @@ class WebEngineTab(browsertab.AbstractTab):
 
     @pyqtSlot()
     def _restore_zoom(self):
+        if sip.isdeleted(self._widget):
+            # https://github.com/qutebrowser/qutebrowser/issues/3498
+            return
         if self._saved_zoom is None:
             return
         self.zoom.set_factor(self._saved_zoom)

From 84478cd81c0cd656751ae0bb7134f66306f3efee Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 20 Jan 2018 18:58:03 +0100
Subject: [PATCH 167/574] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index bc12746e8..ccb05e162 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -45,6 +45,7 @@ Fixed
 ~~~~~
 
 - The Makefile now actually works.
+- Fixed crashes with Qt 5.10 when closing a tab before it finished loading.
 
 v1.1.0
 ------

From 9c3dcae793110e2178796f057785764551f02986 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 20 Jan 2018 19:20:12 +0100
Subject: [PATCH 168/574] Update changelog for v1.1.1

---
 doc/changelog.asciidoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index ccb05e162..2dada6af7 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -38,8 +38,8 @@ Fixed
 
 - Improved fullscreen handling with Qt 5.10.
 
-v1.1.1 (unreleased)
--------------------
+v1.1.1
+------
 
 Fixed
 ~~~~~

From d62cb58f7deb02a81e2585ee50ee4114b67be889 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 20 Jan 2018 19:21:20 +0100
Subject: [PATCH 169/574] Release v1.1.1

(cherry picked from commit 4e8abaa2d16103f42cb26919e50d59937a88ae8f)
---
 qutebrowser/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/__init__.py b/qutebrowser/__init__.py
index 1b1ec4c40..bcca15b4e 100644
--- a/qutebrowser/__init__.py
+++ b/qutebrowser/__init__.py
@@ -26,7 +26,7 @@ __copyright__ = "Copyright 2014-2017 Florian Bruhin (The Compiler)"
 __license__ = "GPL"
 __maintainer__ = __author__
 __email__ = "mail@qutebrowser.org"
-__version_info__ = (1, 1, 0)
+__version_info__ = (1, 1, 1)
 __version__ = '.'.join(str(e) for e in __version_info__)
 __description__ = "A keyboard-driven, vim-like browser based on PyQt5."
 

From 9d5beff93731d6a57c1354f641344ed7bef44696 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sat, 20 Jan 2018 15:49:52 -0500
Subject: [PATCH 170/574] Set some PRAGMAs to optimize the history database.

Enable write-ahead-logging and reduce the synchronous level to NORMAL.
This should reduce the number of writes to disk and avoid some of the
hangs users are experiencing.

Resolves #3507.
Resolves #2930 (optimistically, reopen if not fixed).

See https://sqlite.org/pragma.html and https://www.sqlite.org/wal.html.
---
 qutebrowser/misc/sql.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/qutebrowser/misc/sql.py b/qutebrowser/misc/sql.py
index 00527e7fe..65a93a461 100644
--- a/qutebrowser/misc/sql.py
+++ b/qutebrowser/misc/sql.py
@@ -115,6 +115,11 @@ def init(db_path):
         raise SqliteError("Failed to open sqlite database at {}: {}"
                           .format(db_path, error.text()), error)
 
+    # Enable write-ahead-logging and reduce disk write frequency
+    # see https://sqlite.org/pragma.html and issues #2930 and #3507
+    Query("PRAGMA journal_mode=WAL").run()
+    Query("PRAGMA synchronous=NORMAL").run()
+
 
 def close():
     """Close the SQL connection."""

From 1e9a70855d2b371cbdd4265725434a876142efc7 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sun, 21 Jan 2018 07:42:39 -0500
Subject: [PATCH 171/574] Show '&' properly in completion widget.

When highlighting the matched part of the text, we need to html-escape
the pattern used to find the matching text so it will replace terms that
have been escaped in the text, like &amp;.

Resolves #3508.
---
 qutebrowser/completion/completiondelegate.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/completion/completiondelegate.py b/qutebrowser/completion/completiondelegate.py
index b4f9c5a33..ab98eccef 100644
--- a/qutebrowser/completion/completiondelegate.py
+++ b/qutebrowser/completion/completiondelegate.py
@@ -203,9 +203,9 @@ class CompletionItemDelegate(QStyledItemDelegate):
             columns_to_filter = index.model().columns_to_filter(index)
             if index.column() in columns_to_filter and pattern:
                 repl = r'<span class="highlight">\g<0></span>'
-                text = re.sub(re.escape(pattern).replace(r'\ ', r'|'),
-                              repl, html.escape(self._opt.text),
-                              flags=re.IGNORECASE)
+                pat = html.escape(re.escape(pattern)).replace(r'\ ', r'|')
+                txt = html.escape(self._opt.text)
+                text = re.sub(pat, repl, txt, flags=re.IGNORECASE)
                 self._doc.setHtml(text)
             else:
                 self._doc.setPlainText(self._opt.text)

From ab9f17b05365f90be456d87a9c1d1a437c1f1cb1 Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi+gitkraken@dopsi.ch>
Date: Mon, 22 Jan 2018 16:05:34 +0100
Subject: [PATCH 172/574] Use default value for dictionary item in tabs handler

---
 qutebrowser/browser/qutescheme.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 57c32999b..c96578d18 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -30,6 +30,7 @@ import time
 import textwrap
 import mimetypes
 import urllib
+import collections
 
 import pkg_resources
 from PyQt5.QtCore import QUrlQuery, QUrl
@@ -208,10 +209,9 @@ def _tab_fields_to_tabs_page_info(fields):
 @add_handler('tabs')
 def qute_tabs(_url):
     """Handler for qute://tabs. Display information about all open tabs."""
-    tabs = {}
+    tabs = collections.defaultdict(list)
     for win_id in objreg.window_registry:
         win_id_str = str(win_id)
-        tabs[win_id_str] = []
         tabbed_browser = objreg.get('tabbed-browser',
                                     scope='window',
                                     window=win_id)

From f11d7ab489f7e91d520c2efd43ab4e16416e7196 Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi+gitkraken@dopsi.ch>
Date: Mon, 22 Jan 2018 16:11:59 +0100
Subject: [PATCH 173/574] Check if the window still exists

---
 qutebrowser/browser/qutescheme.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index c96578d18..af2f34f70 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -40,6 +40,7 @@ from qutebrowser.config import config, configdata, configexc, configdiff
 from qutebrowser.utils import (version, utils, jinja, log, message, docutils,
                                objreg, urlutils)
 from qutebrowser.misc import objects
+import sip
 
 
 pyeval_output = ":pyeval was never called"
@@ -210,7 +211,9 @@ def _tab_fields_to_tabs_page_info(fields):
 def qute_tabs(_url):
     """Handler for qute://tabs. Display information about all open tabs."""
     tabs = collections.defaultdict(list)
-    for win_id in objreg.window_registry:
+    for win_id, window in objreg.window_registry.items():
+        if sip.isdeleted(window):
+            continue
         win_id_str = str(win_id)
         tabbed_browser = objreg.get('tabbed-browser',
                                     scope='window',

From 02396cb455d7d1ffc7f01cc38498b658df50a066 Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi+gitkraken@dopsi.ch>
Date: Mon, 22 Jan 2018 16:12:45 +0100
Subject: [PATCH 174/574] Remove useless function

---
 qutebrowser/browser/qutescheme.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index af2f34f70..397e9f35e 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -203,10 +203,6 @@ def qute_bookmarks(_url):
     return 'text/html', html
 
 
-def _tab_fields_to_tabs_page_info(fields):
-    return (fields['title'], fields['current_url'])
-
-
 @add_handler('tabs')
 def qute_tabs(_url):
     """Handler for qute://tabs. Display information about all open tabs."""
@@ -219,9 +215,9 @@ def qute_tabs(_url):
                                     scope='window',
                                     window=win_id)
         for tab_idx in range(tabbed_browser.count()):
+            tab_fields = tabbed_browser.get_tab_fields(tab_idx)
             tabs[win_id_str].append(
-                _tab_fields_to_tabs_page_info(
-                    tabbed_browser.get_tab_fields(tab_idx)))
+                (tab_fields['title'], tab_fields['current_url']))
 
     html = jinja.render('tabs.html',
                         title='Tabs',

From 6edd096de468900797f3454da1cf4cd6a66cb337 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 22 Jan 2018 16:52:14 +0100
Subject: [PATCH 175/574] Update certifi from 2017.11.5 to 2018.1.18

---
 misc/requirements/requirements-codecov.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-codecov.txt b/misc/requirements/requirements-codecov.txt
index df7a12ed6..5fd4d1aff 100644
--- a/misc/requirements/requirements-codecov.txt
+++ b/misc/requirements/requirements-codecov.txt
@@ -1,6 +1,6 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-certifi==2017.11.5
+certifi==2018.1.18
 chardet==3.0.4
 codecov==2.0.13
 coverage==4.4.2

From 762205ef07abb4b1d72fdc02255bba3d972cfe33 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 22 Jan 2018 16:52:15 +0100
Subject: [PATCH 176/574] Update certifi from 2017.11.5 to 2018.1.18

---
 misc/requirements/requirements-pylint-master.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pylint-master.txt b/misc/requirements/requirements-pylint-master.txt
index ce588c136..5a414b3db 100644
--- a/misc/requirements/requirements-pylint-master.txt
+++ b/misc/requirements/requirements-pylint-master.txt
@@ -1,7 +1,7 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 -e git+https://github.com/PyCQA/astroid.git#egg=astroid
-certifi==2017.11.5
+certifi==2018.1.18
 chardet==3.0.4
 github3.py==0.9.6
 idna==2.6

From 036031a48b6063ae366fc76cc8086dc4136a71f6 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 22 Jan 2018 16:52:17 +0100
Subject: [PATCH 177/574] Update certifi from 2017.11.5 to 2018.1.18

---
 misc/requirements/requirements-pylint.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index 6267fc2b0..b5aab6354 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -1,7 +1,7 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 astroid==1.6.0
-certifi==2017.11.5
+certifi==2018.1.18
 chardet==3.0.4
 github3.py==0.9.6
 idna==2.6

From abd5da1fd131f691497e323dd9bc30ff8ceece9b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 22 Jan 2018 16:52:18 +0100
Subject: [PATCH 178/574] Update codecov from 2.0.13 to 2.0.14

---
 misc/requirements/requirements-codecov.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-codecov.txt b/misc/requirements/requirements-codecov.txt
index 5fd4d1aff..26008b77b 100644
--- a/misc/requirements/requirements-codecov.txt
+++ b/misc/requirements/requirements-codecov.txt
@@ -2,7 +2,7 @@
 
 certifi==2018.1.18
 chardet==3.0.4
-codecov==2.0.13
+codecov==2.0.14
 coverage==4.4.2
 idna==2.6
 requests==2.18.4

From c5c01c5364592b750abb347097ae3fbcc6a10799 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 22 Jan 2018 16:52:20 +0100
Subject: [PATCH 179/574] Update hypothesis from 3.44.16 to 3.44.21

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 574dbdb28..0bd38e349 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -11,7 +11,7 @@ fields==5.0.0
 Flask==0.12.2
 glob2==0.6
 hunter==2.0.2
-hypothesis==3.44.16
+hypothesis==3.44.21
 itsdangerous==0.24
 # Jinja2==2.10
 Mako==1.0.7

From dd0703eddfc102777b7b36f8fcd1528510dc27d2 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Mon, 22 Jan 2018 21:21:51 +0100
Subject: [PATCH 180/574] scripts/dev/src2asciidoc.py: vim: readonly

Set 'readonly' via Vim modeline in generated scripts.
---
 doc/help/commands.asciidoc  | 1 +
 doc/help/settings.asciidoc  | 1 +
 scripts/dev/src2asciidoc.py | 1 +
 3 files changed, 3 insertions(+)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index be7f4d557..1008de1bf 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -1,6 +1,7 @@
 // DO NOT EDIT THIS FILE DIRECTLY!
 // It is autogenerated by running:
 //   $ python3 scripts/dev/src2asciidoc.py
+// vim: readonly:
 
 = Commands
 
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 53af8399d..73aae6fb2 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -1,6 +1,7 @@
 // DO NOT EDIT THIS FILE DIRECTLY!
 // It is autogenerated by running:
 //   $ python3 scripts/dev/src2asciidoc.py
+// vim: readonly:
 
 = Setting reference
 
diff --git a/scripts/dev/src2asciidoc.py b/scripts/dev/src2asciidoc.py
index 803280deb..5dc3d05ac 100755
--- a/scripts/dev/src2asciidoc.py
+++ b/scripts/dev/src2asciidoc.py
@@ -44,6 +44,7 @@ FILE_HEADER = """
 // DO NOT EDIT THIS FILE DIRECTLY!
 // It is autogenerated by running:
 //   $ python3 scripts/dev/src2asciidoc.py
+// vim: readonly:
 
 """.lstrip()
 

From 6a40cbf1608ad8e4c6dc8cef6f52a567dc25a812 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Mon, 22 Jan 2018 21:26:20 +0100
Subject: [PATCH 181/574] incdec_number: add support for port

---
 doc/help/commands.asciidoc        |  2 ++
 doc/help/settings.asciidoc        |  1 +
 qutebrowser/browser/commands.py   |  2 ++
 qutebrowser/config/configdata.yml |  2 +-
 qutebrowser/utils/urlutils.py     |  5 +++--
 tests/unit/utils/test_urlutils.py | 11 +++++++++++
 6 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index be7f4d557..9d7ce77fe 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -742,7 +742,9 @@ This tries to automatically click on typical _Previous Page_ or _Next Page_ link
  - `next`: Open a _next_ link.
  - `up`: Go up a level in the current URL.
  - `increment`: Increment the last number in the URL.
+ Uses the link:settings.html#url.incdec_segments[url.incdec_segments] config option.
  - `decrement`: Decrement the last number in the URL.
+ Uses the link:settings.html#url.incdec_segments[url.incdec_segments] config option.
  
 
 
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 53af8399d..a1b13f09f 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -2993,6 +2993,7 @@ Type: <<types,FlagList>>
 Valid values:
 
  * +host+
+ * +port+
  * +path+
  * +query+
  * +anchor+
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 6ddb72636..6eaa3e167 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -638,7 +638,9 @@ class CommandDispatcher:
                 - `next`: Open a _next_ link.
                 - `up`: Go up a level in the current URL.
                 - `increment`: Increment the last number in the URL.
+                  Uses the link:settings.html#url.incdec_segments[url.incdec_segments] config option.
                 - `decrement`: Decrement the last number in the URL.
+                  Uses the link:settings.html#url.incdec_segments[url.incdec_segments] config option.
 
             tab: Open in a new tab.
             bg: Open in a background tab.
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index a118a8b59..2d99af729 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -1418,7 +1418,7 @@ url.default_page:
 url.incdec_segments:
   type:
     name: FlagList
-    valid_values: [host, path, query, anchor]
+    valid_values: [host, port, path, query, anchor]
   default: [path, query]
   desc: URL segments where `:navigate increment/decrement` will search for
     a number.
diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py
index 97e03c072..46bdee15c 100644
--- a/qutebrowser/utils/urlutils.py
+++ b/qutebrowser/utils/urlutils.py
@@ -537,7 +537,7 @@ def incdec_number(url, incdec, count=1, segments=None):
         incdec: Either 'increment' or 'decrement'
         count: The number to increment or decrement by
         segments: A set of URL segments to search. Valid segments are:
-                  'host', 'path', 'query', 'anchor'.
+                  'host', 'port', 'path', 'query', 'anchor'.
                   Default: {'path', 'query'}
 
     Return:
@@ -550,7 +550,7 @@ def incdec_number(url, incdec, count=1, segments=None):
 
     if segments is None:
         segments = {'path', 'query'}
-    valid_segments = {'host', 'path', 'query', 'anchor'}
+    valid_segments = {'host', 'port', 'path', 'query', 'anchor'}
     if segments - valid_segments:
         extra_elements = segments - valid_segments
         raise IncDecError("Invalid segments: {}".format(
@@ -561,6 +561,7 @@ def incdec_number(url, incdec, count=1, segments=None):
     # Order as they appear in a URL
     segment_modifiers = [
         ('host', url.host, url.setHost),
+        ('port', lambda: str(url.port()), lambda x: url.setPort(int(x))),
         ('path', url.path, url.setPath),
         ('query', url.query, url.setQuery),
         ('anchor', url.fragment, url.setFragment),
diff --git a/tests/unit/utils/test_urlutils.py b/tests/unit/utils/test_urlutils.py
index 4d9b3ba0a..6b005f402 100644
--- a/tests/unit/utils/test_urlutils.py
+++ b/tests/unit/utils/test_urlutils.py
@@ -622,6 +622,17 @@ class TestIncDecNumber:
             base_url, incdec, segments={'host', 'path', 'query', 'anchor'})
         assert new_url == expected_url
 
+    def test_incdec_port(self):
+        """Test incdec_number with port."""
+
+        base_url = QUrl('http://localhost:8000')
+        new_url = urlutils.incdec_number(
+            base_url, 'increment', segments={'port'})
+        assert new_url == QUrl('http://localhost:8001')
+        new_url = urlutils.incdec_number(
+            base_url, 'decrement', segments={'port'})
+        assert new_url == QUrl('http://localhost:7999')
+
     @pytest.mark.parametrize('incdec', ['increment', 'decrement'])
     @pytest.mark.parametrize('value', [
         '{}foo', 'foo{}', 'foo{}bar', '42foo{}'

From 9f14ae184ff5f2a782424627e552e4feb8c10539 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Mon, 22 Jan 2018 21:48:21 +0100
Subject: [PATCH 182/574] fixup! incdec_number: add support for port

---
 qutebrowser/utils/urlutils.py     | 2 +-
 tests/unit/utils/test_urlutils.py | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py
index 46bdee15c..88853483e 100644
--- a/qutebrowser/utils/urlutils.py
+++ b/qutebrowser/utils/urlutils.py
@@ -561,7 +561,7 @@ def incdec_number(url, incdec, count=1, segments=None):
     # Order as they appear in a URL
     segment_modifiers = [
         ('host', url.host, url.setHost),
-        ('port', lambda: str(url.port()), lambda x: url.setPort(int(x))),
+        ('port', lambda: str(url.port()) if url.port() > 0 else '', lambda x: url.setPort(int(x))),
         ('path', url.path, url.setPath),
         ('query', url.query, url.setQuery),
         ('anchor', url.fragment, url.setFragment),
diff --git a/tests/unit/utils/test_urlutils.py b/tests/unit/utils/test_urlutils.py
index 6b005f402..de83ba7bf 100644
--- a/tests/unit/utils/test_urlutils.py
+++ b/tests/unit/utils/test_urlutils.py
@@ -633,6 +633,12 @@ class TestIncDecNumber:
             base_url, 'decrement', segments={'port'})
         assert new_url == QUrl('http://localhost:7999')
 
+    def test_incdec_port_default(self):
+        """Test that a default port (with url.port() == -1) is not touched."""
+        base_url = QUrl('http://localhost')
+        with pytest.raises(urlutils.IncDecError):
+            urlutils.incdec_number(base_url, 'increment', segments={'port'})
+
     @pytest.mark.parametrize('incdec', ['increment', 'decrement'])
     @pytest.mark.parametrize('value', [
         '{}foo', 'foo{}', 'foo{}bar', '42foo{}'

From 56e686415922974c9a5edbb9514aa900589670c3 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Tue, 23 Jan 2018 09:58:36 -0500
Subject: [PATCH 183/574] Inject qutebrowser's JS files at DocumentReady

Use WebEngine's view-source: scheme for "view-source" command.
Also add missing URL when viewing source for WebKit.

Resolves #3490
Resolves #2395
Resolves #2948
---
 qutebrowser/browser/commands.py               | 11 ++++++++++-
 qutebrowser/browser/webengine/webenginetab.py |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 6ddb72636..0d390d081 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -758,7 +758,6 @@ class CommandDispatcher:
         else:
             x = None
             y = perc
-
         self._current_widget().scroller.to_perc(x, y)
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
@@ -1513,6 +1512,14 @@ class CommandDispatcher:
             message.error(str(e))
             return
 
+        if tab.backend == usertypes.Backend.QtWebEngine:
+            # use view-source: scheme to show page source for webengine
+            url = QUrl('view-source:{}'.format(current_url.toString()))
+            new_tab = self._tabbed_browser.tabopen(url, background=True,
+                related=True)
+            new_tab.data.viewing_source = True
+            return
+
         def show_source_cb(source):
             """Show source as soon as it's ready."""
             # WORKAROUND for https://github.com/PyCQA/pylint/issues/491
@@ -1527,6 +1534,8 @@ class CommandDispatcher:
             new_tab = self._tabbed_browser.tabopen()
             new_tab.set_html(highlighted)
             new_tab.data.viewing_source = True
+            new_tab.url = lambda requested=False: QUrl(
+                'Source: {}'.format(current_url.toDisplayString()))
 
         tab.dump_async(show_source_cb)
 
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 0523972df..aa19f4c6b 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -613,7 +613,7 @@ class WebEngineTab(browsertab.AbstractTab):
             utils.read_file('javascript/caret.js'),
         ])
         script = QWebEngineScript()
-        script.setInjectionPoint(QWebEngineScript.DocumentCreation)
+        script.setInjectionPoint(QWebEngineScript.DocumentReady)
         script.setSourceCode(js_code)
 
         page = self._widget.page()

From 83515628a8fb2e63b4646c560a6392924a4a2519 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Tue, 23 Jan 2018 10:11:34 -0500
Subject: [PATCH 184/574] fix line indentation warning

---
 qutebrowser/browser/commands.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 0d390d081..46c37ced1 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1515,8 +1515,8 @@ class CommandDispatcher:
         if tab.backend == usertypes.Backend.QtWebEngine:
             # use view-source: scheme to show page source for webengine
             url = QUrl('view-source:{}'.format(current_url.toString()))
-            new_tab = self._tabbed_browser.tabopen(url, background=True,
-                related=True)
+            new_tab = self._tabbed_browser.tabopen(
+                url, background=True, related=True)
             new_tab.data.viewing_source = True
             return
 

From 3652553a8fe1f8d9943ff8427d612e714c46134a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 23 Jan 2018 19:15:32 +0100
Subject: [PATCH 185/574] Mark second qute://settings test as flaky

---
 tests/end2end/features/qutescheme.feature | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/end2end/features/qutescheme.feature b/tests/end2end/features/qutescheme.feature
index 755c103e7..1abaadd87 100644
--- a/tests/end2end/features/qutescheme.feature
+++ b/tests/end2end/features/qutescheme.feature
@@ -98,6 +98,8 @@ Feature: Special qute:// pages
 
     # qute://settings
 
+    # Sometimes, an unrelated value gets set
+    @flaky
     Scenario: Focusing input fields in qute://settings and entering valid value
         When I set search.ignore_case to never
         And I open qute://settings

From a701426703c1a7354b8c8ac77e2ee4c020697632 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 23 Jan 2018 19:41:45 +0100
Subject: [PATCH 186/574] Update to PyQt 5.10

---
 .travis.yml                             | 6 ++++--
 misc/requirements/requirements-pyqt.txt | 4 ++--
 tox.ini                                 | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 251842d06..a38ec0fe4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,12 @@ matrix:
     - os: linux
       env: TESTENV=py36-pyqt58
     - os: linux
-      python: 3.5
       env: TESTENV=py35-pyqt59
     - os: linux
-      env: TESTENV=py36-pyqt59-cov
+      python: 3.5
+      env: TESTENV=py35-pyqt510
+    - os: linux
+      env: TESTENV=py36-pyqt510-cov
     - os: osx
       env: TESTENV=py36 OSX=sierra
       osx_image: xcode9.2
diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt
index 5a08f2f73..99ba1b7cc 100644
--- a/misc/requirements/requirements-pyqt.txt
+++ b/misc/requirements/requirements-pyqt.txt
@@ -1,4 +1,4 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt5==5.9.2
-sip==4.19.6
+PyQt5==5.10
+sip==4.19.7
diff --git a/tox.ini b/tox.ini
index 5b8bc05b5..db020f4a4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,8 +13,8 @@ skipsdist = true
 setenv =
     QT_QPA_PLATFORM_PLUGIN_PATH={envdir}/Lib/site-packages/PyQt5/plugins/platforms
     PYTEST_QT_API=pyqt5
-    pyqt{,56,571,58,59}: LINK_PYQT_SKIP=true
-    pyqt{,56,571,58,59}: QUTE_BDD_WEBENGINE=true
+    pyqt{,56,571,58,59,510}: LINK_PYQT_SKIP=true
+    pyqt{,56,571,58,59,510}: QUTE_BDD_WEBENGINE=true
     cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report=
 passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_* QUTE_* DOCKER
 basepython =
@@ -27,6 +27,7 @@ deps =
     pyqt571: PyQt5==5.7.1
     pyqt58: PyQt5==5.8.2
     pyqt59: PyQt5==5.9.2
+    pyqt510: PyQt5==5.10
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
     {envpython} -bb -m pytest {posargs:tests}

From c3deeaf2831625567eeb31ff456cf2edeb01cd0d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 23 Jan 2018 20:00:14 +0100
Subject: [PATCH 187/574] Also use PyQt 5.10 on AppVeyor

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 837ebb1d4..f2424fc94 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -7,7 +7,7 @@ environment:
     PYTHONUNBUFFERED: 1
     PYTHON: C:\Python36\python.exe
     matrix:
-    - TESTENV: py36-pyqt59
+    - TESTENV: py36-pyqt510
     - TESTENV: pylint
 
 install:

From e26e04985b68c56cc9946e020b79747ea14e7ec8 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 23 Jan 2018 20:36:31 +0100
Subject: [PATCH 188/574] Revert "Update to PyQt 5.10"

This reverts commit a701426703c1a7354b8c8ac77e2ee4c020697632.
---
 .travis.yml                             | 6 ++----
 misc/requirements/requirements-pyqt.txt | 4 ++--
 tox.ini                                 | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a38ec0fe4..251842d06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,12 +17,10 @@ matrix:
     - os: linux
       env: TESTENV=py36-pyqt58
     - os: linux
+      python: 3.5
       env: TESTENV=py35-pyqt59
     - os: linux
-      python: 3.5
-      env: TESTENV=py35-pyqt510
-    - os: linux
-      env: TESTENV=py36-pyqt510-cov
+      env: TESTENV=py36-pyqt59-cov
     - os: osx
       env: TESTENV=py36 OSX=sierra
       osx_image: xcode9.2
diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt
index 99ba1b7cc..5a08f2f73 100644
--- a/misc/requirements/requirements-pyqt.txt
+++ b/misc/requirements/requirements-pyqt.txt
@@ -1,4 +1,4 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt5==5.10
-sip==4.19.7
+PyQt5==5.9.2
+sip==4.19.6
diff --git a/tox.ini b/tox.ini
index db020f4a4..5b8bc05b5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,8 +13,8 @@ skipsdist = true
 setenv =
     QT_QPA_PLATFORM_PLUGIN_PATH={envdir}/Lib/site-packages/PyQt5/plugins/platforms
     PYTEST_QT_API=pyqt5
-    pyqt{,56,571,58,59,510}: LINK_PYQT_SKIP=true
-    pyqt{,56,571,58,59,510}: QUTE_BDD_WEBENGINE=true
+    pyqt{,56,571,58,59}: LINK_PYQT_SKIP=true
+    pyqt{,56,571,58,59}: QUTE_BDD_WEBENGINE=true
     cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report=
 passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_* QUTE_* DOCKER
 basepython =
@@ -27,7 +27,6 @@ deps =
     pyqt571: PyQt5==5.7.1
     pyqt58: PyQt5==5.8.2
     pyqt59: PyQt5==5.9.2
-    pyqt510: PyQt5==5.10
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
     {envpython} -bb -m pytest {posargs:tests}

From 072d42347acc65ab3faf3dbf4f20d653b3aff9cd Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 23 Jan 2018 20:36:40 +0100
Subject: [PATCH 189/574] Revert "Also use PyQt 5.10 on AppVeyor"

This reverts commit c3deeaf2831625567eeb31ff456cf2edeb01cd0d.
---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index f2424fc94..837ebb1d4 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -7,7 +7,7 @@ environment:
     PYTHONUNBUFFERED: 1
     PYTHON: C:\Python36\python.exe
     matrix:
-    - TESTENV: py36-pyqt510
+    - TESTENV: py36-pyqt59
     - TESTENV: pylint
 
 install:

From 2e912eeadf0db5a8a98947a84ae01a5bca8361c0 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Tue, 23 Jan 2018 23:30:22 -0500
Subject: [PATCH 190/574] move backend dependent code to AbstractAction
 respective classes

---
 qutebrowser/browser/browsertab.py             |  4 +++
 qutebrowser/browser/commands.py               | 28 +------------------
 qutebrowser/browser/webengine/webenginetab.py |  7 +++++
 qutebrowser/browser/webkit/webkittab.py       | 23 +++++++++++++++
 tests/end2end/features/history.feature        |  2 +-
 5 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 324895100..e90c71f5d 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -139,6 +139,10 @@ class AbstractAction:
             raise WebTabError("{} is not a valid web action!".format(name))
         self._widget.triggerPageAction(member)
 
+    def show_source(self, dispatcher, url):
+        """Show the source of the current page in a new tab."""
+        raise NotImplementedError
+
 
 class AbstractPrinting:
 
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 46c37ced1..3f616d1f0 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1511,33 +1511,7 @@ class CommandDispatcher:
         except cmdexc.CommandError as e:
             message.error(str(e))
             return
-
-        if tab.backend == usertypes.Backend.QtWebEngine:
-            # use view-source: scheme to show page source for webengine
-            url = QUrl('view-source:{}'.format(current_url.toString()))
-            new_tab = self._tabbed_browser.tabopen(
-                url, background=True, related=True)
-            new_tab.data.viewing_source = True
-            return
-
-        def show_source_cb(source):
-            """Show source as soon as it's ready."""
-            # WORKAROUND for https://github.com/PyCQA/pylint/issues/491
-            # pylint: disable=no-member
-            lexer = pygments.lexers.HtmlLexer()
-            formatter = pygments.formatters.HtmlFormatter(
-                full=True, linenos='table',
-                title='Source for {}'.format(current_url.toDisplayString()))
-            # pylint: enable=no-member
-            highlighted = pygments.highlight(source, lexer, formatter)
-
-            new_tab = self._tabbed_browser.tabopen()
-            new_tab.set_html(highlighted)
-            new_tab.data.viewing_source = True
-            new_tab.url = lambda requested=False: QUrl(
-                'Source: {}'.format(current_url.toDisplayString()))
-
-        tab.dump_async(show_source_cb)
+        tab.action.show_source(self, current_url)
 
     @cmdutils.register(instance='command-dispatcher', scope='window',
                        debug=True)
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index aa19f4c6b..496df50e5 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -99,6 +99,13 @@ class WebEngineAction(browsertab.AbstractAction):
         """Save the current page."""
         self._widget.triggerPageAction(QWebEnginePage.SavePage)
 
+    def show_source(self, dispatcher, url):
+        # use view-source: scheme to show page source for webengine
+        url = QUrl('view-source:{}'.format(url.toString()))
+        new_tab = dispatcher._tabbed_browser.tabopen(
+            url, background=True, related=True)
+        new_tab.data.viewing_source = True
+
 
 class WebEnginePrinting(browsertab.AbstractPrinting):
 
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 4609f08db..6edda24ed 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -23,6 +23,10 @@ import re
 import functools
 import xml.etree.ElementTree
 
+import pygments
+import pygments.lexers
+import pygments.formatters
+
 import sip
 from PyQt5.QtCore import (pyqtSlot, Qt, QEvent, QUrl, QPoint, QTimer, QSizeF,
                           QSize)
@@ -50,6 +54,25 @@ class WebKitAction(browsertab.AbstractAction):
         """Save the current page."""
         raise browsertab.UnsupportedOperationError
 
+    def show_source(self, dispatcher, url):
+        def show_source_cb(source):
+            """Show source as soon as it's ready."""
+            # WORKAROUND for https://github.com/PyCQA/pylint/issues/491
+            # pylint: disable=no-member
+            lexer = pygments.lexers.HtmlLexer()
+            formatter = pygments.formatters.HtmlFormatter(
+                full=True, linenos='table',
+                title='view-source:{}'.format(url.toDisplayString()))
+            # pylint: enable=no-member
+            highlighted = pygments.highlight(source, lexer, formatter)
+
+            new_tab = dispatcher._tabbed_browser.tabopen()
+            new_tab.set_html(highlighted)
+            new_tab.data.viewing_source = True
+            new_tab.url = lambda requested=False: QUrl(
+                'view-source:' + url.toDisplayString())
+        dispatcher._current_widget().dump_async(show_source_cb)
+
 
 class WebKitPrinting(browsertab.AbstractPrinting):
 
diff --git a/tests/end2end/features/history.feature b/tests/end2end/features/history.feature
index 00bd20403..df6610daf 100644
--- a/tests/end2end/features/history.feature
+++ b/tests/end2end/features/history.feature
@@ -69,7 +69,7 @@ Feature: Page history
     Scenario: History with view-source URL
         When I open data/title.html
         And I run :view-source
-        And I wait for "Changing title for idx * to 'Source for http://localhost:*/data/title.html'" in the log
+        And I wait for "Changing title for idx * to 'view-source:http://localhost:*/data/title.html'" in the log
         Then the history should contain:
             http://localhost:(port)/data/title.html Test title
 

From b1c54f5706f435f80a986f102b08a9dec29943ae Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 24 Jan 2018 06:17:09 +0100
Subject: [PATCH 191/574] Re-add Qt 5.10 to tox.ini only

---
 tox.ini | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 5b8bc05b5..db020f4a4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,8 +13,8 @@ skipsdist = true
 setenv =
     QT_QPA_PLATFORM_PLUGIN_PATH={envdir}/Lib/site-packages/PyQt5/plugins/platforms
     PYTEST_QT_API=pyqt5
-    pyqt{,56,571,58,59}: LINK_PYQT_SKIP=true
-    pyqt{,56,571,58,59}: QUTE_BDD_WEBENGINE=true
+    pyqt{,56,571,58,59,510}: LINK_PYQT_SKIP=true
+    pyqt{,56,571,58,59,510}: QUTE_BDD_WEBENGINE=true
     cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report=
 passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_* QUTE_* DOCKER
 basepython =
@@ -27,6 +27,7 @@ deps =
     pyqt571: PyQt5==5.7.1
     pyqt58: PyQt5==5.8.2
     pyqt59: PyQt5==5.9.2
+    pyqt510: PyQt5==5.10
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
     {envpython} -bb -m pytest {posargs:tests}

From 7690b9f8cd85e417ccd6b1224302a5e698006b68 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 24 Jan 2018 20:56:29 +0100
Subject: [PATCH 192/574] Update changelog

---
 doc/changelog.asciidoc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 2dada6af7..1f804b03c 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -32,6 +32,9 @@ Changed
 - Deleting a prefix (`:`, `/` or `?`) via backspace now leaves command mode.
 - Angular 1 elements now get hints assigned.
 - `:tab-only` with pinned tabs now still closes unpinned tabs.
+- On Qt 5.7.1, GreaseMonkey `@include` and `@exclude` now support
+  regex matches. With Qt 5.8 and newer, Qt handles the matching, but
+  similar functionality will likely land in Qt 5.11.
 
 Fixed
 ~~~~~

From c153ff5a97e223c5c04e5aa8c2705222d3fa2fbe Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 24 Jan 2018 21:15:10 +0100
Subject: [PATCH 193/574] Update docs

---
 doc/changelog.asciidoc     | 2 ++
 doc/help/commands.asciidoc | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 1f804b03c..28e8a5ad9 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -23,6 +23,8 @@ Added
 
 - Caret/visual mode is now supported for QtWebEngine.
 - A new `qute://bindings` page, opened by `:bind`, shows all keybindings.
+- `:session-load` has a new `--delete` flag which deletes the
+  session after loading it.
 
 Changed
 ~~~~~~~
diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 1008de1bf..1d7ac608d 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -1068,7 +1068,7 @@ Delete a session.
 
 [[session-load]]
 === session-load
-Syntax: +:session-load [*--clear*] [*--temp*] [*--force*] 'name'+
+Syntax: +:session-load [*--clear*] [*--temp*] [*--force*] [*--delete*] 'name'+
 
 Load a session.
 
@@ -1080,6 +1080,7 @@ Load a session.
 * +*-t*+, +*--temp*+: Don't set the current session for :session-save.
 * +*-f*+, +*--force*+: Force loading internal sessions (starting with an underline).
 
+* +*-d*+, +*--delete*+: Delete the saved session once it has loaded.
 
 [[session-save]]
 === session-save

From 3df469bc38ee93f3d82835bca6cd34b297621bf8 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 24 Jan 2018 21:30:17 +0100
Subject: [PATCH 194/574] Update changelog

---
 doc/changelog.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 28e8a5ad9..3f78641f8 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -37,6 +37,8 @@ Changed
 - On Qt 5.7.1, GreaseMonkey `@include` and `@exclude` now support
   regex matches. With Qt 5.8 and newer, Qt handles the matching, but
   similar functionality will likely land in Qt 5.11.
+- The sqlite history now uses write-ahead logging which should be
+  a performance and stability improvement.
 
 Fixed
 ~~~~~

From 56f83ddde4d39d9eab7a902c21409c2eff15fd9c Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 24 Jan 2018 21:33:32 +0100
Subject: [PATCH 195/574] Update changelog

---
 doc/changelog.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 3f78641f8..268ea6c1f 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -44,6 +44,8 @@ Fixed
 ~~~~~
 
 - Improved fullscreen handling with Qt 5.10.
+- URLs containing ampersands and other special chars are now shown
+  correctly when filtering them in the completion.
 
 v1.1.1
 ------

From 4f04c776c1757caacf1b5935358ec79f8a3faf75 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Wed, 24 Jan 2018 22:21:22 +0100
Subject: [PATCH 196/574] fixup! fixup! incdec_number: add support for port

---
 qutebrowser/browser/commands.py   | 8 ++++++--
 qutebrowser/utils/urlutils.py     | 3 ++-
 tests/unit/utils/test_urlutils.py | 1 -
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 6eaa3e167..09a72176a 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -638,9 +638,13 @@ class CommandDispatcher:
                 - `next`: Open a _next_ link.
                 - `up`: Go up a level in the current URL.
                 - `increment`: Increment the last number in the URL.
-                  Uses the link:settings.html#url.incdec_segments[url.incdec_segments] config option.
+                  Uses the
+                  link:settings.html#url.incdec_segments[url.incdec_segments]
+                  config option.
                 - `decrement`: Decrement the last number in the URL.
-                  Uses the link:settings.html#url.incdec_segments[url.incdec_segments] config option.
+                  Uses the
+                  link:settings.html#url.incdec_segments[url.incdec_segments]
+                  config option.
 
             tab: Open in a new tab.
             bg: Open in a background tab.
diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py
index 88853483e..0cbe6d88e 100644
--- a/qutebrowser/utils/urlutils.py
+++ b/qutebrowser/utils/urlutils.py
@@ -561,7 +561,8 @@ def incdec_number(url, incdec, count=1, segments=None):
     # Order as they appear in a URL
     segment_modifiers = [
         ('host', url.host, url.setHost),
-        ('port', lambda: str(url.port()) if url.port() > 0 else '', lambda x: url.setPort(int(x))),
+        ('port', lambda: str(url.port()) if url.port() > 0 else '',
+         lambda x: url.setPort(int(x))),
         ('path', url.path, url.setPath),
         ('query', url.query, url.setQuery),
         ('anchor', url.fragment, url.setFragment),
diff --git a/tests/unit/utils/test_urlutils.py b/tests/unit/utils/test_urlutils.py
index de83ba7bf..d7f009a37 100644
--- a/tests/unit/utils/test_urlutils.py
+++ b/tests/unit/utils/test_urlutils.py
@@ -624,7 +624,6 @@ class TestIncDecNumber:
 
     def test_incdec_port(self):
         """Test incdec_number with port."""
-
         base_url = QUrl('http://localhost:8000')
         new_url = urlutils.incdec_number(
             base_url, 'increment', segments={'port'})

From d7c51f7fc4fd6df9c01e78cc20626f85f42a72b1 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Wed, 24 Jan 2018 18:04:05 -0500
Subject: [PATCH 197/574] implement requested changes for PR #3521.

---
 qutebrowser/browser/browsertab.py             |  5 +---
 qutebrowser/browser/commands.py               | 12 ++++-----
 qutebrowser/browser/webengine/webenginetab.py | 18 ++++++++-----
 qutebrowser/browser/webkit/webkittab.py       | 25 +++++++++++++------
 4 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index e90c71f5d..80cdbd5a6 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -94,7 +94,6 @@ class TabData:
         keep_icon: Whether the (e.g. cloned) icon should not be cleared on page
                    load.
         inspector: The QWebInspector used for this webview.
-        viewing_source: Set if we're currently showing a source view.
         override_target: Override for open_target for fake clicks (like hints).
                          Only used for QtWebKit.
         pinned: Flag to pin the tab.
@@ -102,7 +101,6 @@ class TabData:
     """
 
     keep_icon = attr.ib(False)
-    viewing_source = attr.ib(False)
     inspector = attr.ib(None)
     override_target = attr.ib(None)
     pinned = attr.ib(False)
@@ -139,7 +137,7 @@ class AbstractAction:
             raise WebTabError("{} is not a valid web action!".format(name))
         self._widget.triggerPageAction(member)
 
-    def show_source(self, dispatcher, url):
+    def show_source(self, win_id, url):
         """Show the source of the current page in a new tab."""
         raise NotImplementedError
 
@@ -727,7 +725,6 @@ class AbstractTab(QWidget):
     def _on_load_started(self):
         self._progress = 0
         self._has_ssl_errors = False
-        self.data.viewing_source = False
         self._set_load_status(usertypes.LoadStatus.loading)
         self.load_started.emit()
 
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 3f616d1f0..42b7d685e 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -29,9 +29,6 @@ from PyQt5.QtWidgets import QApplication, QTabBar, QDialog
 from PyQt5.QtCore import Qt, QUrl, QEvent, QUrlQuery
 from PyQt5.QtGui import QKeyEvent
 from PyQt5.QtPrintSupport import QPrintDialog, QPrintPreviewDialog
-import pygments
-import pygments.lexers
-import pygments.formatters
 
 from qutebrowser.commands import userscripts, cmdexc, cmdutils, runners
 from qutebrowser.config import config, configdata
@@ -758,6 +755,7 @@ class CommandDispatcher:
         else:
             x = None
             y = perc
+
         self._current_widget().scroller.to_perc(x, y)
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
@@ -1503,15 +1501,15 @@ class CommandDispatcher:
     def view_source(self):
         """Show the source of the current page in a new tab."""
         tab = self._current_widget()
-        if tab.data.viewing_source:
-            raise cmdexc.CommandError("Already viewing source!")
-
         try:
             current_url = self._current_url()
         except cmdexc.CommandError as e:
             message.error(str(e))
             return
-        tab.action.show_source(self, current_url)
+        if current_url.scheme() == 'view-source':
+            raise cmdexc.CommandError("Already viewing source!")
+
+        tab.action.show_source(self._win_id, current_url)
 
     @cmdutils.register(instance='command-dispatcher', scope='window',
                        debug=True)
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 496df50e5..2b9d9418a 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -99,12 +99,18 @@ class WebEngineAction(browsertab.AbstractAction):
         """Save the current page."""
         self._widget.triggerPageAction(QWebEnginePage.SavePage)
 
-    def show_source(self, dispatcher, url):
-        # use view-source: scheme to show page source for webengine
-        url = QUrl('view-source:{}'.format(url.toString()))
-        new_tab = dispatcher._tabbed_browser.tabopen(
-            url, background=True, related=True)
-        new_tab.data.viewing_source = True
+    def show_source(self, win_id, url):
+        try:
+            self._widget.triggerPageAction(QWebEnginePage.ViewSource)
+        except AttributeError:
+            # Qt < 5.8
+            # note: it's not possible to build the QUrl object by setting the
+            # scheme using setScheme('view-source').
+            # QUrl does the right thing when URL prefix is "view-source:".
+            new_url = QUrl('view-source:' + url.toString())
+            tabbed_browser = objreg.get('tabbed-browser', scope='window',
+                                        window=win_id)
+            tabbed_browser.tabopen(new_url, background=False, related=True)
 
 
 class WebEnginePrinting(browsertab.AbstractPrinting):
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 6edda24ed..caaa32738 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -54,7 +54,15 @@ class WebKitAction(browsertab.AbstractAction):
         """Save the current page."""
         raise browsertab.UnsupportedOperationError
 
-    def show_source(self, dispatcher, url):
+    def show_source(self, win_id, url):
+
+        def format_url(url):
+            """emulate what WebEnginePage::ViewSource does."""
+            s = url.toString()
+            s = s.split('//')[-1]  # strip scheme
+            s = s.split('@')[-1]   # strip userinfo
+            return s
+
         def show_source_cb(source):
             """Show source as soon as it's ready."""
             # WORKAROUND for https://github.com/PyCQA/pylint/issues/491
@@ -62,16 +70,17 @@ class WebKitAction(browsertab.AbstractAction):
             lexer = pygments.lexers.HtmlLexer()
             formatter = pygments.formatters.HtmlFormatter(
                 full=True, linenos='table',
-                title='view-source:{}'.format(url.toDisplayString()))
+                title='view-source:' + format_url(url))
             # pylint: enable=no-member
             highlighted = pygments.highlight(source, lexer, formatter)
 
-            new_tab = dispatcher._tabbed_browser.tabopen()
-            new_tab.set_html(highlighted)
-            new_tab.data.viewing_source = True
-            new_tab.url = lambda requested=False: QUrl(
-                'view-source:' + url.toDisplayString())
-        dispatcher._current_widget().dump_async(show_source_cb)
+            base_url = QUrl('view-source:' + url.toString())
+            new_tab = tabbed_browser.tabopen(background=False, related=True)
+            new_tab.set_html(highlighted, base_url)
+
+        tabbed_browser = objreg.get('tabbed-browser', scope='window',
+                                    window=win_id)
+        tabbed_browser.currentWidget().dump_async(show_source_cb)
 
 
 class WebKitPrinting(browsertab.AbstractPrinting):

From d77c9ae00903325de2ca2e114436c201b837d425 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Wed, 24 Jan 2018 18:53:06 -0500
Subject: [PATCH 198/574] Add prompt-yank command

add yank_text property to utils.usertypes.Question class

Resolves #2591
---
 qutebrowser/browser/downloads.py |  1 +
 qutebrowser/mainwindow/prompt.py | 13 +++++++++++++
 qutebrowser/utils/usertypes.py   |  2 ++
 3 files changed, 16 insertions(+)

diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index c064d700e..94dc2b471 100644
--- a/qutebrowser/browser/downloads.py
+++ b/qutebrowser/browser/downloads.py
@@ -166,6 +166,7 @@ def get_filename_question(*, suggested_filename, url, parent=None):
     q.title = "Save file to:"
     q.text = "Please enter a location for <b>{}</b>".format(
         html.escape(url.toDisplayString()))
+    q.yank_text = url.toString()
     q.mode = usertypes.PromptMode.download
     q.completed.connect(q.deleteLater)
     q.default = _path_suggestion(suggested_filename)
diff --git a/qutebrowser/mainwindow/prompt.py b/qutebrowser/mainwindow/prompt.py
index 3d21a52e0..f9c685c86 100644
--- a/qutebrowser/mainwindow/prompt.py
+++ b/qutebrowser/mainwindow/prompt.py
@@ -422,6 +422,18 @@ class PromptContainer(QWidget):
         except UnsupportedOperationError:
             pass
 
+    @cmdutils.register(instance='prompt-container', scope='window',
+                       modes=[usertypes.KeyMode.prompt])
+    def prompt_yank(self):
+        """Yank URLs or other data in prompts."""
+        question = self._prompt.question
+        s = None
+        if question and hasattr(question, 'yank_text'):
+            s = question.yank_text
+        utils.set_clipboard(s)
+        message.info("Yanked download URL to clipboard: {}".format(s))
+
+
 
 class LineEdit(QLineEdit):
 
@@ -721,6 +733,7 @@ class DownloadFilenamePrompt(FilenamePrompt):
             ('prompt-accept', 'Accept'),
             ('leave-mode', 'Abort'),
             ('prompt-open-download', "Open download"),
+            ('prompt-yank', "Yank URLs in prompts"),
         ]
         return cmds
 
diff --git a/qutebrowser/utils/usertypes.py b/qutebrowser/utils/usertypes.py
index aad685d07..da1c2f00b 100644
--- a/qutebrowser/utils/usertypes.py
+++ b/qutebrowser/utils/usertypes.py
@@ -266,6 +266,7 @@ class Question(QObject):
                  For user_pwd, a default username as string.
         title: The question title to show.
         text: The prompt text to display to the user.
+        yank_text: The prompt text available to prompt-yank command.
         answer: The value the user entered (as password for user_pwd).
         is_aborted: Whether the question was aborted.
         interrupted: Whether the question was interrupted by another one.
@@ -296,6 +297,7 @@ class Question(QObject):
         self.default = None
         self.title = None
         self.text = None
+        self.yank_text = None
         self.answer = None
         self.is_aborted = False
         self.interrupted = False

From 3b1fb92b11e9560732da3cf0e6e3df23ea403b73 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Wed, 24 Jan 2018 19:13:28 -0500
Subject: [PATCH 199/574] remove extra line to satisfy flake8

---
 qutebrowser/mainwindow/prompt.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qutebrowser/mainwindow/prompt.py b/qutebrowser/mainwindow/prompt.py
index f9c685c86..0a1142b81 100644
--- a/qutebrowser/mainwindow/prompt.py
+++ b/qutebrowser/mainwindow/prompt.py
@@ -434,7 +434,6 @@ class PromptContainer(QWidget):
         message.info("Yanked download URL to clipboard: {}".format(s))
 
 
-
 class LineEdit(QLineEdit):
 
     """A line edit used in prompts."""

From ab4c8757927968bad0ee02fb3db02ad31cde42b1 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 25 Jan 2018 09:03:47 +0100
Subject: [PATCH 200/574] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 268ea6c1f..e450bae99 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -39,6 +39,7 @@ Changed
   similar functionality will likely land in Qt 5.11.
 - The sqlite history now uses write-ahead logging which should be
   a performance and stability improvement.
+- The `url.incdec_segments` option now also can take `port` as possible segment.
 
 Fixed
 ~~~~~

From b93bee18d00ebaca577137b306b2330d14e06097 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 25 Jan 2018 11:03:45 +0100
Subject: [PATCH 201/574] Regenerate docs

---
 doc/help/commands.asciidoc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index b469104e6..1b65dbdd7 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -743,9 +743,13 @@ This tries to automatically click on typical _Previous Page_ or _Next Page_ link
  - `next`: Open a _next_ link.
  - `up`: Go up a level in the current URL.
  - `increment`: Increment the last number in the URL.
- Uses the link:settings.html#url.incdec_segments[url.incdec_segments] config option.
+ Uses the
+ link:settings.html#url.incdec_segments[url.incdec_segments]
+ config option.
  - `decrement`: Decrement the last number in the URL.
- Uses the link:settings.html#url.incdec_segments[url.incdec_segments] config option.
+ Uses the
+ link:settings.html#url.incdec_segments[url.incdec_segments]
+ config option.
  
 
 

From eb888cc8d77cfdba90f85678de223002bdf731c6 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Thu, 25 Jan 2018 13:35:23 -0500
Subject: [PATCH 202/574] fix latest change requests

---
 qutebrowser/browser/browsertab.py             |  6 +++--
 qutebrowser/browser/commands.py               |  2 +-
 qutebrowser/browser/webengine/webenginetab.py | 16 ++++++-------
 qutebrowser/browser/webkit/webkittab.py       | 24 +++++++------------
 tests/end2end/features/history.feature        |  2 +-
 tests/unit/browser/test_tab.py                |  2 +-
 6 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 80cdbd5a6..f0015dd47 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -119,8 +119,10 @@ class AbstractAction:
     action_class = None
     action_base = None
 
-    def __init__(self):
+    def __init__(self, tab, win_id):
         self._widget = None
+        self._tab = tab
+        self._win_id = win_id
 
     def exit_fullscreen(self):
         """Exit the fullscreen mode."""
@@ -137,7 +139,7 @@ class AbstractAction:
             raise WebTabError("{} is not a valid web action!".format(name))
         self._widget.triggerPageAction(member)
 
-    def show_source(self, win_id, url):
+    def show_source(self):
         """Show the source of the current page in a new tab."""
         raise NotImplementedError
 
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 42b7d685e..f7d9bdf73 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1509,7 +1509,7 @@ class CommandDispatcher:
         if current_url.scheme() == 'view-source':
             raise cmdexc.CommandError("Already viewing source!")
 
-        tab.action.show_source(self._win_id, current_url)
+        tab.action.show_source()
 
     @cmdutils.register(instance='command-dispatcher', scope='window',
                        debug=True)
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 2b9d9418a..7e2a81af6 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -99,18 +99,16 @@ class WebEngineAction(browsertab.AbstractAction):
         """Save the current page."""
         self._widget.triggerPageAction(QWebEnginePage.SavePage)
 
-    def show_source(self, win_id, url):
+    def show_source(self):
         try:
             self._widget.triggerPageAction(QWebEnginePage.ViewSource)
         except AttributeError:
             # Qt < 5.8
-            # note: it's not possible to build the QUrl object by setting the
-            # scheme using setScheme('view-source').
-            # QUrl does the right thing when URL prefix is "view-source:".
-            new_url = QUrl('view-source:' + url.toString())
-            tabbed_browser = objreg.get('tabbed-browser', scope='window',
-                                        window=win_id)
-            tabbed_browser.tabopen(new_url, background=False, related=True)
+            url_str = self._tab.url().toString(QUrl.RemoveUserInfo)
+            new_url = QUrl('view-source:' + url_str)
+            tb = objreg.get('tabbed-browser', scope='window',
+                            window=self._win_id)
+            tb.tabopen(new_url, background=False, related=True)
 
 
 class WebEnginePrinting(browsertab.AbstractPrinting):
@@ -609,7 +607,7 @@ class WebEngineTab(browsertab.AbstractTab):
         self.search = WebEngineSearch(parent=self)
         self.printing = WebEnginePrinting()
         self.elements = WebEngineElements(self)
-        self.action = WebEngineAction()
+        self.action = WebEngineAction(self, win_id)
         self._set_widget(widget)
         self._connect_signals()
         self.backend = usertypes.Backend.QtWebEngine
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index caaa32738..92820642c 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -54,14 +54,7 @@ class WebKitAction(browsertab.AbstractAction):
         """Save the current page."""
         raise browsertab.UnsupportedOperationError
 
-    def show_source(self, win_id, url):
-
-        def format_url(url):
-            """emulate what WebEnginePage::ViewSource does."""
-            s = url.toString()
-            s = s.split('//')[-1]  # strip scheme
-            s = s.split('@')[-1]   # strip userinfo
-            return s
+    def show_source(self):
 
         def show_source_cb(source):
             """Show source as soon as it's ready."""
@@ -70,17 +63,18 @@ class WebKitAction(browsertab.AbstractAction):
             lexer = pygments.lexers.HtmlLexer()
             formatter = pygments.formatters.HtmlFormatter(
                 full=True, linenos='table',
-                title='view-source:' + format_url(url))
+                title='Source for {}'.format(url_str))
             # pylint: enable=no-member
             highlighted = pygments.highlight(source, lexer, formatter)
 
-            base_url = QUrl('view-source:' + url.toString())
-            new_tab = tabbed_browser.tabopen(background=False, related=True)
+            base_url = QUrl('view-source:' + url_str)
+            tb = objreg.get('tabbed-browser', scope='window',
+                            window=self._win_id)
+            new_tab = tb.tabopen(background=False, related=True)
             new_tab.set_html(highlighted, base_url)
 
-        tabbed_browser = objreg.get('tabbed-browser', scope='window',
-                                    window=win_id)
-        tabbed_browser.currentWidget().dump_async(show_source_cb)
+        url_str = self._tab.url().toString(QUrl.RemoveUserInfo)
+        self._tab.dump_async(show_source_cb)
 
 
 class WebKitPrinting(browsertab.AbstractPrinting):
@@ -657,7 +651,7 @@ class WebKitTab(browsertab.AbstractTab):
         self.search = WebKitSearch(parent=self)
         self.printing = WebKitPrinting()
         self.elements = WebKitElements(self)
-        self.action = WebKitAction()
+        self.action = WebKitAction(self, win_id)
         self._set_widget(widget)
         self._connect_signals()
         self.backend = usertypes.Backend.QtWebKit
diff --git a/tests/end2end/features/history.feature b/tests/end2end/features/history.feature
index df6610daf..e9ef56129 100644
--- a/tests/end2end/features/history.feature
+++ b/tests/end2end/features/history.feature
@@ -69,7 +69,7 @@ Feature: Page history
     Scenario: History with view-source URL
         When I open data/title.html
         And I run :view-source
-        And I wait for "Changing title for idx * to 'view-source:http://localhost:*/data/title.html'" in the log
+        And I wait for regex "Changing title for idx \d+ to '(Source for |view-source:)(http://)?localhost:\d+/data/title.html'" in the log
         Then the history should contain:
             http://localhost:(port)/data/title.html Test title
 
diff --git a/tests/unit/browser/test_tab.py b/tests/unit/browser/test_tab.py
index d67ee4c8f..7ceb9795b 100644
--- a/tests/unit/browser/test_tab.py
+++ b/tests/unit/browser/test_tab.py
@@ -87,7 +87,7 @@ class Tab(browsertab.AbstractTab):
         self.search = browsertab.AbstractSearch(parent=self)
         self.printing = browsertab.AbstractPrinting()
         self.elements = browsertab.AbstractElements(self)
-        self.action = browsertab.AbstractAction()
+        self.action = browsertab.AbstractAction(self, self.win_id)
 
     def _install_event_filter(self):
         pass

From bb8bc7ea3cd55baf79fe152165228cd8802b3421 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Thu, 25 Jan 2018 15:17:03 -0500
Subject: [PATCH 203/574] fix test related to view-source remove pygment title
 remove view-source from history

---
 qutebrowser/browser/history.py                | 2 +-
 qutebrowser/browser/webengine/webenginetab.py | 8 +++++---
 qutebrowser/browser/webkit/webkittab.py       | 9 +++++----
 tests/end2end/features/history.feature        | 2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py
index 04bc1be15..995fb591d 100644
--- a/qutebrowser/browser/history.py
+++ b/qutebrowser/browser/history.py
@@ -172,7 +172,7 @@ class WebHistory(sql.SqlTable):
     @pyqtSlot(QUrl, QUrl, str)
     def add_from_tab(self, url, requested_url, title):
         """Add a new history entry as slot, called from a BrowserTab."""
-        if any(url.scheme() == 'data' or
+        if any(url.scheme() in ('data', 'view-source') or
                (url.scheme(), url.host()) == ('qute', 'back')
                for url in (url, requested_url)):
             return
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 7e2a81af6..e7fb07275 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -104,11 +104,13 @@ class WebEngineAction(browsertab.AbstractAction):
             self._widget.triggerPageAction(QWebEnginePage.ViewSource)
         except AttributeError:
             # Qt < 5.8
-            url_str = self._tab.url().toString(QUrl.RemoveUserInfo)
-            new_url = QUrl('view-source:' + url_str)
             tb = objreg.get('tabbed-browser', scope='window',
                             window=self._win_id)
-            tb.tabopen(new_url, background=False, related=True)
+            url_str = self._tab.url().toString(QUrl.RemoveUserInfo)
+            # The original URL becomes the path of a view-source: URL
+            # (without a host), but query/fragment should stay.
+            url = QUrl('view-source:' + url_str)
+            tb.tabopen(url, background=False, related=True)
 
 
 class WebEnginePrinting(browsertab.AbstractPrinting):
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 92820642c..49fd150ae 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -62,16 +62,17 @@ class WebKitAction(browsertab.AbstractAction):
             # pylint: disable=no-member
             lexer = pygments.lexers.HtmlLexer()
             formatter = pygments.formatters.HtmlFormatter(
-                full=True, linenos='table',
-                title='Source for {}'.format(url_str))
+                full=True, linenos='table')
             # pylint: enable=no-member
             highlighted = pygments.highlight(source, lexer, formatter)
 
-            base_url = QUrl('view-source:' + url_str)
             tb = objreg.get('tabbed-browser', scope='window',
                             window=self._win_id)
             new_tab = tb.tabopen(background=False, related=True)
-            new_tab.set_html(highlighted, base_url)
+            # The original URL becomes the path of a view-source: URL
+            # (without a host), but query/fragment should stay.
+            url = QUrl('view-source:' + url_str)
+            new_tab.set_html(highlighted, url)
 
         url_str = self._tab.url().toString(QUrl.RemoveUserInfo)
         self._tab.dump_async(show_source_cb)
diff --git a/tests/end2end/features/history.feature b/tests/end2end/features/history.feature
index e9ef56129..9863d2c7f 100644
--- a/tests/end2end/features/history.feature
+++ b/tests/end2end/features/history.feature
@@ -69,7 +69,7 @@ Feature: Page history
     Scenario: History with view-source URL
         When I open data/title.html
         And I run :view-source
-        And I wait for regex "Changing title for idx \d+ to '(Source for |view-source:)(http://)?localhost:\d+/data/title.html'" in the log
+        And I wait for regex "Changing title for idx \d+ to 'view-source:(http://)?localhost:\d+/data/title.html'" in the log
         Then the history should contain:
             http://localhost:(port)/data/title.html Test title
 

From 520b4733501a274a03482d25a7d5c08dabcacbea Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Thu, 25 Jan 2018 17:48:45 -0500
Subject: [PATCH 204/574] modify Question.yank_text to Question.url error out
 when question.url is None add url to yesno prompts add default binding in
 prompt mode (ctrl-y)

---
 doc/help/commands.asciidoc                    |  5 +++++
 doc/help/settings.asciidoc                    |  1 +
 qutebrowser/browser/downloads.py              |  4 ++--
 qutebrowser/browser/qtnetworkdownloads.py     |  7 ++++--
 qutebrowser/browser/shared.py                 | 22 +++++++++++++------
 qutebrowser/browser/urlmarks.py               |  5 +++--
 .../browser/webengine/webenginedownloads.py   |  2 ++
 qutebrowser/browser/webengine/webenginetab.py |  3 ++-
 qutebrowser/browser/webkit/webpage.py         |  3 ++-
 qutebrowser/config/configdata.yml             |  1 +
 qutebrowser/mainwindow/prompt.py              | 19 +++++++++-------
 qutebrowser/utils/message.py                  |  4 +++-
 qutebrowser/utils/usertypes.py                |  4 ++--
 13 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 1008de1bf..16473c547 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -1404,6 +1404,7 @@ How many steps to zoom out.
 |<<prompt-accept,prompt-accept>>|Accept the current prompt.
 |<<prompt-item-focus,prompt-item-focus>>|Shift the focus of the prompt file completion menu to another item.
 |<<prompt-open-download,prompt-open-download>>|Immediately open a download.
+|<<prompt-yank,prompt-yank>>|Yank URL.
 |<<rl-backward-char,rl-backward-char>>|Move back a character.
 |<<rl-backward-delete-char,rl-backward-delete-char>>|Delete the character before the cursor.
 |<<rl-backward-kill-word,rl-backward-kill-word>>|Remove chars from the cursor to the beginning of the word.
@@ -1609,6 +1610,10 @@ If no specific command is given, this will use the system's default application
 ==== note
 * This command does not split arguments after the last argument and handles quotes literally.
 
+[[prompt-yank]]
+=== prompt-yank
+Yank URL.
+
 [[rl-backward-char]]
 === rl-backward-char
 Move back a character.
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 73aae6fb2..b648a65c4 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -627,6 +627,7 @@ Default:
 * +pass:[&lt;Ctrl-W&gt;]+: +pass:[rl-unix-word-rubout]+
 * +pass:[&lt;Ctrl-X&gt;]+: +pass:[prompt-open-download]+
 * +pass:[&lt;Ctrl-Y&gt;]+: +pass:[rl-yank]+
+* +pass:[&lt;Ctrl-y&gt;]+: +pass:[prompt-yank]+
 * +pass:[&lt;Down&gt;]+: +pass:[prompt-item-focus next]+
 * +pass:[&lt;Escape&gt;]+: +pass:[leave-mode]+
 * +pass:[&lt;Return&gt;]+: +pass:[prompt-accept]+
diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index 94dc2b471..d174ebdd2 100644
--- a/qutebrowser/browser/downloads.py
+++ b/qutebrowser/browser/downloads.py
@@ -31,7 +31,7 @@ import enum
 
 import sip
 from PyQt5.QtCore import (pyqtSlot, pyqtSignal, Qt, QObject, QModelIndex,
-                          QTimer, QAbstractListModel)
+                          QTimer, QAbstractListModel, QUrl)
 
 from qutebrowser.commands import cmdexc, cmdutils
 from qutebrowser.config import config
@@ -166,7 +166,7 @@ def get_filename_question(*, suggested_filename, url, parent=None):
     q.title = "Save file to:"
     q.text = "Please enter a location for <b>{}</b>".format(
         html.escape(url.toDisplayString()))
-    q.yank_text = url.toString()
+    q.url = url.toString(QUrl.RemoveUserInfo)
     q.mode = usertypes.PromptMode.download
     q.completed.connect(q.deleteLater)
     q.default = _path_suggestion(suggested_filename)
diff --git a/qutebrowser/browser/qtnetworkdownloads.py b/qutebrowser/browser/qtnetworkdownloads.py
index 378bc72b5..6e3dd7b29 100644
--- a/qutebrowser/browser/qtnetworkdownloads.py
+++ b/qutebrowser/browser/qtnetworkdownloads.py
@@ -20,6 +20,7 @@
 """Download manager."""
 
 import io
+import os
 import shutil
 import functools
 
@@ -198,21 +199,23 @@ class DownloadItem(downloads.AbstractDownloadItem):
 
     def _ask_confirm_question(self, title, msg):
         no_action = functools.partial(self.cancel, remove_data=False)
+        url = 'file://{}'.format(self._filename)
         message.confirm_async(title=title, text=msg,
                               yes_action=self._after_set_filename,
                               no_action=no_action, cancel_action=no_action,
-                              abort_on=[self.cancelled, self.error])
+                              abort_on=[self.cancelled, self.error], url=url)
 
     def _ask_create_parent_question(self, title, msg,
                                     force_overwrite, remember_directory):
         no_action = functools.partial(self.cancel, remove_data=False)
+        url = 'file://{}'.format(os.path.dirname(self._filename))
         message.confirm_async(title=title, text=msg,
                               yes_action=(lambda:
                                           self._after_create_parent_question(
                                               force_overwrite,
                                               remember_directory)),
                               no_action=no_action, cancel_action=no_action,
-                              abort_on=[self.cancelled, self.error])
+                              abort_on=[self.cancelled, self.error], url=url)
 
     def _set_fileobj(self, fileobj, *, autoclose=True):
         """Set the file object to write the download to.
diff --git a/qutebrowser/browser/shared.py b/qutebrowser/browser/shared.py
index b6bfefe7b..43486b8f8 100644
--- a/qutebrowser/browser/shared.py
+++ b/qutebrowser/browser/shared.py
@@ -21,13 +21,14 @@
 
 import html
 
+from PyQt5.QtCore import QUrl
+
 from qutebrowser.config import config
 from qutebrowser.utils import usertypes, message, log, objreg, jinja, utils
 from qutebrowser.mainwindow import mainwindow
 
 
 class CallSuper(Exception):
-
     """Raised when the caller should call the superclass instead."""
 
 
@@ -61,9 +62,10 @@ def authentication_required(url, authenticator, abort_on):
     else:
         msg = '<b>{}</b> needs authentication'.format(
             html.escape(url.toDisplayString()))
+    urlstr = url.toString(QUrl.RemoveUserInfo)
     answer = message.ask(title="Authentication required", text=msg,
                          mode=usertypes.PromptMode.user_pwd,
-                         abort_on=abort_on)
+                         abort_on=abort_on, url=urlstr)
     if answer is not None:
         authenticator.setUser(answer.user)
         authenticator.setPassword(answer.password)
@@ -78,9 +80,10 @@ def javascript_confirm(url, js_msg, abort_on):
 
     msg = 'From <b>{}</b>:<br/>{}'.format(html.escape(url.toDisplayString()),
                                           html.escape(js_msg))
+    urlstr = url.toString(QUrl.RemoveUserInfo)
     ans = message.ask('Javascript confirm', msg,
                       mode=usertypes.PromptMode.yesno,
-                      abort_on=abort_on)
+                      abort_on=abort_on, url=urlstr)
     return bool(ans)
 
 
@@ -94,10 +97,11 @@ def javascript_prompt(url, js_msg, default, abort_on):
 
     msg = '<b>{}</b> asks:<br/>{}'.format(html.escape(url.toDisplayString()),
                                           html.escape(js_msg))
+    urlstr = url.toString(QUrl.RemoveUserInfo)
     answer = message.ask('Javascript prompt', msg,
                          mode=usertypes.PromptMode.text,
                          default=default,
-                         abort_on=abort_on)
+                         abort_on=abort_on, url=urlstr)
 
     if answer is None:
         return (False, "")
@@ -116,8 +120,9 @@ def javascript_alert(url, js_msg, abort_on):
 
     msg = 'From <b>{}</b>:<br/>{}'.format(html.escape(url.toDisplayString()),
                                           html.escape(js_msg))
+    urlstr = url.toString(QUrl.RemoveUserInfo)
     message.ask('Javascript alert', msg, mode=usertypes.PromptMode.alert,
-                abort_on=abort_on)
+                abort_on=abort_on, url=urlstr)
 
 
 def javascript_log_message(level, source, line, msg):
@@ -164,9 +169,10 @@ def ignore_certificate_errors(url, errors, abort_on):
         """.strip())
         msg = err_template.render(url=url, errors=errors)
 
+        urlstr = url.toString(QUrl.RemoveUserInfo)
         ignore = message.ask(title="Certificate errors - continue?", text=msg,
                              mode=usertypes.PromptMode.yesno, default=False,
-                             abort_on=abort_on)
+                             abort_on=abort_on, url=urlstr)
         if ignore is None:
             # prompt aborted
             ignore = False
@@ -202,15 +208,17 @@ def feature_permission(url, option, msg, yes_action, no_action, abort_on):
     config_val = config.instance.get(option)
     if config_val == 'ask':
         if url.isValid():
+            urlstr = url.toString(QUrl.RemoveUserInfo)
             text = "Allow the website at <b>{}</b> to {}?".format(
                 html.escape(url.toDisplayString()), msg)
         else:
+            urlstr = None
             text = "Allow the website to {}?".format(msg)
 
         return message.confirm_async(
             yes_action=yes_action, no_action=no_action,
             cancel_action=no_action, abort_on=abort_on,
-            title='Permission request', text=text)
+            title='Permission request', text=text, url=urlstr)
     elif config_val:
         yes_action()
         return None
diff --git a/qutebrowser/browser/urlmarks.py b/qutebrowser/browser/urlmarks.py
index 5e2c60dfb..0ef8b9cb6 100644
--- a/qutebrowser/browser/urlmarks.py
+++ b/qutebrowser/browser/urlmarks.py
@@ -161,7 +161,7 @@ class QuickmarkManager(UrlMarkManager):
             "Add quickmark:", usertypes.PromptMode.text,
             functools.partial(self.quickmark_add, urlstr),
             text="Please enter a quickmark name for<br/><b>{}</b>".format(
-                html.escape(url.toDisplayString())))
+                html.escape(url.toDisplayString())), url=urlstr)
 
     @cmdutils.register(instance='quickmark-manager')
     def quickmark_add(self, url, name):
@@ -189,10 +189,11 @@ class QuickmarkManager(UrlMarkManager):
             self.changed.emit()
             log.misc.debug("Added quickmark {} for {}".format(name, url))
 
+        urlstr = url.toString(QUrl.RemoveUserInfo)
         if name in self.marks:
             message.confirm_async(
                 title="Override existing quickmark?",
-                yes_action=set_mark, default=True)
+                yes_action=set_mark, default=True, url=urlstr)
         else:
             set_mark()
 
diff --git a/qutebrowser/browser/webengine/webenginedownloads.py b/qutebrowser/browser/webengine/webenginedownloads.py
index d467724d5..506f4fccc 100644
--- a/qutebrowser/browser/webengine/webenginedownloads.py
+++ b/qutebrowser/browser/webengine/webenginedownloads.py
@@ -125,6 +125,7 @@ class DownloadItem(downloads.AbstractDownloadItem):
         question = usertypes.Question()
         question.title = title
         question.text = msg
+        question.url = 'file://{}'.format(self._filename)
         question.mode = usertypes.PromptMode.yesno
         question.answered_yes.connect(self._after_set_filename)
         question.answered_no.connect(no_action)
@@ -139,6 +140,7 @@ class DownloadItem(downloads.AbstractDownloadItem):
         question = usertypes.Question()
         question.title = title
         question.text = msg
+        question.url = 'file://{}'.format(os.path.dirname(self._filename))
         question.mode = usertypes.PromptMode.yesno
         question.answered_yes.connect(lambda:
                                       self._after_create_parent_question(
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 0523972df..c7e6dfef3 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -753,10 +753,11 @@ class WebEngineTab(browsertab.AbstractTab):
         """Called when a proxy needs authentication."""
         msg = "<b>{}</b> requires a username and password.".format(
             html_utils.escape(proxy_host))
+        urlstr = url.toString(QUrl.RemoveUserInfo)
         answer = message.ask(
             title="Proxy authentication required", text=msg,
             mode=usertypes.PromptMode.user_pwd,
-            abort_on=[self.shutting_down, self.load_started])
+            abort_on=[self.shutting_down, self.load_started], url=urlstr)
         if answer is not None:
             authenticator.setUser(answer.user)
             authenticator.setPassword(answer.password)
diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index 89407fcdf..b1aaf3a45 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -147,7 +147,8 @@ class BrowserPage(QWebPage):
                 title="Open external application for {}-link?".format(scheme),
                 text="URL: <b>{}</b>".format(
                     html.escape(url.toDisplayString())),
-                yes_action=functools.partial(QDesktopServices.openUrl, url))
+                yes_action=functools.partial(QDesktopServices.openUrl, url),
+                url=urlstr)
             return True
         elif (info.domain, info.error) in ignored_errors:
             log.webview.debug("Ignored error on {}: {} (error domain: {}, "
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index a118a8b59..8e7f9d8a8 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -2350,6 +2350,7 @@ bindings.default:
       <Ctrl-W>: rl-unix-word-rubout
       <Alt-Backspace>: rl-backward-kill-word
       <Ctrl-Y>: rl-yank
+      <Ctrl-y>: prompt-yank
       <Ctrl-?>: rl-delete-char
       <Ctrl-H>: rl-backward-delete-char
       <Escape>: leave-mode
diff --git a/qutebrowser/mainwindow/prompt.py b/qutebrowser/mainwindow/prompt.py
index 0a1142b81..29afc62a4 100644
--- a/qutebrowser/mainwindow/prompt.py
+++ b/qutebrowser/mainwindow/prompt.py
@@ -422,16 +422,18 @@ class PromptContainer(QWidget):
         except UnsupportedOperationError:
             pass
 
-    @cmdutils.register(instance='prompt-container', scope='window',
-                       modes=[usertypes.KeyMode.prompt])
+    @cmdutils.register(
+        instance='prompt-container', scope='window',
+        modes=[usertypes.KeyMode.prompt, usertypes.KeyMode.yesno])
     def prompt_yank(self):
-        """Yank URLs or other data in prompts."""
+        """Yank URL."""
         question = self._prompt.question
-        s = None
-        if question and hasattr(question, 'yank_text'):
-            s = question.yank_text
+        if not question.url:
+            message.error('No URL found.')
+            return
+        s = question.url
         utils.set_clipboard(s)
-        message.info("Yanked download URL to clipboard: {}".format(s))
+        message.info("Yanked to clipboard: {}".format(s))
 
 
 class LineEdit(QLineEdit):
@@ -732,7 +734,7 @@ class DownloadFilenamePrompt(FilenamePrompt):
             ('prompt-accept', 'Accept'),
             ('leave-mode', 'Abort'),
             ('prompt-open-download', "Open download"),
-            ('prompt-yank', "Yank URLs in prompts"),
+            ('prompt-yank', "Yank URL"),
         ]
         return cmds
 
@@ -823,6 +825,7 @@ class YesNoPrompt(_BasePrompt):
         cmds = [
             ('prompt-accept yes', "Yes"),
             ('prompt-accept no', "No"),
+            ('prompt-yank', "Yank URL"),
         ]
 
         if self.question.default is not None:
diff --git a/qutebrowser/utils/message.py b/qutebrowser/utils/message.py
index 32395b8bd..1d321e767 100644
--- a/qutebrowser/utils/message.py
+++ b/qutebrowser/utils/message.py
@@ -87,7 +87,8 @@ def info(message, *, replace=False):
     global_bridge.show(usertypes.MessageLevel.info, message, replace)
 
 
-def _build_question(title, text=None, *, mode, default=None, abort_on=()):
+def _build_question(title, text=None, *, mode, default=None, abort_on=(),
+                    url=None):
     """Common function for ask/ask_async."""
     if not isinstance(mode, usertypes.PromptMode):
         raise TypeError("Mode {} is no PromptMode member!".format(mode))
@@ -96,6 +97,7 @@ def _build_question(title, text=None, *, mode, default=None, abort_on=()):
     question.text = text
     question.mode = mode
     question.default = default
+    question.url = url
     for sig in abort_on:
         sig.connect(question.abort)
     return question
diff --git a/qutebrowser/utils/usertypes.py b/qutebrowser/utils/usertypes.py
index da1c2f00b..45e7addfb 100644
--- a/qutebrowser/utils/usertypes.py
+++ b/qutebrowser/utils/usertypes.py
@@ -266,7 +266,7 @@ class Question(QObject):
                  For user_pwd, a default username as string.
         title: The question title to show.
         text: The prompt text to display to the user.
-        yank_text: The prompt text available to prompt-yank command.
+        url: Any URL referenced in prompts.
         answer: The value the user entered (as password for user_pwd).
         is_aborted: Whether the question was aborted.
         interrupted: Whether the question was interrupted by another one.
@@ -297,7 +297,7 @@ class Question(QObject):
         self.default = None
         self.title = None
         self.text = None
-        self.yank_text = None
+        self.url = None
         self.answer = None
         self.is_aborted = False
         self.interrupted = False

From 88ff0c0425a413e70be9ac98e6669a577a8e65ac Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Thu, 25 Jan 2018 18:01:43 -0500
Subject: [PATCH 205/574] url_str -> urlstr: urlstr used accross the codebase,
 more consistent

---
 qutebrowser/browser/webengine/webenginetab.py | 4 ++--
 qutebrowser/browser/webkit/webkittab.py       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index e7fb07275..c2bfe8a5d 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -106,10 +106,10 @@ class WebEngineAction(browsertab.AbstractAction):
             # Qt < 5.8
             tb = objreg.get('tabbed-browser', scope='window',
                             window=self._win_id)
-            url_str = self._tab.url().toString(QUrl.RemoveUserInfo)
+            urlstr = self._tab.url().toString(QUrl.RemoveUserInfo)
             # The original URL becomes the path of a view-source: URL
             # (without a host), but query/fragment should stay.
-            url = QUrl('view-source:' + url_str)
+            url = QUrl('view-source:' + urlstr)
             tb.tabopen(url, background=False, related=True)
 
 
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 49fd150ae..5a0de4983 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -71,10 +71,10 @@ class WebKitAction(browsertab.AbstractAction):
             new_tab = tb.tabopen(background=False, related=True)
             # The original URL becomes the path of a view-source: URL
             # (without a host), but query/fragment should stay.
-            url = QUrl('view-source:' + url_str)
+            url = QUrl('view-source:' + urlstr)
             new_tab.set_html(highlighted, url)
 
-        url_str = self._tab.url().toString(QUrl.RemoveUserInfo)
+        urlstr = self._tab.url().toString(QUrl.RemoveUserInfo)
         self._tab.dump_async(show_source_cb)
 
 

From ddcc960aa5c166e7999e5d7875f3670cbc803e18 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Thu, 25 Jan 2018 22:01:18 -0500
Subject: [PATCH 206/574] url arg was a string

---
 qutebrowser/browser/urlmarks.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/qutebrowser/browser/urlmarks.py b/qutebrowser/browser/urlmarks.py
index 0ef8b9cb6..f372b64b3 100644
--- a/qutebrowser/browser/urlmarks.py
+++ b/qutebrowser/browser/urlmarks.py
@@ -189,11 +189,10 @@ class QuickmarkManager(UrlMarkManager):
             self.changed.emit()
             log.misc.debug("Added quickmark {} for {}".format(name, url))
 
-        urlstr = url.toString(QUrl.RemoveUserInfo)
         if name in self.marks:
             message.confirm_async(
                 title="Override existing quickmark?",
-                yes_action=set_mark, default=True, url=urlstr)
+                yes_action=set_mark, default=True, url=url)
         else:
             set_mark()
 

From d2287b7a2ec7d01a6e5d82bb881c62f360951d8e Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Thu, 25 Jan 2018 22:38:25 -0500
Subject: [PATCH 207/574] move backend specific code out of AbstractTab into
 respective backend classes.

---
 qutebrowser/browser/browsertab.py             | 6 ------
 qutebrowser/browser/webengine/webenginetab.py | 2 ++
 qutebrowser/browser/webkit/webkittab.py       | 7 +++++++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index b53cd32ca..331934cb9 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -724,12 +724,6 @@ class AbstractTab(QWidget):
         self._progress = 0
         self._has_ssl_errors = False
         self.data.viewing_source = False
-        if self.backend == usertypes.Backend.QtWebKit:
-            obj = self.networkaccessmanager()
-        else:
-            obj = self
-        if hasattr(obj, 'netrc_used'):
-            delattr(obj, 'netrc_used')
         self._set_load_status(usertypes.LoadStatus.loading)
         self.load_started.emit()
 
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 4a05312f8..838bf3b55 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -783,6 +783,8 @@ class WebEngineTab(browsertab.AbstractTab):
             # https://bugreports.qt.io/browse/QTBUG-61506
             self.search.clear()
         super()._on_load_started()
+        if hasattr(self, 'netrc_used'):
+            delattr(self, 'netrc_used')
 
     @pyqtSlot(QWebEnginePage.RenderProcessTerminationStatus, int)
     def _on_render_process_terminated(self, status, exitcode):
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 6b8f067fd..29df35e8f 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -704,6 +704,13 @@ class WebKitTab(browsertab.AbstractTab):
         page = self._widget.page()
         return page.userAgentForUrl(self.url())
 
+    @pyqtSlot()
+    def _on_load_started(self):
+        super()._on_load_started()
+        obj = self.networkaccessmanager()
+        if hasattr(obj, 'netrc_used'):
+            delattr(obj, 'netrc_used')
+
     @pyqtSlot()
     def _on_frame_load_finished(self):
         """Make sure we emit an appropriate status when loading finished.

From 677e1888946d04cde79d840a7c056544ec16ae19 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 26 Jan 2018 09:37:35 +0100
Subject: [PATCH 208/574] Update docs

---
 doc/changelog.asciidoc                        | 3 +++
 qutebrowser/browser/webengine/webenginetab.py | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index e450bae99..e09d78236 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -40,6 +40,7 @@ Changed
 - The sqlite history now uses write-ahead logging which should be
   a performance and stability improvement.
 - The `url.incdec_segments` option now also can take `port` as possible segment.
+- `:view-source` now uses Chromium's `view-source:` scheme with QtWebEngine.
 
 Fixed
 ~~~~~
@@ -47,6 +48,8 @@ Fixed
 - Improved fullscreen handling with Qt 5.10.
 - URLs containing ampersands and other special chars are now shown
   correctly when filtering them in the completion.
+- Hinting and scrolling now works properly on special `view-source:` pages.
+- `:view-source` now displays a valid URL with QtWebKit.
 
 v1.1.1
 ------
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index c2bfe8a5d..8c10736fd 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -626,6 +626,8 @@ class WebEngineTab(browsertab.AbstractTab):
             utils.read_file('javascript/caret.js'),
         ])
         script = QWebEngineScript()
+        # We can't use DocumentCreation here as WORKAROUND for
+        # https://bugreports.qt.io/browse/QTBUG-66011
         script.setInjectionPoint(QWebEngineScript.DocumentReady)
         script.setSourceCode(js_code)
 

From 4b9bba750516a1751e5f8694c10fdea67bcc8260 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 26 Jan 2018 09:38:49 +0100
Subject: [PATCH 209/574] Edit changelog

---
 doc/changelog.asciidoc | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index e09d78236..c9cb327b3 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -21,7 +21,7 @@ v1.2.0 (unreleased)
 Added
 ~~~~~
 
-- Caret/visual mode is now supported for QtWebEngine.
+- QtWebEngine: Caret/visual mode is now supported.
 - A new `qute://bindings` page, opened by `:bind`, shows all keybindings.
 - `:session-load` has a new `--delete` flag which deletes the
   session after loading it.
@@ -34,22 +34,23 @@ Changed
 - Deleting a prefix (`:`, `/` or `?`) via backspace now leaves command mode.
 - Angular 1 elements now get hints assigned.
 - `:tab-only` with pinned tabs now still closes unpinned tabs.
-- On Qt 5.7.1, GreaseMonkey `@include` and `@exclude` now support
-  regex matches. With Qt 5.8 and newer, Qt handles the matching, but
-  similar functionality will likely land in Qt 5.11.
+- GreaseMonkey `@include` and `@exclude` now support
+  regex matches. With QtWebEngine and Qt 5.8 and newer, Qt handles the matching,
+  but similar functionality will likely land in Qt 5.11.
 - The sqlite history now uses write-ahead logging which should be
   a performance and stability improvement.
 - The `url.incdec_segments` option now also can take `port` as possible segment.
-- `:view-source` now uses Chromium's `view-source:` scheme with QtWebEngine.
+- QtWebEngine: `:view-source` now uses Chromium's `view-source:` scheme.
 
 Fixed
 ~~~~~
 
-- Improved fullscreen handling with Qt 5.10.
+- QtWebEngine: Improved fullscreen handling with Qt 5.10.
+- QtWebEngine: Hinting and scrolling now works properly on special
+  `view-source:` pages.
+- QtWebKit: `:view-source` now displays a valid URL.
 - URLs containing ampersands and other special chars are now shown
   correctly when filtering them in the completion.
-- Hinting and scrolling now works properly on special `view-source:` pages.
-- `:view-source` now displays a valid URL with QtWebKit.
 
 v1.1.1
 ------

From 24cc54a574e1d908bcc4cf64cfbb87885a27dcca Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 26 Jan 2018 09:46:16 +0100
Subject: [PATCH 210/574] Simplify initializing of AbstractTab subclasses

If we already pass the tab object, no need to pass the window ID separately.
---
 qutebrowser/browser/browsertab.py             | 20 ++++---------------
 qutebrowser/browser/webengine/webenginetab.py | 10 +++++-----
 qutebrowser/browser/webkit/webkittab.py       | 12 +++++------
 tests/unit/browser/test_tab.py                |  5 ++---
 4 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index f0015dd47..11ba7bc00 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -119,10 +119,9 @@ class AbstractAction:
     action_class = None
     action_base = None
 
-    def __init__(self, tab, win_id):
+    def __init__(self, tab):
         self._widget = None
         self._tab = tab
-        self._win_id = win_id
 
     def exit_fullscreen(self):
         """Exit the fullscreen mode."""
@@ -249,10 +248,10 @@ class AbstractZoom(QObject):
         _default_zoom_changed: Whether the zoom was changed from the default.
     """
 
-    def __init__(self, win_id, parent=None):
+    def __init__(self, tab, parent=None):
         super().__init__(parent)
+        self._tab = tab
         self._widget = None
-        self._win_id = win_id
         self._default_zoom_changed = False
         self._init_neighborlist()
         config.instance.changed.connect(self._on_config_changed)
@@ -328,10 +327,9 @@ class AbstractCaret(QObject):
 
     """Attribute of AbstractTab for caret browsing."""
 
-    def __init__(self, win_id, tab, mode_manager, parent=None):
+    def __init__(self, tab, mode_manager, parent=None):
         super().__init__(parent)
         self._tab = tab
-        self._win_id = win_id
         self._widget = None
         self.selection_enabled = False
         mode_manager.entered.connect(self._on_mode_entered)
@@ -643,16 +641,6 @@ class AbstractTab(QWidget):
         tab_registry[self.tab_id] = self
         objreg.register('tab', self, registry=self.registry)
 
-        # self.history = AbstractHistory(self)
-        # self.scroller = AbstractScroller(self, parent=self)
-        # self.caret = AbstractCaret(win_id=win_id, tab=self,
-        #                            mode_manager=mode_manager, parent=self)
-        # self.zoom = AbstractZoom(win_id=win_id)
-        # self.search = AbstractSearch(parent=self)
-        # self.printing = AbstractPrinting()
-        # self.elements = AbstractElements(self)
-        # self.action = AbstractAction()
-
         self.data = TabData()
         self._layout = miscwidgets.WrapperLayout(self)
         self._widget = None
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 8c10736fd..13ceb7fd1 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -105,7 +105,7 @@ class WebEngineAction(browsertab.AbstractAction):
         except AttributeError:
             # Qt < 5.8
             tb = objreg.get('tabbed-browser', scope='window',
-                            window=self._win_id)
+                            window=self._tab.win_id)
             urlstr = self._tab.url().toString(QUrl.RemoveUserInfo)
             # The original URL becomes the path of a view-source: URL
             # (without a host), but query/fragment should stay.
@@ -603,13 +603,13 @@ class WebEngineTab(browsertab.AbstractTab):
                                        private=private)
         self.history = WebEngineHistory(self)
         self.scroller = WebEngineScroller(self, parent=self)
-        self.caret = WebEngineCaret(win_id=win_id, mode_manager=mode_manager,
+        self.caret = WebEngineCaret(mode_manager=mode_manager,
                                     tab=self, parent=self)
-        self.zoom = WebEngineZoom(win_id=win_id, parent=self)
+        self.zoom = WebEngineZoom(tab=self, parent=self)
         self.search = WebEngineSearch(parent=self)
         self.printing = WebEnginePrinting()
-        self.elements = WebEngineElements(self)
-        self.action = WebEngineAction(self, win_id)
+        self.elements = WebEngineElements(tab=self)
+        self.action = WebEngineAction(tab=self)
         self._set_widget(widget)
         self._connect_signals()
         self.backend = usertypes.Backend.QtWebEngine
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 5a0de4983..93d5ee3f7 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -67,7 +67,7 @@ class WebKitAction(browsertab.AbstractAction):
             highlighted = pygments.highlight(source, lexer, formatter)
 
             tb = objreg.get('tabbed-browser', scope='window',
-                            window=self._win_id)
+                            window=self._tab.win_id)
             new_tab = tb.tabopen(background=False, related=True)
             # The original URL becomes the path of a view-source: URL
             # (without a host), but query/fragment should stay.
@@ -354,7 +354,7 @@ class WebKitCaret(browsertab.AbstractCaret):
     def toggle_selection(self):
         self.selection_enabled = not self.selection_enabled
         mainwindow = objreg.get('main-window', scope='window',
-                                window=self._win_id)
+                                window=self._tab.win_id)
         mainwindow.status.set_mode_active(usertypes.KeyMode.caret, True)
 
     def drop_selection(self):
@@ -646,13 +646,13 @@ class WebKitTab(browsertab.AbstractTab):
             self._make_private(widget)
         self.history = WebKitHistory(self)
         self.scroller = WebKitScroller(self, parent=self)
-        self.caret = WebKitCaret(win_id=win_id, mode_manager=mode_manager,
+        self.caret = WebKitCaret(mode_manager=mode_manager,
                                  tab=self, parent=self)
-        self.zoom = WebKitZoom(win_id=win_id, parent=self)
+        self.zoom = WebKitZoom(tab=self, parent=self)
         self.search = WebKitSearch(parent=self)
         self.printing = WebKitPrinting()
-        self.elements = WebKitElements(self)
-        self.action = WebKitAction(self, win_id)
+        self.elements = WebKitElements(tab=self)
+        self.action = WebKitAction(tab=self)
         self._set_widget(widget)
         self._connect_signals()
         self.backend = usertypes.Backend.QtWebKit
diff --git a/tests/unit/browser/test_tab.py b/tests/unit/browser/test_tab.py
index 7ceb9795b..2b2726951 100644
--- a/tests/unit/browser/test_tab.py
+++ b/tests/unit/browser/test_tab.py
@@ -80,10 +80,9 @@ class Tab(browsertab.AbstractTab):
                          parent=parent)
         self.history = browsertab.AbstractHistory(self)
         self.scroller = browsertab.AbstractScroller(self, parent=self)
-        self.caret = browsertab.AbstractCaret(win_id=self.win_id,
-                                              mode_manager=mode_manager,
+        self.caret = browsertab.AbstractCaret(mode_manager=mode_manager,
                                               tab=self, parent=self)
-        self.zoom = Zoom(win_id=self.win_id)
+        self.zoom = Zoom(tab=self)
         self.search = browsertab.AbstractSearch(parent=self)
         self.printing = browsertab.AbstractPrinting()
         self.elements = browsertab.AbstractElements(self)

From 1dac05a7ace6a54dead935ae694ad97811fea00b Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 26 Jan 2018 11:58:02 +0100
Subject: [PATCH 211/574] Fix test_tab.py

---
 tests/unit/browser/test_tab.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/unit/browser/test_tab.py b/tests/unit/browser/test_tab.py
index 2b2726951..3fc923b1f 100644
--- a/tests/unit/browser/test_tab.py
+++ b/tests/unit/browser/test_tab.py
@@ -85,8 +85,8 @@ class Tab(browsertab.AbstractTab):
         self.zoom = Zoom(tab=self)
         self.search = browsertab.AbstractSearch(parent=self)
         self.printing = browsertab.AbstractPrinting()
-        self.elements = browsertab.AbstractElements(self)
-        self.action = browsertab.AbstractAction(self, self.win_id)
+        self.elements = browsertab.AbstractElements(tab=self)
+        self.action = browsertab.AbstractAction(tab=self)
 
     def _install_event_filter(self):
         pass

From cdaf3ac097754f10ad1d3de23ff3fef8bf22e187 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 26 Jan 2018 18:32:27 +0100
Subject: [PATCH 212/574] Fix .Xresources example

[ci skip]
---
 doc/help/configuring.asciidoc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/help/configuring.asciidoc b/doc/help/configuring.asciidoc
index a9b7b6ddf..b801e8820 100644
--- a/doc/help/configuring.asciidoc
+++ b/doc/help/configuring.asciidoc
@@ -366,6 +366,8 @@ You can use something like this to read colors from an `~/.Xresources` file:
 
 [source,python]
 ----
+import subprocess
+
 def read_xresources(prefix):
     props = {}
     x = subprocess.run(['xrdb', '-query'], stdout=subprocess.PIPE)
@@ -376,7 +378,7 @@ def read_xresources(prefix):
     return props
 
 xresources = read_xresources('*')
-c.colors.statusbar.normal.bg = xresources['*background']
+c.colors.statusbar.normal.bg = xresources['*.background']
 ----
 
 Avoiding flake8 errors

From fe4dd579f9cfa0283f91c1ca1343b43747cb3ad0 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 26 Jan 2018 22:06:05 -0500
Subject: [PATCH 213/574] add --sel option to prompt-yank

---
 doc/help/commands.asciidoc        |  9 +++++++--
 doc/help/settings.asciidoc        |  4 ++--
 qutebrowser/config/configdata.yml |  4 ++--
 qutebrowser/mainwindow/prompt.py  | 16 ++++++++++++----
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 16473c547..5ce4daf4d 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -1404,7 +1404,7 @@ How many steps to zoom out.
 |<<prompt-accept,prompt-accept>>|Accept the current prompt.
 |<<prompt-item-focus,prompt-item-focus>>|Shift the focus of the prompt file completion menu to another item.
 |<<prompt-open-download,prompt-open-download>>|Immediately open a download.
-|<<prompt-yank,prompt-yank>>|Yank URL.
+|<<prompt-yank,prompt-yank>>|Yank URL to clipboard or primary selection.
 |<<rl-backward-char,rl-backward-char>>|Move back a character.
 |<<rl-backward-delete-char,rl-backward-delete-char>>|Delete the character before the cursor.
 |<<rl-backward-kill-word,rl-backward-kill-word>>|Remove chars from the cursor to the beginning of the word.
@@ -1612,7 +1612,12 @@ If no specific command is given, this will use the system's default application
 
 [[prompt-yank]]
 === prompt-yank
-Yank URL.
+Syntax: +:prompt-yank [*--sel*]+
+
+Yank URL to clipboard or primary selection.
+
+==== optional arguments
+* +*-s*+, +*--sel*+: Use the primary selection instead of the clipboard.
 
 [[rl-backward-char]]
 === rl-backward-char
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index b648a65c4..0455040a2 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -623,11 +623,11 @@ Default:
 * +pass:[&lt;Ctrl-F&gt;]+: +pass:[rl-forward-char]+
 * +pass:[&lt;Ctrl-H&gt;]+: +pass:[rl-backward-delete-char]+
 * +pass:[&lt;Ctrl-K&gt;]+: +pass:[rl-kill-line]+
+* +pass:[&lt;Ctrl-Shift-Y&gt;]+: +pass:[prompt-yank --sel]+
 * +pass:[&lt;Ctrl-U&gt;]+: +pass:[rl-unix-line-discard]+
 * +pass:[&lt;Ctrl-W&gt;]+: +pass:[rl-unix-word-rubout]+
 * +pass:[&lt;Ctrl-X&gt;]+: +pass:[prompt-open-download]+
-* +pass:[&lt;Ctrl-Y&gt;]+: +pass:[rl-yank]+
-* +pass:[&lt;Ctrl-y&gt;]+: +pass:[prompt-yank]+
+* +pass:[&lt;Ctrl-Y&gt;]+: +pass:[prompt-yank]+
 * +pass:[&lt;Down&gt;]+: +pass:[prompt-item-focus next]+
 * +pass:[&lt;Escape&gt;]+: +pass:[leave-mode]+
 * +pass:[&lt;Return&gt;]+: +pass:[prompt-accept]+
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 8e7f9d8a8..d044291ad 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -2349,8 +2349,8 @@ bindings.default:
       <Alt-D>: rl-kill-word
       <Ctrl-W>: rl-unix-word-rubout
       <Alt-Backspace>: rl-backward-kill-word
-      <Ctrl-Y>: rl-yank
-      <Ctrl-y>: prompt-yank
+      <Ctrl-Y>: prompt-yank
+      <Ctrl-Shift-Y>: prompt-yank --sel
       <Ctrl-?>: rl-delete-char
       <Ctrl-H>: rl-backward-delete-char
       <Escape>: leave-mode
diff --git a/qutebrowser/mainwindow/prompt.py b/qutebrowser/mainwindow/prompt.py
index 29afc62a4..aff6701fc 100644
--- a/qutebrowser/mainwindow/prompt.py
+++ b/qutebrowser/mainwindow/prompt.py
@@ -425,15 +425,23 @@ class PromptContainer(QWidget):
     @cmdutils.register(
         instance='prompt-container', scope='window',
         modes=[usertypes.KeyMode.prompt, usertypes.KeyMode.yesno])
-    def prompt_yank(self):
-        """Yank URL."""
+    def prompt_yank(self, sel=False):
+        """Yank URL to clipboard or primary selection.
+
+        Args:
+            sel: Use the primary selection instead of the clipboard.
+        """
         question = self._prompt.question
         if not question.url:
             message.error('No URL found.')
             return
         s = question.url
-        utils.set_clipboard(s)
-        message.info("Yanked to clipboard: {}".format(s))
+        target = 'primary selection'
+        if not (sel and utils.supports_selection()):
+            target = 'clipboard'
+            sel = False
+        utils.set_clipboard(s, sel)
+        message.info("Yanked to {}: {}".format(target, s))
 
 
 class LineEdit(QLineEdit):

From 8a9b98c2dc2b9c55808bcd2274b4039ede87b3a8 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Mon, 18 Dec 2017 14:42:05 -0500
Subject: [PATCH 214/574] Editor triggers update on every save.

For any command that spawns an editor, tirgger an update on save, not
just on exit.

- :open-editor writes the text field on save
- :edit-url navigates on save
- :edit-url -t opens a new tab on each save
- :edit-command updates the statusbar text on save
- :edit-command --run runs a command on each save
- :config-edit reloads the config on save

Resolves #2307.
Helps mitigate #1596 by allowing users to 'save' partial work, and
notice if there was an error without closing the editor.
---
 qutebrowser/misc/editor.py                | 39 +++++++++++++----------
 tests/end2end/features/editor.feature     | 14 +++++++-
 tests/end2end/features/test_editor_bdd.py | 27 +++++++++++++---
 3 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index 553c700e7..62d4a2d6f 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -22,7 +22,8 @@
 import os
 import tempfile
 
-from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QProcess
+from PyQt5.QtCore import (pyqtSignal, pyqtSlot, QObject, QProcess,
+    QFileSystemWatcher)
 
 from qutebrowser.config import config
 from qutebrowser.utils import message, log
@@ -39,6 +40,7 @@ class ExternalEditor(QObject):
         _remove_file: Whether the file should be removed when the editor is
                       closed.
         _proc: The GUIProcess of the editor.
+        _watcher: A QFileSystemWatcher to watch the edited file for changes.
     """
 
     editing_finished = pyqtSignal(str)
@@ -48,10 +50,12 @@ class ExternalEditor(QObject):
         self._filename = None
         self._proc = None
         self._remove_file = None
+        self._watcher = QFileSystemWatcher(parent=self)
 
     def _cleanup(self):
         """Clean up temporary files after the editor closed."""
         assert self._remove_file is not None
+        self._watcher.fileChanged.disconnect()
         if self._filename is None or not self._remove_file:
             # Could not create initial file.
             return
@@ -75,22 +79,7 @@ class ExternalEditor(QObject):
             # No error/cleanup here, since we already handle this in
             # on_proc_error.
             return
-        try:
-            if exitcode != 0:
-                return
-            encoding = config.val.editor.encoding
-            try:
-                with open(self._filename, 'r', encoding=encoding) as f:
-                    text = f.read()
-            except OSError as e:
-                # NOTE: Do not replace this with "raise CommandError" as it's
-                # executed async.
-                message.error("Failed to read back edited file: {}".format(e))
-                return
-            log.procs.debug("Read back: {}".format(text))
-            self.editing_finished.emit(text)
-        finally:
-            self._cleanup()
+        self._cleanup()
 
     @pyqtSlot(QProcess.ProcessError)
     def on_proc_error(self, _err):
@@ -128,6 +117,19 @@ class ExternalEditor(QObject):
         line, column = self._calc_line_and_column(text, caret_position)
         self._start_editor(line=line, column=column)
 
+    def _on_file_changed(self, path):
+        encoding = config.val.editor.encoding
+        try:
+            with open(path, 'r', encoding=encoding) as f:
+                text = f.read()
+        except OSError as e:
+            # NOTE: Do not replace this with "raise CommandError" as it's
+            # executed async.
+            message.error("Failed to read back edited file: {}".format(e))
+            return
+        log.procs.debug("Read back: {}".format(text))
+        self.editing_finished.emit(text)
+
     def edit_file(self, filename):
         """Edit the file with the given filename."""
         self._filename = filename
@@ -147,6 +149,9 @@ class ExternalEditor(QObject):
         editor = config.val.editor.command
         executable = editor[0]
 
+        self._watcher.addPath(self._filename)
+        self._watcher.fileChanged.connect(self._on_file_changed)
+
         args = [self._sub_placeholder(arg, line, column) for arg in editor[1:]]
         log.procs.debug("Calling \"{}\" with args {}".format(executable, args))
         self._proc.start(executable, args)
diff --git a/tests/end2end/features/editor.feature b/tests/end2end/features/editor.feature
index d01e3d229..489fc7200 100644
--- a/tests/end2end/features/editor.feature
+++ b/tests/end2end/features/editor.feature
@@ -119,7 +119,7 @@ Feature: Opening external editors
     # There's no guarantee that the tab gets deleted...
     @posix @flaky
     Scenario: Spawning an editor and closing the tab
-        When I set up a fake editor that waits
+        When I set up a fake editor that writes "foobar" on save
         And I open data/editor.html
         And I run :click-element id qute-textarea
         And I wait for "Entering mode KeyMode.insert (reason: clicking input)" in the log
@@ -129,6 +129,18 @@ Feature: Opening external editors
         And I kill the waiting editor
         Then the error "Edited element vanished" should be shown
 
+    # Could not get signals working on Windows
+    @posix
+    Scenario: Spawning an editor and saving
+        When I set up a fake editor that writes "foobar" on save
+        And I open data/editor.html
+        And I run :click-element id qute-textarea
+        And I wait for "Entering mode KeyMode.insert (reason: clicking input)" in the log
+        And I run :open-editor
+        And I save without exiting the editor
+        And I run :click-element id qute-button
+        Then the javascript message "text: foobar" should be logged
+
     Scenario: Spawning an editor in caret mode
         When I set up a fake editor returning "foobar"
         And I open data/editor.html
diff --git a/tests/end2end/features/test_editor_bdd.py b/tests/end2end/features/test_editor_bdd.py
index 260197a46..18551271b 100644
--- a/tests/end2end/features/test_editor_bdd.py
+++ b/tests/end2end/features/test_editor_bdd.py
@@ -70,8 +70,9 @@ def set_up_editor_empty(quteproc, tmpdir):
     set_up_editor(quteproc, tmpdir, "")
 
 
-@bdd.when(bdd.parsers.parse('I set up a fake editor that waits'))
-def set_up_editor_wait(quteproc, tmpdir):
+@bdd.when(bdd.parsers.parse('I set up a fake editor that writes "{text}" on '
+                            'save'))
+def set_up_editor_wait(quteproc, tmpdir, text):
     """Set up editor.command to a small python script inserting a text."""
     assert not utils.is_windows
     pidfile = tmpdir / 'editor_pid'
@@ -82,12 +83,19 @@ def set_up_editor_wait(quteproc, tmpdir):
         import time
         import signal
 
+        def handle(sig, frame):
+            with open(sys.argv[1], 'w', encoding='utf-8') as f:
+                f.write({text!r})
+            if sig == signal.SIGUSR1:
+                sys.exit(0)
+
         with open(r'{pidfile}', 'w') as f:
             f.write(str(os.getpid()))
 
-        signal.signal(signal.SIGUSR1, lambda s, f: sys.exit(0))
+        signal.signal(signal.SIGUSR1, handle)
+        signal.signal(signal.SIGUSR2, handle)
         time.sleep(100)
-    """.format(pidfile=pidfile)))
+    """.format(pidfile=pidfile, text=text)))
     editor = json.dumps([sys.executable, str(script), '{}'])
     quteproc.set_setting('editor.command', editor)
 
@@ -101,3 +109,14 @@ def kill_editor_wait(tmpdir):
     # for posix, there IS a member so we need to ignore useless-suppression
     # pylint: disable=no-member,useless-suppression
     os.kill(pid, signal.SIGUSR1)
+
+
+@bdd.when(bdd.parsers.parse('I save without exiting the editor'))
+def save_editor_wait(tmpdir):
+    """Trigger the waiting editor to write without exiting."""
+    pidfile = tmpdir / 'editor_pid'
+    pid = int(pidfile.read())
+    # windows has no SIGUSR2, but we don't run this on windows anyways
+    # for posix, there IS a member so we need to ignore useless-suppression
+    # pylint: disable=no-member,useless-suppression
+    os.kill(pid, signal.SIGUSR2)

From 23eb6a6c534f397885e89f91fd48f641b807e10a Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Fri, 29 Dec 2017 16:08:59 -0500
Subject: [PATCH 215/574] Fix test_editor for edit-on-write behavior.

Now that the editor fires editing_finished on every write, the unit
tests had to be updated.

- Add qtbot to the editor fixture to resolve `QtWarningMsg:
  QSocketNotifier: Can only be used with threads started with QThread`
- Use removePaths instead of disconnect to stop the watcher from
  signalling. This avoids an error when the editor is forcibly cleaned
  up by the tests without the signal ever being connected, but otherwise
  has the same behavior as disconnecting the singal.
- wait for a signal on write instead of proc closed
- wait for _watcher.fileChanged in test_unreadable to ensure the write
  event is fired before the test exits.
---
 qutebrowser/misc/editor.py     |  2 +-
 tests/unit/misc/test_editor.py | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index 62d4a2d6f..53067ca2c 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -55,7 +55,7 @@ class ExternalEditor(QObject):
     def _cleanup(self):
         """Clean up temporary files after the editor closed."""
         assert self._remove_file is not None
-        self._watcher.fileChanged.disconnect()
+        self._watcher.removePaths(self._watcher.files())
         if self._filename is None or not self._remove_file:
             # Could not create initial file.
             return
diff --git a/tests/unit/misc/test_editor.py b/tests/unit/misc/test_editor.py
index 7dea6e069..55425a1c4 100644
--- a/tests/unit/misc/test_editor.py
+++ b/tests/unit/misc/test_editor.py
@@ -37,7 +37,7 @@ def patch_things(config_stub, monkeypatch, stubs):
 
 
 @pytest.fixture
-def editor(caplog):
+def editor(caplog, qtbot):
     ed = editormod.ExternalEditor()
     yield ed
     with caplog.at_level(logging.ERROR):
@@ -118,18 +118,21 @@ class TestFileHandling:
 
         os.remove(filename)
 
-    def test_unreadable(self, message_mock, editor, caplog):
+    def test_unreadable(self, message_mock, editor, caplog, qtbot):
         """Test file handling when closing with an unreadable file."""
         editor.edit("")
         filename = editor._filename
         assert os.path.exists(filename)
-        os.chmod(filename, 0o077)
+        os.chmod(filename, 0o277)
         if os.access(filename, os.R_OK):
             # Docker container or similar
             pytest.skip("File was still readable")
 
         with caplog.at_level(logging.ERROR):
-            editor._proc.finished.emit(0, QProcess.NormalExit)
+            with qtbot.wait_signal(editor._watcher.fileChanged):
+                with open(filename, 'w', encoding='utf-8') as f:
+                    f.write('unreadable')
+        editor._proc.finished.emit(0, QProcess.NormalExit)
         assert not os.path.exists(filename)
         msg = message_mock.getmsg(usertypes.MessageLevel.error)
         assert msg.text.startswith("Failed to read back edited file: ")
@@ -170,11 +173,11 @@ def test_modify(qtbot, editor, initial_text, edited_text):
     with open(editor._filename, 'r', encoding='utf-8') as f:
         assert f.read() == initial_text
 
-    with open(editor._filename, 'w', encoding='utf-8') as f:
-        f.write(edited_text)
-
     with qtbot.wait_signal(editor.editing_finished) as blocker:
-        editor._proc.finished.emit(0, QProcess.NormalExit)
+        with open(editor._filename, 'w', encoding='utf-8') as f:
+            f.write(edited_text)
+
+    editor._proc.finished.emit(0, QProcess.NormalExit)
 
     assert blocker.args == [edited_text]
 

From a940de3717d167cd7c13ce5429fd58d6b23d74d7 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Fri, 29 Dec 2017 22:05:04 -0500
Subject: [PATCH 216/574] Rename editing_finished to file_updated.

ExternalEditor now fires an event on save rather than on exit, so the
signal name should be updated to match the behavior.
---
 qutebrowser/browser/commands.py             | 8 ++++----
 qutebrowser/config/configcommands.py        | 4 ++--
 qutebrowser/mainwindow/statusbar/command.py | 2 +-
 qutebrowser/misc/editor.py                  | 4 ++--
 tests/unit/misc/test_editor.py              | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index fdd552b32..55af2c50a 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1622,8 +1622,8 @@ class CommandDispatcher:
         caret_position = elem.caret_position()
 
         ed = editor.ExternalEditor(self._tabbed_browser)
-        ed.editing_finished.connect(functools.partial(
-            self.on_editing_finished, elem))
+        ed.file_updated.connect(functools.partial(
+            self.on_file_updated, elem))
         ed.edit(text, caret_position)
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
@@ -1636,7 +1636,7 @@ class CommandDispatcher:
         tab = self._current_widget()
         tab.elements.find_focused(self._open_editor_cb)
 
-    def on_editing_finished(self, elem, text):
+    def on_file_updated(self, elem, text):
         """Write the editor text into the form field and clean up tempfile.
 
         Callback for GUIProcess when the editor was closed.
@@ -2146,7 +2146,7 @@ class CommandDispatcher:
         ed = editor.ExternalEditor(self._tabbed_browser)
 
         # Passthrough for openurl args (e.g. -t, -b, -w)
-        ed.editing_finished.connect(functools.partial(
+        ed.file_updated.connect(functools.partial(
             self._open_if_changed, old_url=old_url, bg=bg, tab=tab,
             window=window, private=private, related=related))
 
diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py
index 93a1f7ce0..faf31d718 100644
--- a/qutebrowser/config/configcommands.py
+++ b/qutebrowser/config/configcommands.py
@@ -253,7 +253,7 @@ class ConfigCommands:
         Args:
             no_source: Don't re-source the config file after editing.
         """
-        def on_editing_finished():
+        def on_file_updated():
             """Source the new config when editing finished.
 
             This can't use cmdexc.CommandError as it's run async.
@@ -265,7 +265,7 @@ class ConfigCommands:
 
         ed = editor.ExternalEditor(self._config)
         if not no_source:
-            ed.editing_finished.connect(on_editing_finished)
+            ed.file_updated.connect(on_file_updated)
 
         filename = os.path.join(standarddir.config(), 'config.py')
         ed.edit_file(filename)
diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 26ba802c0..6689d3bf5 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -193,7 +193,7 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
             if run:
                 self.command_accept()
 
-        ed.editing_finished.connect(callback)
+        ed.file_updated.connect(callback)
         ed.edit(self.text())
 
     @pyqtSlot(usertypes.KeyMode)
diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index 53067ca2c..f300bc2e1 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -43,7 +43,7 @@ class ExternalEditor(QObject):
         _watcher: A QFileSystemWatcher to watch the edited file for changes.
     """
 
-    editing_finished = pyqtSignal(str)
+    file_updated = pyqtSignal(str)
 
     def __init__(self, parent=None):
         super().__init__(parent)
@@ -128,7 +128,7 @@ class ExternalEditor(QObject):
             message.error("Failed to read back edited file: {}".format(e))
             return
         log.procs.debug("Read back: {}".format(text))
-        self.editing_finished.emit(text)
+        self.file_updated.emit(text)
 
     def edit_file(self, filename):
         """Edit the file with the given filename."""
diff --git a/tests/unit/misc/test_editor.py b/tests/unit/misc/test_editor.py
index 55425a1c4..b0ddbff25 100644
--- a/tests/unit/misc/test_editor.py
+++ b/tests/unit/misc/test_editor.py
@@ -173,7 +173,7 @@ def test_modify(qtbot, editor, initial_text, edited_text):
     with open(editor._filename, 'r', encoding='utf-8') as f:
         assert f.read() == initial_text
 
-    with qtbot.wait_signal(editor.editing_finished) as blocker:
+    with qtbot.wait_signal(editor.file_updated) as blocker:
         with open(editor._filename, 'w', encoding='utf-8') as f:
             f.write(edited_text)
 

From 2e5595b5c6868f22e820eea12900821601aa9061 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Fri, 29 Dec 2017 22:07:37 -0500
Subject: [PATCH 217/574] Update test_configcommands for new editor behavior.

Now that the editor signals on save, the configcommands editing
unittests need to emit the signal in the patch rather than relying on
on_proc_closed to emit the signal.
---
 tests/unit/config/test_configcommands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/config/test_configcommands.py b/tests/unit/config/test_configcommands.py
index 92796e8e5..a376e19b9 100644
--- a/tests/unit/config/test_configcommands.py
+++ b/tests/unit/config/test_configcommands.py
@@ -330,7 +330,7 @@ class TestEdit:
             def _write_file(editor_self):
                 with open(editor_self._filename, 'w', encoding='utf-8') as f:
                     f.write(text)
-                editor_self.on_proc_closed(0, QProcess.NormalExit)
+                editor_self.file_updated.emit(text)
 
             return mocker.patch('qutebrowser.config.configcommands.editor.'
                                 'ExternalEditor._start_editor', autospec=True,

From 7c33ff4046c6566038bb61d7007291b2d1538d3b Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Wed, 24 Jan 2018 07:40:34 -0500
Subject: [PATCH 218/574] Fix flaky editor test.

Give the process time to write its PID before trying to interrupt it.
---
 tests/end2end/features/test_editor_bdd.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/end2end/features/test_editor_bdd.py b/tests/end2end/features/test_editor_bdd.py
index 18551271b..e2415da46 100644
--- a/tests/end2end/features/test_editor_bdd.py
+++ b/tests/end2end/features/test_editor_bdd.py
@@ -22,6 +22,7 @@ import json
 import textwrap
 import os
 import signal
+import time
 
 import pytest_bdd as bdd
 bdd.scenarios('editor.feature')
@@ -115,6 +116,11 @@ def kill_editor_wait(tmpdir):
 def save_editor_wait(tmpdir):
     """Trigger the waiting editor to write without exiting."""
     pidfile = tmpdir / 'editor_pid'
+    # give the "editor" process time to write its pid
+    for _ in range(10):
+        if pidfile.check():
+            break
+        time.sleep(1)
     pid = int(pidfile.read())
     # windows has no SIGUSR2, but we don't run this on windows anyways
     # for posix, there IS a member so we need to ignore useless-suppression

From 530a1859a331d49d67fa71509063b8cb384a5e4c Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Fri, 26 Jan 2018 11:12:07 -0500
Subject: [PATCH 219/574] Trigger editor signal on exit if content changed.

With the previous code, the editor could miss the final signal on a
save-and-exit. This is avoided by always running the file changed
handler on a successful exit, but only firing the signal if the content
actually changed (to avoid double-signalling).
---
 qutebrowser/misc/editor.py     |  8 +++++++-
 tests/unit/misc/test_editor.py | 26 +++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index f300bc2e1..6752a37e3 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -51,6 +51,7 @@ class ExternalEditor(QObject):
         self._proc = None
         self._remove_file = None
         self._watcher = QFileSystemWatcher(parent=self)
+        self._content = None
 
     def _cleanup(self):
         """Clean up temporary files after the editor closed."""
@@ -79,6 +80,8 @@ class ExternalEditor(QObject):
             # No error/cleanup here, since we already handle this in
             # on_proc_error.
             return
+        # do a final read to make sure we don't miss the last signal
+        self._on_file_changed(self._filename)
         self._cleanup()
 
     @pyqtSlot(QProcess.ProcessError)
@@ -128,7 +131,10 @@ class ExternalEditor(QObject):
             message.error("Failed to read back edited file: {}".format(e))
             return
         log.procs.debug("Read back: {}".format(text))
-        self.file_updated.emit(text)
+        if self._content != text:
+            self._content = text
+            self.file_updated.emit(text)
+
 
     def edit_file(self, filename):
         """Edit the file with the given filename."""
diff --git a/tests/unit/misc/test_editor.py b/tests/unit/misc/test_editor.py
index b0ddbff25..3f7d8acaf 100644
--- a/tests/unit/misc/test_editor.py
+++ b/tests/unit/misc/test_editor.py
@@ -129,10 +129,7 @@ class TestFileHandling:
             pytest.skip("File was still readable")
 
         with caplog.at_level(logging.ERROR):
-            with qtbot.wait_signal(editor._watcher.fileChanged):
-                with open(filename, 'w', encoding='utf-8') as f:
-                    f.write('unreadable')
-        editor._proc.finished.emit(0, QProcess.NormalExit)
+            editor._proc.finished.emit(0, QProcess.NormalExit)
         assert not os.path.exists(filename)
         msg = message_mock.getmsg(usertypes.MessageLevel.error)
         assert msg.text.startswith("Failed to read back edited file: ")
@@ -177,11 +174,30 @@ def test_modify(qtbot, editor, initial_text, edited_text):
         with open(editor._filename, 'w', encoding='utf-8') as f:
             f.write(edited_text)
 
-    editor._proc.finished.emit(0, QProcess.NormalExit)
+    with qtbot.assert_not_emitted(editor.file_updated):
+        editor._proc.finished.emit(0, QProcess.NormalExit)
 
     assert blocker.args == [edited_text]
 
 
+def test_modify_multiple(qtbot, editor):
+    """Test that multiple saves all trigger file_updated."""
+    editor.edit('foo')
+
+    with qtbot.wait_signal(editor.file_updated) as blocker:
+        with open(editor._filename, 'w', encoding='utf-8') as f:
+            f.write('bar')
+    assert blocker.args == ['bar']
+
+    with qtbot.wait_signal(editor.file_updated) as blocker:
+        with open(editor._filename, 'w', encoding='utf-8') as f:
+            f.write('baz')
+    assert blocker.args == ['baz']
+
+    with qtbot.assert_not_emitted(editor.file_updated):
+        editor._proc.finished.emit(0, QProcess.NormalExit)
+
+
 @pytest.mark.parametrize('text, caret_position, result', [
     ('', 0, (1, 1)),
     ('a', 0, (1, 1)),

From d01a0b1d64a4178c20133a77954eff8b84d4d7f9 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 28 Jan 2018 13:05:49 +0100
Subject: [PATCH 220/574] Fix :bookmark-add with no URL

---
 doc/changelog.asciidoc          | 2 ++
 doc/help/commands.asciidoc      | 3 ++-
 qutebrowser/browser/commands.py | 5 +++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index c9cb327b3..7f22dc694 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -51,6 +51,8 @@ Fixed
 - QtWebKit: `:view-source` now displays a valid URL.
 - URLs containing ampersands and other special chars are now shown
   correctly when filtering them in the completion.
+- `:bookmark-add "" foo` can now be used to save the current URL with a custom
+  title.
 
 v1.1.1
 ------
diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 1b65dbdd7..a87dc2304 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -176,7 +176,8 @@ Save the current page as a bookmark, or a specific url.
 If no url and title are provided, then save the current page as a bookmark. If a url and title have been provided, then save the given url as a bookmark with the provided title. You can view all saved bookmarks on the link:qute://bookmarks[bookmarks page].
 
 ==== positional arguments
-* +'url'+: url to save as a bookmark. If None, use url of current page.
+* +'url'+: url to save as a bookmark. If not given, use url of current page.
+
 * +'title'+: title of the new bookmark.
 
 ==== optional arguments
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index fdd552b32..a0c5e63ff 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1349,7 +1349,8 @@ class CommandDispatcher:
         link:qute://bookmarks[bookmarks page].
 
         Args:
-            url: url to save as a bookmark. If None, use url of current page.
+            url: url to save as a bookmark. If not given, use url of current
+                 page.
             title: title of the new bookmark.
             toggle: remove the bookmark instead of raising an error if it
                     already exists.
@@ -1358,7 +1359,7 @@ class CommandDispatcher:
             raise cmdexc.CommandError('Title must be provided if url has '
                                       'been provided')
         bookmark_manager = objreg.get('bookmark-manager')
-        if url is None:
+        if not url:
             url = self._current_url()
         else:
             try:

From 1a2ab0ffe7a414563e889519ac28f65bd115a9d6 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sun, 28 Jan 2018 10:28:11 -0500
Subject: [PATCH 221/574] add back rl-yank key binding; use alt-y for
 prompt-yank.

---
 qutebrowser/browser/qtnetworkdownloads.py | 2 +-
 qutebrowser/config/configdata.yml         | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/qtnetworkdownloads.py b/qutebrowser/browser/qtnetworkdownloads.py
index 6e3dd7b29..6dcc13c6e 100644
--- a/qutebrowser/browser/qtnetworkdownloads.py
+++ b/qutebrowser/browser/qtnetworkdownloads.py
@@ -20,7 +20,7 @@
 """Download manager."""
 
 import io
-import os
+import os.path
 import shutil
 import functools
 
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index d044291ad..3cba3e6c5 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -2338,6 +2338,8 @@ bindings.default:
       <Up>: prompt-item-focus prev
       <Tab>: prompt-item-focus next
       <Down>: prompt-item-focus next
+      <Alt-Y>: prompt-yank
+      <Alt-Shift-Y>: prompt-yank --sel
       <Ctrl-B>: rl-backward-char
       <Ctrl-F>: rl-forward-char
       <Alt-B>: rl-backward-word
@@ -2349,10 +2351,9 @@ bindings.default:
       <Alt-D>: rl-kill-word
       <Ctrl-W>: rl-unix-word-rubout
       <Alt-Backspace>: rl-backward-kill-word
-      <Ctrl-Y>: prompt-yank
-      <Ctrl-Shift-Y>: prompt-yank --sel
       <Ctrl-?>: rl-delete-char
       <Ctrl-H>: rl-backward-delete-char
+      <Ctrl-Y>: rl-yank
       <Escape>: leave-mode
     caret:
       v: toggle-selection

From f16f425cb12071720dadf82e6aca0bb85adf1c74 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sun, 28 Jan 2018 10:41:09 -0500
Subject: [PATCH 222/574] generate the docs

---
 doc/help/settings.asciidoc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 0455040a2..164f26f78 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -616,6 +616,8 @@ Default:
 * +pass:[&lt;Alt-Backspace&gt;]+: +pass:[rl-backward-kill-word]+
 * +pass:[&lt;Alt-D&gt;]+: +pass:[rl-kill-word]+
 * +pass:[&lt;Alt-F&gt;]+: +pass:[rl-forward-word]+
+* +pass:[&lt;Alt-Shift-Y&gt;]+: +pass:[prompt-yank --sel]+
+* +pass:[&lt;Alt-Y&gt;]+: +pass:[prompt-yank]+
 * +pass:[&lt;Ctrl-?&gt;]+: +pass:[rl-delete-char]+
 * +pass:[&lt;Ctrl-A&gt;]+: +pass:[rl-beginning-of-line]+
 * +pass:[&lt;Ctrl-B&gt;]+: +pass:[rl-backward-char]+
@@ -623,11 +625,10 @@ Default:
 * +pass:[&lt;Ctrl-F&gt;]+: +pass:[rl-forward-char]+
 * +pass:[&lt;Ctrl-H&gt;]+: +pass:[rl-backward-delete-char]+
 * +pass:[&lt;Ctrl-K&gt;]+: +pass:[rl-kill-line]+
-* +pass:[&lt;Ctrl-Shift-Y&gt;]+: +pass:[prompt-yank --sel]+
 * +pass:[&lt;Ctrl-U&gt;]+: +pass:[rl-unix-line-discard]+
 * +pass:[&lt;Ctrl-W&gt;]+: +pass:[rl-unix-word-rubout]+
 * +pass:[&lt;Ctrl-X&gt;]+: +pass:[prompt-open-download]+
-* +pass:[&lt;Ctrl-Y&gt;]+: +pass:[prompt-yank]+
+* +pass:[&lt;Ctrl-Y&gt;]+: +pass:[rl-yank]+
 * +pass:[&lt;Down&gt;]+: +pass:[prompt-item-focus next]+
 * +pass:[&lt;Escape&gt;]+: +pass:[leave-mode]+
 * +pass:[&lt;Return&gt;]+: +pass:[prompt-accept]+

From e9023ce2336cc68cce084893534ff2a27f995322 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Mon, 29 Jan 2018 07:50:32 -0500
Subject: [PATCH 223/574] Remove newline in editor.py

---
 qutebrowser/misc/editor.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index 6752a37e3..70bd4e68a 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -135,7 +135,6 @@ class ExternalEditor(QObject):
             self._content = text
             self.file_updated.emit(text)
 
-
     def edit_file(self, filename):
         """Edit the file with the given filename."""
         self._filename = filename

From 400e1bc7d797c60486a4c97cb86ad512973982da Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 30 Jan 2018 07:11:48 +0100
Subject: [PATCH 224/574] Show tab titles as tooltip

Closes #3535
---
 doc/changelog.asciidoc              | 1 +
 qutebrowser/mainwindow/tabwidget.py | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 7f22dc694..edc5523ba 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -41,6 +41,7 @@ Changed
   a performance and stability improvement.
 - The `url.incdec_segments` option now also can take `port` as possible segment.
 - QtWebEngine: `:view-source` now uses Chromium's `view-source:` scheme.
+- Tabs now show their full title as tooltip.
 
 Fixed
 ~~~~~
diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py
index 28cfac0fb..ac3a34581 100644
--- a/qutebrowser/mainwindow/tabwidget.py
+++ b/qutebrowser/mainwindow/tabwidget.py
@@ -148,7 +148,10 @@ class TabWidget(QTabWidget):
         fields['index'] = idx + 1
 
         title = '' if fmt is None else fmt.format(**fields)
-        self.tabBar().setTabText(idx, title)
+        tabbar = self.tabBar()
+
+        tabbar.setTabText(idx, title)
+        tabbar.setTabToolTip(idx, title)
 
     def get_tab_fields(self, idx):
         """Get the tab field data."""

From b55ae02eda3c02cbcbea546d6f5cb5b52c260a60 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Tue, 30 Jan 2018 09:48:52 -0500
Subject: [PATCH 225/574] document proxy environment variable for system proxy

---
 qutebrowser/browser/network/proxy.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qutebrowser/browser/network/proxy.py b/qutebrowser/browser/network/proxy.py
index 2821a840d..9a1f80ae8 100644
--- a/qutebrowser/browser/network/proxy.py
+++ b/qutebrowser/browser/network/proxy.py
@@ -61,6 +61,8 @@ class ProxyFactory(QNetworkProxyFactory):
         """
         proxy = config.val.content.proxy
         if proxy is configtypes.SYSTEM_PROXY:
+            # On Linux, use "export http_proxy=socks5://host:port" to manually set system proxy
+            # ref. http://doc.qt.io/qt-5/qnetworkproxyfactory.html#systemProxyForQuery
             proxies = QNetworkProxyFactory.systemProxyForQuery(query)
         elif isinstance(proxy, pac.PACFetcher):
             proxies = proxy.resolve(query)

From d8510e61aa1b68075b5d81d19fa87124b00c4bd6 Mon Sep 17 00:00:00 2001
From: lufte <javierayres@gmail.com>
Date: Tue, 30 Jan 2018 19:26:45 -0300
Subject: [PATCH 226/574] Use the instance attribute instead of querying the
 registry

---
 qutebrowser/mainwindow/mainwindow.py | 37 ++++++++++++++++------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index a5faf6dd1..6774a03af 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -429,7 +429,6 @@ class MainWindow(QWidget):
         status = self._get_object('statusbar')
         keyparsers = self._get_object('keyparsers')
         completion_obj = self._get_object('completion')
-        tabs = self._get_object('tabbed-browser')
         cmd = self._get_object('status-command')
         message_bridge = self._get_object('message-bridge')
         mode_manager = self._get_object('mode-manager')
@@ -449,7 +448,7 @@ class MainWindow(QWidget):
             status.keystring.setText)
         cmd.got_cmd[str].connect(self._commandrunner.run_safely)
         cmd.got_cmd[str, int].connect(self._commandrunner.run_safely)
-        cmd.returnPressed.connect(tabs.on_cmd_return_pressed)
+        cmd.returnPressed.connect(self.tabbed_browser.on_cmd_return_pressed)
 
         # key hint popup
         for mode, parser in keyparsers.items():
@@ -467,25 +466,31 @@ class MainWindow(QWidget):
         message_bridge.s_maybe_reset_text.connect(status.txt.maybe_reset_text)
 
         # statusbar
-        tabs.current_tab_changed.connect(status.on_tab_changed)
+        self.tabbed_browser.current_tab_changed.connect(status.on_tab_changed)
 
-        tabs.cur_progress.connect(status.prog.setValue)
-        tabs.cur_load_finished.connect(status.prog.hide)
-        tabs.cur_load_started.connect(status.prog.on_load_started)
+        self.tabbed_browser.cur_progress.connect(status.prog.setValue)
+        self.tabbed_browser.cur_load_finished.connect(status.prog.hide)
+        self.tabbed_browser.cur_load_started.connect(
+            status.prog.on_load_started)
 
-        tabs.cur_scroll_perc_changed.connect(status.percentage.set_perc)
-        tabs.tab_index_changed.connect(status.tabindex.on_tab_index_changed)
+        self.tabbed_browser.cur_scroll_perc_changed.connect(
+            status.percentage.set_perc)
+        self.tabbed_browser.tab_index_changed.connect(
+            status.tabindex.on_tab_index_changed)
 
-        tabs.cur_url_changed.connect(status.url.set_url)
-        tabs.cur_url_changed.connect(functools.partial(
-            status.backforward.on_tab_cur_url_changed, tabs=tabs))
-        tabs.cur_link_hovered.connect(status.url.set_hover_url)
-        tabs.cur_load_status_changed.connect(status.url.on_load_status_changed)
-        tabs.cur_fullscreen_requested.connect(self._on_fullscreen_requested)
-        tabs.cur_fullscreen_requested.connect(status.maybe_hide)
+        self.tabbed_browser.cur_url_changed.connect(status.url.set_url)
+        self.tabbed_browser.cur_url_changed.connect(functools.partial(
+            status.backforward.on_tab_cur_url_changed,
+            tabs=self.tabbed_browser))
+        self.tabbed_browser.cur_link_hovered.connect(status.url.set_hover_url)
+        self.tabbed_browser.cur_load_status_changed.connect(
+            status.url.on_load_status_changed)
+        self.tabbed_browser.cur_fullscreen_requested.connect(
+            self._on_fullscreen_requested)
+        self.tabbed_browser.cur_fullscreen_requested.connect(status.maybe_hide)
 
         # command input / completion
-        mode_manager.left.connect(tabs.on_mode_left)
+        mode_manager.left.connect(self.tabbed_browser.on_mode_left)
         cmd.clear_completion_selection.connect(
             completion_obj.on_clear_completion_selection)
         cmd.hide_completion.connect(completion_obj.hide)

From 532205aafa4b842b632fb62653c44a3fcc8281cf Mon Sep 17 00:00:00 2001
From: Knowlege <jakov.manjkas@gmail.com>
Date: Tue, 30 Jan 2018 23:29:02 +0100
Subject: [PATCH 227/574] Updated PyYaml link

---
 README.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.asciidoc b/README.asciidoc
index a625f317c..aed2f61e2 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -114,7 +114,7 @@ The following software and libraries are required to run qutebrowser:
 * http://fdik.org/pyPEG/[pyPEG2]
 * http://jinja.pocoo.org/[jinja2]
 * http://pygments.org/[pygments]
-* http://pyyaml.org/wiki/PyYAML[PyYAML]
+* https://github.com/yaml/pyyaml[PyYAML]
 * http://www.attrs.org/[attrs]
 
 The following libraries are optional:

From 79935e048c2a56402cdc43afb48fd4f94fb2dd46 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 31 Jan 2018 22:35:03 +0100
Subject: [PATCH 228/574] Break long line

---
 qutebrowser/browser/network/proxy.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/network/proxy.py b/qutebrowser/browser/network/proxy.py
index 9a1f80ae8..9a4999ef2 100644
--- a/qutebrowser/browser/network/proxy.py
+++ b/qutebrowser/browser/network/proxy.py
@@ -61,7 +61,8 @@ class ProxyFactory(QNetworkProxyFactory):
         """
         proxy = config.val.content.proxy
         if proxy is configtypes.SYSTEM_PROXY:
-            # On Linux, use "export http_proxy=socks5://host:port" to manually set system proxy
+            # On Linux, use "export http_proxy=socks5://host:port" to manually
+            # set system proxy.
             # ref. http://doc.qt.io/qt-5/qnetworkproxyfactory.html#systemProxyForQuery
             proxies = QNetworkProxyFactory.systemProxyForQuery(query)
         elif isinstance(proxy, pac.PACFetcher):

From def2920a3516cec1539a4221a8ed233f408cebca Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Wed, 31 Jan 2018 18:05:14 -0500
Subject: [PATCH 229/574] fix line length

---
 qutebrowser/browser/network/proxy.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/network/proxy.py b/qutebrowser/browser/network/proxy.py
index 9a1f80ae8..cefb5d179 100644
--- a/qutebrowser/browser/network/proxy.py
+++ b/qutebrowser/browser/network/proxy.py
@@ -61,8 +61,10 @@ class ProxyFactory(QNetworkProxyFactory):
         """
         proxy = config.val.content.proxy
         if proxy is configtypes.SYSTEM_PROXY:
-            # On Linux, use "export http_proxy=socks5://host:port" to manually set system proxy
-            # ref. http://doc.qt.io/qt-5/qnetworkproxyfactory.html#systemProxyForQuery
+            # On Linux, use "export http_proxy=socks5://host:port"
+            #   to manually set system proxy.
+            # ref. http://doc.qt.io/qt-5/qnetworkproxyfactory.html
+            #   look under the systemProxyForQuery() call
             proxies = QNetworkProxyFactory.systemProxyForQuery(query)
         elif isinstance(proxy, pac.PACFetcher):
             proxies = proxy.resolve(query)

From 132095c98c5521ed637ef8eaef1e2b5e87bdeb30 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Wed, 31 Jan 2018 18:05:23 -0500
Subject: [PATCH 230/574] only open the tab for output once the job has
 finished running

---
 qutebrowser/browser/commands.py     | 21 +++++++++++++--------
 qutebrowser/commands/userscripts.py |  1 +
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index a0c5e63ff..3619affc5 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1217,10 +1217,18 @@ class CommandDispatcher:
 
         log.procs.debug("Executing {} with args {}, userscript={}".format(
             cmd, args, userscript))
+
+        def _on_proc_finished():
+            if output:
+                tb = objreg.get('tabbed-browser', scope='window',
+                                window='last-focused')
+                tb.openurl(QUrl('qute://spawn-output'), newtab=True)
+
         if userscript:
             def _selection_callback(s):
                 try:
-                    self._run_userscript(s, cmd, args, verbose)
+                    runner = self._run_userscript(s, cmd, args, verbose)
+                    runner.finished.connect(_on_proc_finished)
                 except cmdexc.CommandError as e:
                     message.error(str(e))
 
@@ -1239,11 +1247,7 @@ class CommandDispatcher:
                 proc.start_detached(cmd, args)
             else:
                 proc.start(cmd, args)
-
-        if output:
-            tabbed_browser = objreg.get('tabbed-browser', scope='window',
-                                        window='last-focused')
-            tabbed_browser.openurl(QUrl('qute://spawn-output'), newtab=True)
+            proc.finished.connect(_on_proc_finished)
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     def home(self):
@@ -1284,10 +1288,11 @@ class CommandDispatcher:
             env['QUTE_URL'] = url.toString(QUrl.FullyEncoded)
 
         try:
-            userscripts.run_async(tab, cmd, *args, win_id=self._win_id,
-                                  env=env, verbose=verbose)
+            runner = userscripts.run_async(
+                tab, cmd, *args, win_id=self._win_id, env=env, verbose=verbose)
         except userscripts.Error as e:
             raise cmdexc.CommandError(e)
+        return runner
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     def quickmark_save(self):
diff --git a/qutebrowser/commands/userscripts.py b/qutebrowser/commands/userscripts.py
index d86cb8ccf..fc6443eb3 100644
--- a/qutebrowser/commands/userscripts.py
+++ b/qutebrowser/commands/userscripts.py
@@ -446,3 +446,4 @@ def run_async(tab, cmd, *args, win_id, env, verbose=False):
     runner.prepare_run(cmd_path, *args, env=env, verbose=verbose)
     tab.dump_async(runner.store_html)
     tab.dump_async(runner.store_text, plain=True)
+    return runner

From eab9b70f2826abd8f0b7668196d0807b3988852f Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Thu, 1 Feb 2018 20:43:35 -0500
Subject: [PATCH 231/574] Fix pylint for editor.py.

Notate unused parameter.
---
 qutebrowser/misc/editor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index 70bd4e68a..b6707f886 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -70,7 +70,7 @@ class ExternalEditor(QObject):
             message.error("Failed to delete tempfile... ({})".format(e))
 
     @pyqtSlot(int, QProcess.ExitStatus)
-    def on_proc_closed(self, exitcode, exitstatus):
+    def on_proc_closed(self, _exitcode, exitstatus):
         """Write the editor text into the form field and clean up tempfile.
 
         Callback for QProcess when the editor was closed.

From 0aefffce4dab9afd99c278558af605d626441ca8 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Thu, 1 Feb 2018 20:55:18 -0500
Subject: [PATCH 232/574] Attempt to solve flaky editor tests.

These are passing locally but failing in travis. This fixes two possible
timing issues:

- Ensure the signals are set up befor the pidfile is written. The
  function that sends the signal waits for the pidfile to exist, so this
  ensures we don't miss a signal.
- Wait for the log message indicating that the editor file was read
  back, so the test doesn't run through before we get a chance to read
  from the editor.
---
 tests/end2end/features/editor.feature     | 1 +
 tests/end2end/features/test_editor_bdd.py | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/end2end/features/editor.feature b/tests/end2end/features/editor.feature
index 489fc7200..391e88749 100644
--- a/tests/end2end/features/editor.feature
+++ b/tests/end2end/features/editor.feature
@@ -138,6 +138,7 @@ Feature: Opening external editors
         And I wait for "Entering mode KeyMode.insert (reason: clicking input)" in the log
         And I run :open-editor
         And I save without exiting the editor
+        And I wait for "Read back: foobar" in the log
         And I run :click-element id qute-button
         Then the javascript message "text: foobar" should be logged
 
diff --git a/tests/end2end/features/test_editor_bdd.py b/tests/end2end/features/test_editor_bdd.py
index e2415da46..4e480b85d 100644
--- a/tests/end2end/features/test_editor_bdd.py
+++ b/tests/end2end/features/test_editor_bdd.py
@@ -90,11 +90,12 @@ def set_up_editor_wait(quteproc, tmpdir, text):
             if sig == signal.SIGUSR1:
                 sys.exit(0)
 
+        signal.signal(signal.SIGUSR1, handle)
+        signal.signal(signal.SIGUSR2, handle)
+
         with open(r'{pidfile}', 'w') as f:
             f.write(str(os.getpid()))
 
-        signal.signal(signal.SIGUSR1, handle)
-        signal.signal(signal.SIGUSR2, handle)
         time.sleep(100)
     """.format(pidfile=pidfile, text=text)))
     editor = json.dumps([sys.executable, str(script), '{}'])

From ceab4a4c1f6f650089d6d4267d67fb6094d506ef Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sat, 3 Feb 2018 08:12:45 -0500
Subject: [PATCH 233/574] Fix pylint warnings

---
 qutebrowser/misc/editor.py               | 2 +-
 tests/unit/config/test_configcommands.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index b6707f886..b9a3ed97f 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -23,7 +23,7 @@ import os
 import tempfile
 
 from PyQt5.QtCore import (pyqtSignal, pyqtSlot, QObject, QProcess,
-    QFileSystemWatcher)
+                          QFileSystemWatcher)
 
 from qutebrowser.config import config
 from qutebrowser.utils import message, log
diff --git a/tests/unit/config/test_configcommands.py b/tests/unit/config/test_configcommands.py
index a376e19b9..1f1637ed3 100644
--- a/tests/unit/config/test_configcommands.py
+++ b/tests/unit/config/test_configcommands.py
@@ -22,7 +22,7 @@ import logging
 import unittest.mock
 
 import pytest
-from PyQt5.QtCore import QUrl, QProcess
+from PyQt5.QtCore import QUrl
 
 from qutebrowser.config import configcommands
 from qutebrowser.commands import cmdexc

From d7a436568ccad55e37bac2c93e2d9e485b7f7522 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Sat, 3 Feb 2018 14:31:44 -0500
Subject: [PATCH 234/574] Add a new --no-last flag to :tab-focus

--no-last prevents going to the last focused tab if a new tab does not
need to be focused.
---
 doc/help/commands.asciidoc      | 15 +++++++--------
 qutebrowser/browser/commands.py |  6 ++++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index a87dc2304..82c714cdf 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -519,8 +519,7 @@ Show help about a command or setting.
 
 [[hint]]
 === hint
-Syntax: +:hint [*--mode* 'mode'] [*--add-history*] [*--rapid*]
-     ['group'] ['target'] ['args' ['args' ...]]+
+Syntax: +:hint [*--mode* 'mode'] [*--add-history*] [*--rapid*] ['group'] ['target'] ['args' ['args' ...]]+
 
 Start hinting.
 
@@ -770,8 +769,7 @@ Do nothing.
 
 [[open]]
 === open
-Syntax: +:open [*--related*] [*--bg*] [*--tab*] [*--window*] [*--secure*] [*--private*]
-     ['url']+
+Syntax: +:open [*--related*] [*--bg*] [*--tab*] [*--window*] [*--secure*] [*--private*] ['url']+
 
 Open a URL in the current/[count]th tab.
 
@@ -1091,9 +1089,7 @@ Load a session.
 
 [[session-save]]
 === session-save
-Syntax: +:session-save [*--current*] [*--quiet*] [*--force*] [*--only-active-window*]
-             [*--with-private*]
-             ['name']+
+Syntax: +:session-save [*--current*] [*--quiet*] [*--force*] [*--only-active-window*] [*--with-private*] ['name']+
 
 Save a session.
 
@@ -1212,7 +1208,7 @@ The tab index to close
 
 [[tab-focus]]
 === tab-focus
-Syntax: +:tab-focus ['index']+
+Syntax: +:tab-focus [*--no-last*] ['index']+
 
 Select the tab given as argument/[count].
 
@@ -1224,6 +1220,9 @@ If neither count nor index are given, it behaves like tab-next. If both are give
  last tab.
 
 
+==== optional arguments
+* +*-n*+, +*--no-last*+: Whether to avoid focusing last tab if already focused.
+
 ==== count
 The tab index to focus, starting with 1.
 
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index a0c5e63ff..81835e422 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1109,7 +1109,8 @@ class CommandDispatcher:
     @cmdutils.register(instance='command-dispatcher', scope='window')
     @cmdutils.argument('index', choices=['last'])
     @cmdutils.argument('count', count=True)
-    def tab_focus(self, index: typing.Union[str, int] = None, count=None):
+    def tab_focus(self, index: typing.Union[str, int] = None,
+                  count=None, no_last=False):
         """Select the tab given as argument/[count].
 
         If neither count nor index are given, it behaves like tab-next.
@@ -1121,13 +1122,14 @@ class CommandDispatcher:
                    Negative indices count from the end, such that -1 is the
                    last tab.
             count: The tab index to focus, starting with 1.
+            no_last: Whether to avoid focusing last tab if already focused.
         """
         index = count if count is not None else index
 
         if index == 'last':
             self._tab_focus_last()
             return
-        elif index == self._current_index() + 1:
+        elif not no_last and index == self._current_index() + 1:
             self._tab_focus_last(show_error=False)
             return
         elif index is None:

From 989e60b01fe0b5c2d2e49c35450e751c7ca3217c Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 3 Feb 2018 19:10:19 -0500
Subject: [PATCH 235/574] Revert "fix line length"

This reverts commit def2920a3516cec1539a4221a8ed233f408cebca.
---
 qutebrowser/browser/network/proxy.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/network/proxy.py b/qutebrowser/browser/network/proxy.py
index cefb5d179..9a1f80ae8 100644
--- a/qutebrowser/browser/network/proxy.py
+++ b/qutebrowser/browser/network/proxy.py
@@ -61,10 +61,8 @@ class ProxyFactory(QNetworkProxyFactory):
         """
         proxy = config.val.content.proxy
         if proxy is configtypes.SYSTEM_PROXY:
-            # On Linux, use "export http_proxy=socks5://host:port"
-            #   to manually set system proxy.
-            # ref. http://doc.qt.io/qt-5/qnetworkproxyfactory.html
-            #   look under the systemProxyForQuery() call
+            # On Linux, use "export http_proxy=socks5://host:port" to manually set system proxy
+            # ref. http://doc.qt.io/qt-5/qnetworkproxyfactory.html#systemProxyForQuery
             proxies = QNetworkProxyFactory.systemProxyForQuery(query)
         elif isinstance(proxy, pac.PACFetcher):
             proxies = proxy.resolve(query)

From 833df95485e9cf9516d7869315808e55bcc3a16d Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sat, 3 Feb 2018 08:27:36 -0500
Subject: [PATCH 236/574] Only detect save for open-editor and config-edit.

Scope down the new trigger-on-save behavior to only open-editor and
config-edit. Other uses of the editor such as edit-url and edit-command
will behave as before.
---
 qutebrowser/browser/commands.py      |  2 +-
 qutebrowser/config/configcommands.py |  2 +-
 qutebrowser/misc/editor.py           | 16 +++++++++++-----
 tests/unit/misc/test_editor.py       | 12 ++++++------
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 55af2c50a..094563bcc 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1621,7 +1621,7 @@ class CommandDispatcher:
 
         caret_position = elem.caret_position()
 
-        ed = editor.ExternalEditor(self._tabbed_browser)
+        ed = editor.ExternalEditor(watch=True, parent=self._tabbed_browser)
         ed.file_updated.connect(functools.partial(
             self.on_file_updated, elem))
         ed.edit(text, caret_position)
diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py
index faf31d718..1a07b2020 100644
--- a/qutebrowser/config/configcommands.py
+++ b/qutebrowser/config/configcommands.py
@@ -263,7 +263,7 @@ class ConfigCommands:
             except configexc.ConfigFileErrors as e:
                 message.error(str(e))
 
-        ed = editor.ExternalEditor(self._config)
+        ed = editor.ExternalEditor(watch=True, parent=self._config)
         if not no_source:
             ed.file_updated.connect(on_file_updated)
 
diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index b9a3ed97f..9565ce28b 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -41,22 +41,27 @@ class ExternalEditor(QObject):
                       closed.
         _proc: The GUIProcess of the editor.
         _watcher: A QFileSystemWatcher to watch the edited file for changes.
+                  Only set if watch=True.
     """
 
     file_updated = pyqtSignal(str)
 
-    def __init__(self, parent=None):
+    def __init__(self, parent=None, watch=False):
         super().__init__(parent)
         self._filename = None
         self._proc = None
         self._remove_file = None
-        self._watcher = QFileSystemWatcher(parent=self)
+        if watch:
+            self._watcher = QFileSystemWatcher(parent=self)
+        else:
+            self._watcher = None
         self._content = None
 
     def _cleanup(self):
         """Clean up temporary files after the editor closed."""
         assert self._remove_file is not None
-        self._watcher.removePaths(self._watcher.files())
+        if self._watcher:
+            self._watcher.removePaths(self._watcher.files())
         if self._filename is None or not self._remove_file:
             # Could not create initial file.
             return
@@ -154,8 +159,9 @@ class ExternalEditor(QObject):
         editor = config.val.editor.command
         executable = editor[0]
 
-        self._watcher.addPath(self._filename)
-        self._watcher.fileChanged.connect(self._on_file_changed)
+        if self._watcher:
+            self._watcher.addPath(self._filename)
+            self._watcher.fileChanged.connect(self._on_file_changed)
 
         args = [self._sub_placeholder(arg, line, column) for arg in editor[1:]]
         log.procs.debug("Calling \"{}\" with args {}".format(executable, args))
diff --git a/tests/unit/misc/test_editor.py b/tests/unit/misc/test_editor.py
index 3f7d8acaf..37506d923 100644
--- a/tests/unit/misc/test_editor.py
+++ b/tests/unit/misc/test_editor.py
@@ -170,18 +170,18 @@ def test_modify(qtbot, editor, initial_text, edited_text):
     with open(editor._filename, 'r', encoding='utf-8') as f:
         assert f.read() == initial_text
 
-    with qtbot.wait_signal(editor.file_updated) as blocker:
-        with open(editor._filename, 'w', encoding='utf-8') as f:
-            f.write(edited_text)
+    with open(editor._filename, 'w', encoding='utf-8') as f:
+        f.write(edited_text)
 
-    with qtbot.assert_not_emitted(editor.file_updated):
+    with qtbot.wait_signal(editor.file_updated) as blocker:
         editor._proc.finished.emit(0, QProcess.NormalExit)
 
     assert blocker.args == [edited_text]
 
 
-def test_modify_multiple(qtbot, editor):
-    """Test that multiple saves all trigger file_updated."""
+def test_modify_watch(qtbot):
+    """Test that saving triggers file_updated when watch=True."""
+    editor = editormod.ExternalEditor(watch=True)
     editor.edit('foo')
 
     with qtbot.wait_signal(editor.file_updated) as blocker:

From a8733d7228f47ee7f24982deb68934902992f2f4 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sun, 4 Feb 2018 07:02:25 -0500
Subject: [PATCH 237/574] Increase timeout in test_editor.

The test with watch=True was failing on the Travis OSX environment
becausee it was timing out before the file_updated signal was fired.
---
 tests/unit/misc/test_editor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/misc/test_editor.py b/tests/unit/misc/test_editor.py
index 37506d923..58f6edae7 100644
--- a/tests/unit/misc/test_editor.py
+++ b/tests/unit/misc/test_editor.py
@@ -184,7 +184,7 @@ def test_modify_watch(qtbot):
     editor = editormod.ExternalEditor(watch=True)
     editor.edit('foo')
 
-    with qtbot.wait_signal(editor.file_updated) as blocker:
+    with qtbot.wait_signal(editor.file_updated, timeout=3000) as blocker:
         with open(editor._filename, 'w', encoding='utf-8') as f:
             f.write('bar')
     assert blocker.args == ['bar']

From 0ebde6f2e9cdb0eb087bfea7ba225e02ec7840de Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Sun, 4 Feb 2018 02:11:34 -0500
Subject: [PATCH 238/574] Delete QWebEngineDownloadItem objects when wrapper
 object is deleted

---
 qutebrowser/browser/webengine/webenginedownloads.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/qutebrowser/browser/webengine/webenginedownloads.py b/qutebrowser/browser/webengine/webenginedownloads.py
index d467724d5..7dec2dd54 100644
--- a/qutebrowser/browser/webengine/webenginedownloads.py
+++ b/qutebrowser/browser/webengine/webenginedownloads.py
@@ -45,6 +45,10 @@ class DownloadItem(downloads.AbstractDownloadItem):
         qt_item.downloadProgress.connect(self.stats.on_download_progress)
         qt_item.stateChanged.connect(self._on_state_changed)
 
+        # Ensure wrapped qt_item is deleted manually when the wrapper object
+        # is deleted. See https://github.com/qutebrowser/qutebrowser/issues/3373
+        self.destroyed.connect(self._qt_item.deleteLater)
+
     def _is_page_download(self):
         """Check if this item is a page (i.e. mhtml) download."""
         return (self._qt_item.savePageFormat() !=

From c8de4675db14fad73389ad8805bf0fc571a469f0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 3 Feb 2018 19:08:42 +0100
Subject: [PATCH 239/574] Various spelling fixes

---
 doc/changelog.asciidoc                    | 4 ++--
 doc/contributing.asciidoc                 | 2 +-
 doc/help/configuring.asciidoc             | 2 +-
 doc/help/settings.asciidoc                | 2 +-
 doc/stacktrace.asciidoc                   | 2 +-
 qutebrowser/browser/greasemonkey.py       | 2 +-
 qutebrowser/commands/command.py           | 4 ++--
 qutebrowser/config/configdata.yml         | 2 +-
 qutebrowser/misc/backendproblem.py        | 2 +-
 qutebrowser/misc/savemanager.py           | 4 ++--
 qutebrowser/utils/version.py              | 6 +++---
 scripts/dev/misc_checks.py                | 2 +-
 tests/end2end/features/conftest.py        | 4 ++--
 tests/end2end/features/hints.feature      | 2 +-
 tests/end2end/features/utilcmds.feature   | 2 +-
 tests/end2end/fixtures/testprocess.py     | 2 +-
 tests/unit/mainwindow/test_messageview.py | 2 +-
 17 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index edc5523ba..8e943d2c7 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -1143,7 +1143,7 @@ Added
 - New `:fake-key` command to send a fake keypress to a website or to
   qutebrowser.
 - New `--mhtml` argument for `:download` to download a page including all
-  ressources as MHTML file.
+  resources as MHTML file.
 - New option `tabs -> title-alignment` to change the alignment of tab titles.
 
 Changed
@@ -1343,7 +1343,7 @@ Added
 - New argument `--no-err-windows` to suppress all error windows.
 - New arguments `--top-navigate` and `--bottom-navigate` (`-t`/`-b`) for `:scroll-page` to specify a navigation action (e.g. automatically go to the next page when arriving at the bottom).
 - New flag `-d`/`--detach` for `:spawn` to detach the spawned process so it's not closed when qutebrowser is.
-- New flag `-v`/`--verbose` for `:spawn` to print informations when the process started/exited successfully.
+- New flag `-v`/`--verbose` for `:spawn` to print information when the process started/exited successfully.
 - Many new color settings (foreground setting for every background setting).
 - New setting `ui -> modal-js-dialog` to use the standard modal dialogs for javascript questions instead of using the statusbar.
 - New setting `colors -> webpage.bg` to set the background color to use for websites which don't set one.
diff --git a/doc/contributing.asciidoc b/doc/contributing.asciidoc
index afbb752c5..a75034b95 100644
--- a/doc/contributing.asciidoc
+++ b/doc/contributing.asciidoc
@@ -375,7 +375,7 @@ The following logging levels are available for every logger:
 |error     |There was an issue and some kind of operation was abandoned.
 |warning   |There was an issue but the operation can continue running.
 |info      |General informational messages.
-|debug     |Verbose debugging informations.
+|debug     |Verbose debugging information.
 |=======================================================================
 
 [[commands]]
diff --git a/doc/help/configuring.asciidoc b/doc/help/configuring.asciidoc
index b801e8820..bb43e1dfe 100644
--- a/doc/help/configuring.asciidoc
+++ b/doc/help/configuring.asciidoc
@@ -254,7 +254,7 @@ Getting the config directory
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If you need to get the qutebrowser config directory, you can do so by reading
-`config.configdir`. Similarily, you can get the qutebrowser data directory via
+`config.configdir`. Similarly, you can get the qutebrowser data directory via
 `config.datadir`.
 
 This gives you a https://docs.python.org/3/library/pathlib.html[`pathlib.Path`
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 67ede4fa8..c44dfb9a6 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -1580,7 +1580,7 @@ Default: +pass:[true]+
 [[content.headers.referer]]
 === content.headers.referer
 When to send the Referer header.
-The Referer header tells websites from which website you were coming from when visting them.
+The Referer header tells websites from which website you were coming from when visiting them.
 
 Type: <<types,String>>
 
diff --git a/doc/stacktrace.asciidoc b/doc/stacktrace.asciidoc
index 5505eca93..00c89e884 100644
--- a/doc/stacktrace.asciidoc
+++ b/doc/stacktrace.asciidoc
@@ -37,7 +37,7 @@ is available in the repositories:
 Archlinux
 ^^^^^^^^^
 
-For Archlinux, no debug informations are provided. You can either compile Qt
+For Archlinux, no debug information is provided. You can either compile Qt
 yourself (which will take a few hours even on a modern machine) or use
 debugging symbols compiled/packaged by me (x86_64 only).
 
diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index 7ee843b0b..ba2879848 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -134,7 +134,7 @@ class GreasemonkeyManager(QObject):
     Signals:
         scripts_reloaded: Emitted when scripts are reloaded from disk.
             Any cached or already-injected scripts should be
-            considered obselete.
+            considered obsolete.
     """
 
     scripts_reloaded = pyqtSignal()
diff --git a/qutebrowser/commands/command.py b/qutebrowser/commands/command.py
index b4ff1cde8..dd9a63101 100644
--- a/qutebrowser/commands/command.py
+++ b/qutebrowser/commands/command.py
@@ -193,10 +193,10 @@ class Command:
         return False
 
     def _inspect_func(self):
-        """Inspect the function to get useful informations from it.
+        """Inspect the function to get useful information from it.
 
         Sets instance attributes (desc, type_conv, name_conv) based on the
-        informations.
+        information.
 
         Return:
             How many user-visible arguments the command has.
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 2d99af729..e2daefe3b 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -360,7 +360,7 @@ content.headers.referer:
     When to send the Referer header.
 
     The Referer header tells websites from which website you were coming from
-    when visting them.
+    when visiting them.
 
 content.headers.user_agent:
   default: null
diff --git a/qutebrowser/misc/backendproblem.py b/qutebrowser/misc/backendproblem.py
index 8cc5b71b2..cf1024c57 100644
--- a/qutebrowser/misc/backendproblem.py
+++ b/qutebrowser/misc/backendproblem.py
@@ -191,7 +191,7 @@ def _handle_nouveau_graphics():
         text="<p>There are two ways to fix this:</p>"
              "<p><b>Forcing software rendering</b></p>"
              "<p>This allows you to use the newer QtWebEngine backend (based "
-             "on Chromium) but could have noticable performance impact "
+             "on Chromium) but could have noticeable performance impact "
              "(depending on your hardware). "
              "This sets the <i>qt.force_software_rendering = True</i> option "
              "(if you have a <i>config.py</i> file, you'll need to set this "
diff --git a/qutebrowser/misc/savemanager.py b/qutebrowser/misc/savemanager.py
index 02001902c..436e3b66f 100644
--- a/qutebrowser/misc/savemanager.py
+++ b/qutebrowser/misc/savemanager.py
@@ -77,7 +77,7 @@ class Saveable:
         Args:
             is_exit: Whether we're currently exiting qutebrowser.
             explicit: Whether the user explicitly requested this save.
-            silent: Don't write informations to log.
+            silent: Don't write information to log.
             force: Force saving, no matter what.
         """
         if (self._config_opt is not None and
@@ -157,7 +157,7 @@ class SaveManager(QObject):
         Args:
             is_exit: Whether we're currently exiting qutebrowser.
             explicit: Whether this save operation was triggered explicitly.
-            silent: Don't write informations to log. Used to reduce log spam
+            silent: Don't write information to log. Used to reduce log spam
                     when autosaving.
             force: Force saving, no matter what.
         """
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index 47cbf6eff..624197bdd 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Utilities to show various version informations."""
+"""Utilities to show various version information."""
 
 import re
 import sys
@@ -167,7 +167,7 @@ def _git_str_subprocess(gitpath):
 
 
 def _release_info():
-    """Try to gather distribution release informations.
+    """Try to gather distribution release information.
 
     Return:
         list of (filename, content) tuples.
@@ -335,7 +335,7 @@ def _uptime() -> datetime.timedelta:
 
 
 def version():
-    """Return a string with various version informations."""
+    """Return a string with various version information."""
     lines = ["qutebrowser v{}".format(qutebrowser.__version__)]
     gitver = _git_str()
     if gitver is not None:
diff --git a/scripts/dev/misc_checks.py b/scripts/dev/misc_checks.py
index c04a35f1a..ff372a7ae 100644
--- a/scripts/dev/misc_checks.py
+++ b/scripts/dev/misc_checks.py
@@ -89,7 +89,7 @@ def check_spelling():
              '[Ww]ether', '[Pp]rogramatically', '[Ss]plitted', '[Ee]xitted',
              '[Mm]ininum', '[Rr]esett?ed', '[Rr]ecieved', '[Rr]egularily',
              '[Uu]nderlaying', '[Ii]nexistant', '[Ee]lipsis', 'commiting',
-             'existant', '[Rr]esetted'}
+             'existant', '[Rr]esetted', '[Ss]imilarily', '[Ii]nformations'}
 
     # Words which look better when splitted, but might need some fine tuning.
     words |= {'[Ww]ebelements', '[Mm]ouseevent', '[Kk]eysequence',
diff --git a/tests/end2end/features/conftest.py b/tests/end2end/features/conftest.py
index 5b97ba2a4..228e80f06 100644
--- a/tests/end2end/features/conftest.py
+++ b/tests/end2end/features/conftest.py
@@ -63,7 +63,7 @@ def pytest_runtest_makereport(item, call):
     if (not hasattr(report.longrepr, 'addsection') or
             not hasattr(report, 'scenario')):
         # In some conditions (on macOS and Windows it seems), report.longrepr
-        # is actually a tuple. This is handled similarily in pytest-qt too.
+        # is actually a tuple. This is handled similarly in pytest-qt too.
         #
         # Since this hook is invoked for any test, we also need to skip it for
         # non-BDD ones.
@@ -389,7 +389,7 @@ def clear_ssl_errors(request, quteproc):
 def path_should_be_loaded(quteproc, path):
     """Make sure the given path was loaded according to the log.
 
-    This is usally the better check compared to "should be requested" as the
+    This is usually the better check compared to "should be requested" as the
     page could be loaded from local cache.
     """
     quteproc.wait_for_load_finished(path)
diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature
index 0151a14ad..3c55c74b1 100644
--- a/tests/end2end/features/hints.feature
+++ b/tests/end2end/features/hints.feature
@@ -211,7 +211,7 @@ Feature: Using hints
         And I hint with args "links normal" and follow a
         Then "navigation request: url http://localhost:*/data/hello.txt, type NavigationTypeLinkClicked, *" should be logged
 
-    ### FIXME currenly skipped, see https://github.com/qutebrowser/qutebrowser/issues/1525
+    ### FIXME currently skipped, see https://github.com/qutebrowser/qutebrowser/issues/1525
     @xfail_norun
     Scenario: Using :follow-hint inside a scrolled iframe
         When I open data/hints/iframe_scroll.html
diff --git a/tests/end2end/features/utilcmds.feature b/tests/end2end/features/utilcmds.feature
index bff13d40e..5ccbac9b3 100644
--- a/tests/end2end/features/utilcmds.feature
+++ b/tests/end2end/features/utilcmds.feature
@@ -117,7 +117,7 @@ Feature: Miscellaneous utility commands exposed to the user.
         And the message "test2" should be shown
         And the message "test2" should be shown
 
-    Scenario: :repeat-command with not-normal command inbetween
+    Scenario: :repeat-command with not-normal command in between
         When I run :message-info test3
         And I run :prompt-accept
         And I run :repeat-command
diff --git a/tests/end2end/fixtures/testprocess.py b/tests/end2end/fixtures/testprocess.py
index 3fb259e47..99ea81337 100644
--- a/tests/end2end/fixtures/testprocess.py
+++ b/tests/end2end/fixtures/testprocess.py
@@ -101,7 +101,7 @@ def pytest_runtest_makereport(item, call):
 
     if not hasattr(report.longrepr, 'addsection'):
         # In some conditions (on macOS and Windows it seems), report.longrepr
-        # is actually a tuple. This is handled similarily in pytest-qt too.
+        # is actually a tuple. This is handled similarly in pytest-qt too.
         return
 
     if item.config.getoption('--capture') == 'no':
diff --git a/tests/unit/mainwindow/test_messageview.py b/tests/unit/mainwindow/test_messageview.py
index 3a502b2bd..6c9d767c5 100644
--- a/tests/unit/mainwindow/test_messageview.py
+++ b/tests/unit/mainwindow/test_messageview.py
@@ -117,7 +117,7 @@ def test_replaced_messages(view, replace1, replace2, length):
     (Qt.BackButton, 2),
 ])
 def test_click_messages(qtbot, view, button, count):
-    """Messages should dissappear when we click on them."""
+    """Messages should disappear when we click on them."""
     view.show_message(usertypes.MessageLevel.info, 'test mouse click')
     view.show_message(usertypes.MessageLevel.info, 'test mouse click 2')
     qtbot.mousePress(view, button)

From 8dbf506916acbad384044cbc3215a75ce22d2166 Mon Sep 17 00:00:00 2001
From: seebye <seebye@users.noreply.github.com>
Date: Mon, 5 Feb 2018 01:20:56 +0100
Subject: [PATCH 240/574] Fix #3542 going back twice on lazy loading a tab

---
 qutebrowser/html/back.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/html/back.html b/qutebrowser/html/back.html
index 894427800..6128c41f7 100644
--- a/qutebrowser/html/back.html
+++ b/qutebrowser/html/back.html
@@ -27,7 +27,7 @@ function prepare_restore() {
 		return;
 	}
 
-	document.addEventListener("visibilitychange", go_back);
+	document.addEventListener("visibilitychange", go_back, {once: true});
 }
 
 // there are three states

From 6f028e9ad030f93cc504ee7a5d34bbfc0693489d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 5 Feb 2018 12:19:50 +0100
Subject: [PATCH 241/574] Update copyright years

---
 qutebrowser.py                                              | 2 +-
 qutebrowser/__init__.py                                     | 2 +-
 qutebrowser/__main__.py                                     | 2 +-
 qutebrowser/app.py                                          | 2 +-
 qutebrowser/browser/__init__.py                             | 2 +-
 qutebrowser/browser/adblock.py                              | 2 +-
 qutebrowser/browser/browsertab.py                           | 2 +-
 qutebrowser/browser/commands.py                             | 2 +-
 qutebrowser/browser/downloads.py                            | 2 +-
 qutebrowser/browser/downloadview.py                         | 2 +-
 qutebrowser/browser/greasemonkey.py                         | 2 +-
 qutebrowser/browser/hints.py                                | 2 +-
 qutebrowser/browser/history.py                              | 2 +-
 qutebrowser/browser/inspector.py                            | 2 +-
 qutebrowser/browser/mouse.py                                | 2 +-
 qutebrowser/browser/navigate.py                             | 2 +-
 qutebrowser/browser/network/pac.py                          | 2 +-
 qutebrowser/browser/network/proxy.py                        | 2 +-
 qutebrowser/browser/pdfjs.py                                | 2 +-
 qutebrowser/browser/qtnetworkdownloads.py                   | 2 +-
 qutebrowser/browser/qutescheme.py                           | 2 +-
 qutebrowser/browser/shared.py                               | 2 +-
 qutebrowser/browser/signalfilter.py                         | 2 +-
 qutebrowser/browser/urlmarks.py                             | 4 ++--
 qutebrowser/browser/webelem.py                              | 2 +-
 qutebrowser/browser/webengine/__init__.py                   | 2 +-
 qutebrowser/browser/webengine/certificateerror.py           | 2 +-
 qutebrowser/browser/webengine/interceptor.py                | 2 +-
 qutebrowser/browser/webengine/spell.py                      | 2 +-
 qutebrowser/browser/webengine/tabhistory.py                 | 2 +-
 qutebrowser/browser/webengine/webenginedownloads.py         | 2 +-
 qutebrowser/browser/webengine/webengineelem.py              | 2 +-
 qutebrowser/browser/webengine/webengineinspector.py         | 2 +-
 qutebrowser/browser/webengine/webenginequtescheme.py        | 2 +-
 qutebrowser/browser/webengine/webenginesettings.py          | 2 +-
 qutebrowser/browser/webengine/webenginetab.py               | 2 +-
 qutebrowser/browser/webengine/webview.py                    | 2 +-
 qutebrowser/browser/webkit/__init__.py                      | 2 +-
 qutebrowser/browser/webkit/cache.py                         | 2 +-
 qutebrowser/browser/webkit/certificateerror.py              | 2 +-
 qutebrowser/browser/webkit/cookies.py                       | 2 +-
 qutebrowser/browser/webkit/http.py                          | 2 +-
 qutebrowser/browser/webkit/mhtml.py                         | 2 +-
 qutebrowser/browser/webkit/network/filescheme.py            | 4 ++--
 qutebrowser/browser/webkit/network/networkmanager.py        | 2 +-
 qutebrowser/browser/webkit/network/networkreply.py          | 2 +-
 qutebrowser/browser/webkit/network/schemehandler.py         | 2 +-
 qutebrowser/browser/webkit/network/webkitqutescheme.py      | 2 +-
 qutebrowser/browser/webkit/rfc6266.py                       | 2 +-
 qutebrowser/browser/webkit/tabhistory.py                    | 2 +-
 qutebrowser/browser/webkit/webkitelem.py                    | 2 +-
 qutebrowser/browser/webkit/webkithistory.py                 | 2 +-
 qutebrowser/browser/webkit/webkitinspector.py               | 2 +-
 qutebrowser/browser/webkit/webkitsettings.py                | 2 +-
 qutebrowser/browser/webkit/webkittab.py                     | 2 +-
 qutebrowser/browser/webkit/webpage.py                       | 2 +-
 qutebrowser/browser/webkit/webview.py                       | 2 +-
 qutebrowser/commands/__init__.py                            | 2 +-
 qutebrowser/commands/argparser.py                           | 2 +-
 qutebrowser/commands/cmdexc.py                              | 2 +-
 qutebrowser/commands/cmdutils.py                            | 2 +-
 qutebrowser/commands/command.py                             | 2 +-
 qutebrowser/commands/runners.py                             | 2 +-
 qutebrowser/commands/userscripts.py                         | 2 +-
 qutebrowser/completion/__init__.py                          | 2 +-
 qutebrowser/completion/completer.py                         | 2 +-
 qutebrowser/completion/completiondelegate.py                | 2 +-
 qutebrowser/completion/completionwidget.py                  | 2 +-
 qutebrowser/completion/models/__init__.py                   | 2 +-
 qutebrowser/completion/models/completionmodel.py            | 2 +-
 qutebrowser/completion/models/configmodel.py                | 2 +-
 qutebrowser/completion/models/histcategory.py               | 2 +-
 qutebrowser/completion/models/listcategory.py               | 2 +-
 qutebrowser/completion/models/miscmodels.py                 | 2 +-
 qutebrowser/completion/models/urlmodel.py                   | 2 +-
 qutebrowser/completion/models/util.py                       | 2 +-
 qutebrowser/config/__init__.py                              | 2 +-
 qutebrowser/config/config.py                                | 2 +-
 qutebrowser/config/configcommands.py                        | 2 +-
 qutebrowser/config/configdata.py                            | 2 +-
 qutebrowser/config/configdiff.py                            | 2 +-
 qutebrowser/config/configexc.py                             | 2 +-
 qutebrowser/config/configfiles.py                           | 2 +-
 qutebrowser/config/configinit.py                            | 2 +-
 qutebrowser/config/configtypes.py                           | 2 +-
 qutebrowser/config/websettings.py                           | 2 +-
 qutebrowser/keyinput/__init__.py                            | 2 +-
 qutebrowser/keyinput/basekeyparser.py                       | 2 +-
 qutebrowser/keyinput/keyparser.py                           | 2 +-
 qutebrowser/keyinput/macros.py                              | 2 +-
 qutebrowser/keyinput/modeman.py                             | 2 +-
 qutebrowser/keyinput/modeparsers.py                         | 2 +-
 qutebrowser/mainwindow/__init__.py                          | 2 +-
 qutebrowser/mainwindow/mainwindow.py                        | 2 +-
 qutebrowser/mainwindow/messageview.py                       | 2 +-
 qutebrowser/mainwindow/prompt.py                            | 2 +-
 qutebrowser/mainwindow/statusbar/__init__.py                | 2 +-
 qutebrowser/mainwindow/statusbar/backforward.py             | 2 +-
 qutebrowser/mainwindow/statusbar/bar.py                     | 2 +-
 qutebrowser/mainwindow/statusbar/command.py                 | 2 +-
 qutebrowser/mainwindow/statusbar/keystring.py               | 2 +-
 qutebrowser/mainwindow/statusbar/percentage.py              | 2 +-
 qutebrowser/mainwindow/statusbar/progress.py                | 2 +-
 qutebrowser/mainwindow/statusbar/tabindex.py                | 2 +-
 qutebrowser/mainwindow/statusbar/text.py                    | 2 +-
 qutebrowser/mainwindow/statusbar/textbase.py                | 2 +-
 qutebrowser/mainwindow/statusbar/url.py                     | 2 +-
 qutebrowser/mainwindow/tabbedbrowser.py                     | 2 +-
 qutebrowser/mainwindow/tabwidget.py                         | 2 +-
 qutebrowser/misc/__init__.py                                | 2 +-
 qutebrowser/misc/autoupdate.py                              | 2 +-
 qutebrowser/misc/backendproblem.py                          | 2 +-
 qutebrowser/misc/checkpyver.py                              | 2 +-
 qutebrowser/misc/cmdhistory.py                              | 2 +-
 qutebrowser/misc/consolewidget.py                           | 2 +-
 qutebrowser/misc/crashdialog.py                             | 2 +-
 qutebrowser/misc/crashsignal.py                             | 2 +-
 qutebrowser/misc/earlyinit.py                               | 2 +-
 qutebrowser/misc/editor.py                                  | 2 +-
 qutebrowser/misc/guiprocess.py                              | 2 +-
 qutebrowser/misc/httpclient.py                              | 2 +-
 qutebrowser/misc/ipc.py                                     | 2 +-
 qutebrowser/misc/keyhintwidget.py                           | 2 +-
 qutebrowser/misc/lineparser.py                              | 2 +-
 qutebrowser/misc/miscwidgets.py                             | 2 +-
 qutebrowser/misc/msgbox.py                                  | 2 +-
 qutebrowser/misc/objects.py                                 | 2 +-
 qutebrowser/misc/pastebin.py                                | 2 +-
 qutebrowser/misc/readline.py                                | 2 +-
 qutebrowser/misc/savemanager.py                             | 2 +-
 qutebrowser/misc/sessions.py                                | 2 +-
 qutebrowser/misc/split.py                                   | 2 +-
 qutebrowser/misc/sql.py                                     | 2 +-
 qutebrowser/misc/utilcmds.py                                | 2 +-
 qutebrowser/qutebrowser.py                                  | 2 +-
 qutebrowser/utils/__init__.py                               | 2 +-
 qutebrowser/utils/debug.py                                  | 2 +-
 qutebrowser/utils/docutils.py                               | 2 +-
 qutebrowser/utils/error.py                                  | 2 +-
 qutebrowser/utils/javascript.py                             | 2 +-
 qutebrowser/utils/jinja.py                                  | 2 +-
 qutebrowser/utils/log.py                                    | 2 +-
 qutebrowser/utils/message.py                                | 2 +-
 qutebrowser/utils/objreg.py                                 | 2 +-
 qutebrowser/utils/qtutils.py                                | 2 +-
 qutebrowser/utils/standarddir.py                            | 2 +-
 qutebrowser/utils/urlutils.py                               | 2 +-
 qutebrowser/utils/usertypes.py                              | 2 +-
 qutebrowser/utils/utils.py                                  | 2 +-
 qutebrowser/utils/version.py                                | 2 +-
 scripts/asciidoc2html.py                                    | 2 +-
 scripts/dev/build_release.py                                | 2 +-
 scripts/dev/check_coverage.py                               | 2 +-
 scripts/dev/check_doc_changes.py                            | 2 +-
 scripts/dev/cleanup.py                                      | 2 +-
 scripts/dev/get_coredumpctl_traces.py                       | 2 +-
 scripts/dev/misc_checks.py                                  | 2 +-
 scripts/dev/pylint_checkers/qute_pylint/config.py           | 2 +-
 scripts/dev/pylint_checkers/qute_pylint/modeline.py         | 2 +-
 scripts/dev/pylint_checkers/qute_pylint/openencoding.py     | 2 +-
 scripts/dev/pylint_checkers/qute_pylint/settrace.py         | 2 +-
 scripts/dev/pylint_checkers/setup.py                        | 2 +-
 scripts/dev/recompile_requirements.py                       | 2 +-
 scripts/dev/run_profile.py                                  | 2 +-
 scripts/dev/run_pylint_on_tests.py                          | 2 +-
 scripts/dev/run_vulture.py                                  | 2 +-
 scripts/dev/segfault_test.py                                | 2 +-
 scripts/dev/src2asciidoc.py                                 | 2 +-
 scripts/dev/standardpaths_tester.py                         | 2 +-
 scripts/dev/ua_fetch.py                                     | 6 +++---
 scripts/dev/update_3rdparty.py                              | 2 +-
 scripts/dictcli.py                                          | 2 +-
 scripts/hist_importer.py                                    | 4 ++--
 scripts/importer.py                                         | 4 ++--
 scripts/keytester.py                                        | 2 +-
 scripts/link_pyqt.py                                        | 2 +-
 scripts/setupcommon.py                                      | 2 +-
 scripts/testbrowser/testbrowser_webengine.py                | 2 +-
 scripts/testbrowser/testbrowser_webkit.py                   | 2 +-
 scripts/utils.py                                            | 2 +-
 tests/conftest.py                                           | 2 +-
 tests/end2end/conftest.py                                   | 2 +-
 tests/end2end/data/misc/pyeval_file.py                      | 2 +-
 tests/end2end/data/userscripts/stdinclose.py                | 2 +-
 tests/end2end/features/conftest.py                          | 2 +-
 tests/end2end/features/test_backforward_bdd.py              | 2 +-
 tests/end2end/features/test_caret_bdd.py                    | 2 +-
 tests/end2end/features/test_completion_bdd.py               | 2 +-
 tests/end2end/features/test_downloads_bdd.py                | 2 +-
 tests/end2end/features/test_editor_bdd.py                   | 2 +-
 tests/end2end/features/test_hints_bdd.py                    | 2 +-
 tests/end2end/features/test_history_bdd.py                  | 2 +-
 tests/end2end/features/test_invoke_bdd.py                   | 2 +-
 tests/end2end/features/test_javascript_bdd.py               | 2 +-
 tests/end2end/features/test_keyinput_bdd.py                 | 2 +-
 tests/end2end/features/test_marks_bdd.py                    | 2 +-
 tests/end2end/features/test_misc_bdd.py                     | 2 +-
 tests/end2end/features/test_navigate_bdd.py                 | 2 +-
 tests/end2end/features/test_open_bdd.py                     | 2 +-
 tests/end2end/features/test_private_bdd.py                  | 2 +-
 tests/end2end/features/test_prompts_bdd.py                  | 2 +-
 tests/end2end/features/test_qutescheme_bdd.py               | 2 +-
 tests/end2end/features/test_scroll_bdd.py                   | 2 +-
 tests/end2end/features/test_search_bdd.py                   | 2 +-
 tests/end2end/features/test_sessions_bdd.py                 | 2 +-
 tests/end2end/features/test_spawn_bdd.py                    | 2 +-
 tests/end2end/features/test_tabs_bdd.py                     | 2 +-
 tests/end2end/features/test_urlmarks_bdd.py                 | 2 +-
 tests/end2end/features/test_utilcmds_bdd.py                 | 2 +-
 tests/end2end/features/test_yankpaste_bdd.py                | 2 +-
 tests/end2end/features/test_zoom_bdd.py                     | 2 +-
 tests/end2end/fixtures/quteprocess.py                       | 2 +-
 tests/end2end/fixtures/test_quteprocess.py                  | 2 +-
 tests/end2end/fixtures/test_testprocess.py                  | 2 +-
 tests/end2end/fixtures/test_webserver.py                    | 2 +-
 tests/end2end/fixtures/testprocess.py                       | 2 +-
 tests/end2end/fixtures/webserver.py                         | 2 +-
 tests/end2end/fixtures/webserver_sub.py                     | 2 +-
 tests/end2end/fixtures/webserver_sub_ssl.py                 | 2 +-
 tests/end2end/test_dirbrowser.py                            | 2 +-
 tests/end2end/test_hints_html.py                            | 2 +-
 tests/end2end/test_insert_mode.py                           | 2 +-
 tests/end2end/test_invocations.py                           | 2 +-
 tests/end2end/test_mhtml_e2e.py                             | 2 +-
 tests/helpers/fixtures.py                                   | 2 +-
 tests/helpers/logfail.py                                    | 2 +-
 tests/helpers/messagemock.py                                | 2 +-
 tests/helpers/stubs.py                                      | 2 +-
 tests/helpers/test_helper_utils.py                          | 2 +-
 tests/helpers/test_logfail.py                               | 2 +-
 tests/helpers/test_stubs.py                                 | 2 +-
 tests/helpers/utils.py                                      | 2 +-
 tests/test_conftest.py                                      | 2 +-
 tests/unit/browser/test_hints.py                            | 2 +-
 tests/unit/browser/test_history.py                          | 2 +-
 tests/unit/browser/test_qutescheme.py                       | 2 +-
 tests/unit/browser/test_shared.py                           | 2 +-
 tests/unit/browser/test_signalfilter.py                     | 2 +-
 tests/unit/browser/test_tab.py                              | 2 +-
 tests/unit/browser/webengine/test_spell.py                  | 2 +-
 tests/unit/browser/webengine/test_webenginedownloads.py     | 2 +-
 tests/unit/browser/webengine/test_webenginesettings.py      | 2 +-
 tests/unit/browser/webkit/http/test_content_disposition.py  | 2 +-
 tests/unit/browser/webkit/http/test_http.py                 | 2 +-
 tests/unit/browser/webkit/http/test_http_hypothesis.py      | 2 +-
 tests/unit/browser/webkit/network/test_filescheme.py        | 2 +-
 tests/unit/browser/webkit/network/test_networkmanager.py    | 2 +-
 tests/unit/browser/webkit/network/test_networkreply.py      | 2 +-
 tests/unit/browser/webkit/network/test_pac.py               | 2 +-
 tests/unit/browser/webkit/network/test_schemehandler.py     | 2 +-
 tests/unit/browser/webkit/network/test_webkitqutescheme.py  | 4 ++--
 tests/unit/browser/webkit/test_cache.py                     | 2 +-
 tests/unit/browser/webkit/test_cookies.py                   | 2 +-
 tests/unit/browser/webkit/test_downloads.py                 | 2 +-
 tests/unit/browser/webkit/test_mhtml.py                     | 2 +-
 tests/unit/browser/webkit/test_qt_javascript.py             | 2 +-
 tests/unit/browser/webkit/test_tabhistory.py                | 2 +-
 tests/unit/browser/webkit/test_webkitelem.py                | 2 +-
 tests/unit/commands/test_argparser.py                       | 2 +-
 tests/unit/commands/test_cmdutils.py                        | 2 +-
 tests/unit/commands/test_runners.py                         | 2 +-
 tests/unit/commands/test_userscripts.py                     | 2 +-
 tests/unit/completion/test_completer.py                     | 2 +-
 tests/unit/completion/test_completionmodel.py               | 2 +-
 tests/unit/completion/test_completionwidget.py              | 2 +-
 tests/unit/completion/test_histcategory.py                  | 2 +-
 tests/unit/completion/test_listcategory.py                  | 2 +-
 tests/unit/completion/test_models.py                        | 2 +-
 tests/unit/config/test_config.py                            | 2 +-
 tests/unit/config/test_configcommands.py                    | 2 +-
 tests/unit/config/test_configdata.py                        | 2 +-
 tests/unit/config/test_configexc.py                         | 2 +-
 tests/unit/config/test_configfiles.py                       | 2 +-
 tests/unit/config/test_configinit.py                        | 2 +-
 tests/unit/config/test_configtypes.py                       | 2 +-
 tests/unit/javascript/conftest.py                           | 2 +-
 tests/unit/javascript/position_caret/test_position_caret.py | 2 +-
 tests/unit/javascript/stylesheet/test_stylesheet.py         | 2 +-
 tests/unit/javascript/test_greasemonkey.py                  | 2 +-
 tests/unit/keyinput/conftest.py                             | 2 +-
 tests/unit/keyinput/test_basekeyparser.py                   | 2 +-
 tests/unit/keyinput/test_modeman.py                         | 2 +-
 tests/unit/keyinput/test_modeparsers.py                     | 2 +-
 tests/unit/mainwindow/statusbar/test_backforward.py         | 2 +-
 tests/unit/mainwindow/statusbar/test_percentage.py          | 2 +-
 tests/unit/mainwindow/statusbar/test_progress.py            | 2 +-
 tests/unit/mainwindow/statusbar/test_tabindex.py            | 2 +-
 tests/unit/mainwindow/statusbar/test_textbase.py            | 2 +-
 tests/unit/mainwindow/statusbar/test_url.py                 | 2 +-
 tests/unit/mainwindow/test_messageview.py                   | 2 +-
 tests/unit/mainwindow/test_prompt.py                        | 2 +-
 tests/unit/mainwindow/test_tabwidget.py                     | 2 +-
 tests/unit/misc/test_autoupdate.py                          | 2 +-
 tests/unit/misc/test_checkpyver.py                          | 2 +-
 tests/unit/misc/test_cmdhistory.py                          | 4 ++--
 tests/unit/misc/test_crashdialog.py                         | 2 +-
 tests/unit/misc/test_earlyinit.py                           | 2 +-
 tests/unit/misc/test_editor.py                              | 2 +-
 tests/unit/misc/test_guiprocess.py                          | 2 +-
 tests/unit/misc/test_ipc.py                                 | 2 +-
 tests/unit/misc/test_keyhints.py                            | 2 +-
 tests/unit/misc/test_lineparser.py                          | 2 +-
 tests/unit/misc/test_miscwidgets.py                         | 2 +-
 tests/unit/misc/test_msgbox.py                              | 2 +-
 tests/unit/misc/test_objects.py                             | 2 +-
 tests/unit/misc/test_pastebin.py                            | 2 +-
 tests/unit/misc/test_readline.py                            | 2 +-
 tests/unit/misc/test_sessions.py                            | 2 +-
 tests/unit/misc/test_split.py                               | 2 +-
 tests/unit/misc/test_split_hypothesis.py                    | 2 +-
 tests/unit/misc/test_sql.py                                 | 2 +-
 tests/unit/misc/test_utilcmds.py                            | 2 +-
 tests/unit/scripts/test_check_coverage.py                   | 2 +-
 tests/unit/scripts/test_dictcli.py                          | 2 +-
 tests/unit/scripts/test_importer.py                         | 2 +-
 tests/unit/scripts/test_run_vulture.py                      | 2 +-
 tests/unit/test_app.py                                      | 2 +-
 tests/unit/utils/overflow_test_cases.py                     | 2 +-
 tests/unit/utils/test_debug.py                              | 2 +-
 tests/unit/utils/test_error.py                              | 2 +-
 tests/unit/utils/test_javascript.py                         | 2 +-
 tests/unit/utils/test_jinja.py                              | 2 +-
 tests/unit/utils/test_log.py                                | 2 +-
 tests/unit/utils/test_qtutils.py                            | 2 +-
 tests/unit/utils/test_standarddir.py                        | 2 +-
 tests/unit/utils/test_urlutils.py                           | 2 +-
 tests/unit/utils/test_utils.py                              | 2 +-
 tests/unit/utils/test_version.py                            | 2 +-
 tests/unit/utils/usertypes/test_misc.py                     | 2 +-
 tests/unit/utils/usertypes/test_neighborlist.py             | 2 +-
 tests/unit/utils/usertypes/test_question.py                 | 2 +-
 tests/unit/utils/usertypes/test_timer.py                    | 2 +-
 332 files changed, 340 insertions(+), 340 deletions(-)

diff --git a/qutebrowser.py b/qutebrowser.py
index a16bd9ac7..8dd81b01a 100755
--- a/qutebrowser.py
+++ b/qutebrowser.py
@@ -2,7 +2,7 @@
 
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/__init__.py b/qutebrowser/__init__.py
index bcca15b4e..72afa0d5d 100644
--- a/qutebrowser/__init__.py
+++ b/qutebrowser/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/__main__.py b/qutebrowser/__main__.py
index 506039890..533cf6e67 100644
--- a/qutebrowser/__main__.py
+++ b/qutebrowser/__main__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index e3d06391d..c87201931 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/__init__.py b/qutebrowser/browser/__init__.py
index c5d5e6c92..b565801d3 100644
--- a/qutebrowser/browser/__init__.py
+++ b/qutebrowser/browser/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/adblock.py b/qutebrowser/browser/adblock.py
index 623d15717..fa35684b9 100644
--- a/qutebrowser/browser/adblock.py
+++ b/qutebrowser/browser/adblock.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 11ba7bc00..1a514f4a3 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index a0c5e63ff..0ebcf3240 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index c064d700e..12c96db7e 100644
--- a/qutebrowser/browser/downloads.py
+++ b/qutebrowser/browser/downloads.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/downloadview.py b/qutebrowser/browser/downloadview.py
index ac44d75d9..80da117d2 100644
--- a/qutebrowser/browser/downloadview.py
+++ b/qutebrowser/browser/downloadview.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index ba2879848..fb064f6c1 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py
index 14cc2b574..3e0eddbeb 100644
--- a/qutebrowser/browser/hints.py
+++ b/qutebrowser/browser/hints.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py
index 995fb591d..85922f9e8 100644
--- a/qutebrowser/browser/history.py
+++ b/qutebrowser/browser/history.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/inspector.py b/qutebrowser/browser/inspector.py
index 9c583f4b3..608404eeb 100644
--- a/qutebrowser/browser/inspector.py
+++ b/qutebrowser/browser/inspector.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/mouse.py b/qutebrowser/browser/mouse.py
index d08f191a8..b0053cbf1 100644
--- a/qutebrowser/browser/mouse.py
+++ b/qutebrowser/browser/mouse.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/navigate.py b/qutebrowser/browser/navigate.py
index 8b406368b..257ce6fe0 100644
--- a/qutebrowser/browser/navigate.py
+++ b/qutebrowser/browser/navigate.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/network/pac.py b/qutebrowser/browser/network/pac.py
index a3f0813c8..95ff99390 100644
--- a/qutebrowser/browser/network/pac.py
+++ b/qutebrowser/browser/network/pac.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/network/proxy.py b/qutebrowser/browser/network/proxy.py
index 9a4999ef2..96be78742 100644
--- a/qutebrowser/browser/network/proxy.py
+++ b/qutebrowser/browser/network/proxy.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/pdfjs.py b/qutebrowser/browser/pdfjs.py
index cd5bcac0a..5ce3d866e 100644
--- a/qutebrowser/browser/pdfjs.py
+++ b/qutebrowser/browser/pdfjs.py
@@ -1,7 +1,7 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
 # Copyright 2015 Daniel Schadt
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/qtnetworkdownloads.py b/qutebrowser/browser/qtnetworkdownloads.py
index 378bc72b5..7a8c5aa64 100644
--- a/qutebrowser/browser/qtnetworkdownloads.py
+++ b/qutebrowser/browser/qtnetworkdownloads.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 08122958a..320e7873a 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/shared.py b/qutebrowser/browser/shared.py
index b6bfefe7b..2a374906d 100644
--- a/qutebrowser/browser/shared.py
+++ b/qutebrowser/browser/shared.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/signalfilter.py b/qutebrowser/browser/signalfilter.py
index 90b85c586..663aa67e7 100644
--- a/qutebrowser/browser/signalfilter.py
+++ b/qutebrowser/browser/signalfilter.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/urlmarks.py b/qutebrowser/browser/urlmarks.py
index 5e2c60dfb..2d357a8e8 100644
--- a/qutebrowser/browser/urlmarks.py
+++ b/qutebrowser/browser/urlmarks.py
@@ -1,7 +1,7 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
-# Copyright 2015-2017 Antoni Boucher <bouanto@zoho.com>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Antoni Boucher <bouanto@zoho.com>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webelem.py b/qutebrowser/browser/webelem.py
index 30355ad1a..122e7d031 100644
--- a/qutebrowser/browser/webelem.py
+++ b/qutebrowser/browser/webelem.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/__init__.py b/qutebrowser/browser/webengine/__init__.py
index 60d140540..2649645d3 100644
--- a/qutebrowser/browser/webengine/__init__.py
+++ b/qutebrowser/browser/webengine/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/certificateerror.py b/qutebrowser/browser/webengine/certificateerror.py
index c97e51b81..47953d4cc 100644
--- a/qutebrowser/browser/webengine/certificateerror.py
+++ b/qutebrowser/browser/webengine/certificateerror.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/interceptor.py b/qutebrowser/browser/webengine/interceptor.py
index e34718791..480e8ee85 100644
--- a/qutebrowser/browser/webengine/interceptor.py
+++ b/qutebrowser/browser/webengine/interceptor.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/spell.py b/qutebrowser/browser/webengine/spell.py
index 9166180d4..beebe4da7 100644
--- a/qutebrowser/browser/webengine/spell.py
+++ b/qutebrowser/browser/webengine/spell.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Michal Siedlaczek <michal.siedlaczek@gmail.com>
+# Copyright 2017-2018 Michal Siedlaczek <michal.siedlaczek@gmail.com>
 
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/tabhistory.py b/qutebrowser/browser/webengine/tabhistory.py
index 5db6faeb1..81f0a3afd 100644
--- a/qutebrowser/browser/webengine/tabhistory.py
+++ b/qutebrowser/browser/webengine/tabhistory.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/webenginedownloads.py b/qutebrowser/browser/webengine/webenginedownloads.py
index d467724d5..fac04686a 100644
--- a/qutebrowser/browser/webengine/webenginedownloads.py
+++ b/qutebrowser/browser/webengine/webenginedownloads.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/webengineelem.py b/qutebrowser/browser/webengine/webengineelem.py
index d6d74ebe4..127b71cf0 100644
--- a/qutebrowser/browser/webengine/webengineelem.py
+++ b/qutebrowser/browser/webengine/webengineelem.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/webengineinspector.py b/qutebrowser/browser/webengine/webengineinspector.py
index 8fa8bcb2d..b2a6ebb1e 100644
--- a/qutebrowser/browser/webengine/webengineinspector.py
+++ b/qutebrowser/browser/webengine/webengineinspector.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/webenginequtescheme.py b/qutebrowser/browser/webengine/webenginequtescheme.py
index 2e9aedd3e..ac583a671 100644
--- a/qutebrowser/browser/webengine/webenginequtescheme.py
+++ b/qutebrowser/browser/webengine/webenginequtescheme.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
index f8b54e065..607499401 100644
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 13ceb7fd1..ecbe81922 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/webview.py b/qutebrowser/browser/webengine/webview.py
index b313fc36c..1b3c15f9e 100644
--- a/qutebrowser/browser/webengine/webview.py
+++ b/qutebrowser/browser/webengine/webview.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/__init__.py b/qutebrowser/browser/webkit/__init__.py
index 93b53cdba..5100b7a53 100644
--- a/qutebrowser/browser/webkit/__init__.py
+++ b/qutebrowser/browser/webkit/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/cache.py b/qutebrowser/browser/webkit/cache.py
index 998545509..163612ce9 100644
--- a/qutebrowser/browser/webkit/cache.py
+++ b/qutebrowser/browser/webkit/cache.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/certificateerror.py b/qutebrowser/browser/webkit/certificateerror.py
index 23353f268..cad17fba5 100644
--- a/qutebrowser/browser/webkit/certificateerror.py
+++ b/qutebrowser/browser/webkit/certificateerror.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/cookies.py b/qutebrowser/browser/webkit/cookies.py
index f08e2e546..01b6842a0 100644
--- a/qutebrowser/browser/webkit/cookies.py
+++ b/qutebrowser/browser/webkit/cookies.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/http.py b/qutebrowser/browser/webkit/http.py
index 8997f4b0c..73e620015 100644
--- a/qutebrowser/browser/webkit/http.py
+++ b/qutebrowser/browser/webkit/http.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/mhtml.py b/qutebrowser/browser/webkit/mhtml.py
index 67c8a5b7a..ca807f705 100644
--- a/qutebrowser/browser/webkit/mhtml.py
+++ b/qutebrowser/browser/webkit/mhtml.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Daniel Schadt
+# Copyright 2015-2018 Daniel Schadt
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/network/filescheme.py b/qutebrowser/browser/webkit/network/filescheme.py
index a971e3257..d8c2c36b8 100644
--- a/qutebrowser/browser/webkit/network/filescheme.py
+++ b/qutebrowser/browser/webkit/network/filescheme.py
@@ -1,7 +1,7 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
-# Copyright 2015-2017 Antoni Boucher (antoyo) <bouanto@zoho.com>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Antoni Boucher (antoyo) <bouanto@zoho.com>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py
index a19687eb1..cb70e62fa 100644
--- a/qutebrowser/browser/webkit/network/networkmanager.py
+++ b/qutebrowser/browser/webkit/network/networkmanager.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/network/networkreply.py b/qutebrowser/browser/webkit/network/networkreply.py
index 22263c96b..dc6bed5ed 100644
--- a/qutebrowser/browser/webkit/network/networkreply.py
+++ b/qutebrowser/browser/webkit/network/networkreply.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # Based on the Eric5 helpviewer,
 # Copyright (c) 2009 - 2014 Detlev Offenbach <detlev@die-offenbachs.de>
diff --git a/qutebrowser/browser/webkit/network/schemehandler.py b/qutebrowser/browser/webkit/network/schemehandler.py
index c6337efa3..c50194172 100644
--- a/qutebrowser/browser/webkit/network/schemehandler.py
+++ b/qutebrowser/browser/webkit/network/schemehandler.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # Based on the Eric5 helpviewer,
 # Copyright (c) 2009 - 2014 Detlev Offenbach <detlev@die-offenbachs.de>
diff --git a/qutebrowser/browser/webkit/network/webkitqutescheme.py b/qutebrowser/browser/webkit/network/webkitqutescheme.py
index 5413a4a8d..2ed8d5aa1 100644
--- a/qutebrowser/browser/webkit/network/webkitqutescheme.py
+++ b/qutebrowser/browser/webkit/network/webkitqutescheme.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/rfc6266.py b/qutebrowser/browser/webkit/rfc6266.py
index f83413ee2..139b4f9df 100644
--- a/qutebrowser/browser/webkit/rfc6266.py
+++ b/qutebrowser/browser/webkit/rfc6266.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/tabhistory.py b/qutebrowser/browser/webkit/tabhistory.py
index d595a6e95..263bf6334 100644
--- a/qutebrowser/browser/webkit/tabhistory.py
+++ b/qutebrowser/browser/webkit/tabhistory.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/webkitelem.py b/qutebrowser/browser/webkit/webkitelem.py
index 829052798..a7d4f4b3e 100644
--- a/qutebrowser/browser/webkit/webkitelem.py
+++ b/qutebrowser/browser/webkit/webkitelem.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/webkithistory.py b/qutebrowser/browser/webkit/webkithistory.py
index 0edbb3fa3..2c719acd6 100644
--- a/qutebrowser/browser/webkit/webkithistory.py
+++ b/qutebrowser/browser/webkit/webkithistory.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/webkitinspector.py b/qutebrowser/browser/webkit/webkitinspector.py
index 957d1b4d2..3098ab5af 100644
--- a/qutebrowser/browser/webkit/webkitinspector.py
+++ b/qutebrowser/browser/webkit/webkitinspector.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/webkitsettings.py b/qutebrowser/browser/webkit/webkitsettings.py
index 3354a9486..ee01c40db 100644
--- a/qutebrowser/browser/webkit/webkitsettings.py
+++ b/qutebrowser/browser/webkit/webkitsettings.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 93d5ee3f7..4ad177a2a 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index 89407fcdf..5c2bb4111 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/webview.py b/qutebrowser/browser/webkit/webview.py
index 4f1ff10c8..942e7265c 100644
--- a/qutebrowser/browser/webkit/webview.py
+++ b/qutebrowser/browser/webkit/webview.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/commands/__init__.py b/qutebrowser/commands/__init__.py
index 7bc59ae40..0bbc9852b 100644
--- a/qutebrowser/commands/__init__.py
+++ b/qutebrowser/commands/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/commands/argparser.py b/qutebrowser/commands/argparser.py
index 9dfe841ce..707324ede 100644
--- a/qutebrowser/commands/argparser.py
+++ b/qutebrowser/commands/argparser.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/commands/cmdexc.py b/qutebrowser/commands/cmdexc.py
index bca2f0500..5d3ac2a89 100644
--- a/qutebrowser/commands/cmdexc.py
+++ b/qutebrowser/commands/cmdexc.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/commands/cmdutils.py b/qutebrowser/commands/cmdutils.py
index 2f7af2f9f..d261e5e86 100644
--- a/qutebrowser/commands/cmdutils.py
+++ b/qutebrowser/commands/cmdutils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/commands/command.py b/qutebrowser/commands/command.py
index dd9a63101..fd3fcf20a 100644
--- a/qutebrowser/commands/command.py
+++ b/qutebrowser/commands/command.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/commands/runners.py b/qutebrowser/commands/runners.py
index 890a0275e..9fe53f07a 100644
--- a/qutebrowser/commands/runners.py
+++ b/qutebrowser/commands/runners.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/commands/userscripts.py b/qutebrowser/commands/userscripts.py
index d86cb8ccf..65930182f 100644
--- a/qutebrowser/commands/userscripts.py
+++ b/qutebrowser/commands/userscripts.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/__init__.py b/qutebrowser/completion/__init__.py
index 8b8b9d88d..2c9121699 100644
--- a/qutebrowser/completion/__init__.py
+++ b/qutebrowser/completion/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/completer.py b/qutebrowser/completion/completer.py
index 4e187750d..09b80ed12 100644
--- a/qutebrowser/completion/completer.py
+++ b/qutebrowser/completion/completer.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/completiondelegate.py b/qutebrowser/completion/completiondelegate.py
index ab98eccef..779906a83 100644
--- a/qutebrowser/completion/completiondelegate.py
+++ b/qutebrowser/completion/completiondelegate.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/completionwidget.py b/qutebrowser/completion/completionwidget.py
index 29f4f6653..740be75d9 100644
--- a/qutebrowser/completion/completionwidget.py
+++ b/qutebrowser/completion/completionwidget.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/models/__init__.py b/qutebrowser/completion/models/__init__.py
index 5812545eb..7f62829ba 100644
--- a/qutebrowser/completion/models/__init__.py
+++ b/qutebrowser/completion/models/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/models/completionmodel.py b/qutebrowser/completion/models/completionmodel.py
index aa4422d83..1c77e1d31 100644
--- a/qutebrowser/completion/models/completionmodel.py
+++ b/qutebrowser/completion/models/completionmodel.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2017-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/models/configmodel.py b/qutebrowser/completion/models/configmodel.py
index 445a57a66..c433dbc12 100644
--- a/qutebrowser/completion/models/configmodel.py
+++ b/qutebrowser/completion/models/configmodel.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/models/histcategory.py b/qutebrowser/completion/models/histcategory.py
index 57a2aa936..a07f78143 100644
--- a/qutebrowser/completion/models/histcategory.py
+++ b/qutebrowser/completion/models/histcategory.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2017-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/models/listcategory.py b/qutebrowser/completion/models/listcategory.py
index 657ae97aa..13bc1e6b2 100644
--- a/qutebrowser/completion/models/listcategory.py
+++ b/qutebrowser/completion/models/listcategory.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2017-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/models/miscmodels.py b/qutebrowser/completion/models/miscmodels.py
index 22c9000c3..049d89295 100644
--- a/qutebrowser/completion/models/miscmodels.py
+++ b/qutebrowser/completion/models/miscmodels.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/models/urlmodel.py b/qutebrowser/completion/models/urlmodel.py
index 1d7a075eb..bebf6d829 100644
--- a/qutebrowser/completion/models/urlmodel.py
+++ b/qutebrowser/completion/models/urlmodel.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/models/util.py b/qutebrowser/completion/models/util.py
index 40d5de8dc..c1b8b56f9 100644
--- a/qutebrowser/completion/models/util.py
+++ b/qutebrowser/completion/models/util.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2017-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/config/__init__.py b/qutebrowser/config/__init__.py
index bf0bce0ec..e2c25cce8 100644
--- a/qutebrowser/config/__init__.py
+++ b/qutebrowser/config/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index c170d0705..f30acb8ca 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py
index 93a1f7ce0..a3a7d298a 100644
--- a/qutebrowser/config/configcommands.py
+++ b/qutebrowser/config/configcommands.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py
index b265ab8fc..bcad53e00 100644
--- a/qutebrowser/config/configdata.py
+++ b/qutebrowser/config/configdata.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/config/configdiff.py b/qutebrowser/config/configdiff.py
index 020be2c8c..9f8b70a26 100644
--- a/qutebrowser/config/configdiff.py
+++ b/qutebrowser/config/configdiff.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/config/configexc.py b/qutebrowser/config/configexc.py
index 28b269dd5..0a4986efa 100644
--- a/qutebrowser/config/configexc.py
+++ b/qutebrowser/config/configexc.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 0e9572f55..8a5cb6697 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/config/configinit.py b/qutebrowser/config/configinit.py
index 510245e2e..c7c9362b0 100644
--- a/qutebrowser/config/configinit.py
+++ b/qutebrowser/config/configinit.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/config/configtypes.py b/qutebrowser/config/configtypes.py
index 71c32f59e..26998d510 100644
--- a/qutebrowser/config/configtypes.py
+++ b/qutebrowser/config/configtypes.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py
index 0e57af45f..fa8abb76f 100644
--- a/qutebrowser/config/websettings.py
+++ b/qutebrowser/config/websettings.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/keyinput/__init__.py b/qutebrowser/keyinput/__init__.py
index c6b95b8a9..1cff4943b 100644
--- a/qutebrowser/keyinput/__init__.py
+++ b/qutebrowser/keyinput/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/keyinput/basekeyparser.py b/qutebrowser/keyinput/basekeyparser.py
index b435ac52c..89120f922 100644
--- a/qutebrowser/keyinput/basekeyparser.py
+++ b/qutebrowser/keyinput/basekeyparser.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/keyinput/keyparser.py b/qutebrowser/keyinput/keyparser.py
index 8fcb53035..8ae27412e 100644
--- a/qutebrowser/keyinput/keyparser.py
+++ b/qutebrowser/keyinput/keyparser.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/keyinput/macros.py b/qutebrowser/keyinput/macros.py
index 9e3667590..08740d80d 100644
--- a/qutebrowser/keyinput/macros.py
+++ b/qutebrowser/keyinput/macros.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Jan Verbeek (blyxxyz) <ring@openmailbox.org>
+# Copyright 2016-2018 Jan Verbeek (blyxxyz) <ring@openmailbox.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py
index 78b313450..e32830f50 100644
--- a/qutebrowser/keyinput/modeman.py
+++ b/qutebrowser/keyinput/modeman.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/keyinput/modeparsers.py b/qutebrowser/keyinput/modeparsers.py
index 7c2088133..b739d38a1 100644
--- a/qutebrowser/keyinput/modeparsers.py
+++ b/qutebrowser/keyinput/modeparsers.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/__init__.py b/qutebrowser/mainwindow/__init__.py
index 43eb563a9..1b76e9b5a 100644
--- a/qutebrowser/mainwindow/__init__.py
+++ b/qutebrowser/mainwindow/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index a5faf6dd1..0e6b64936 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/messageview.py b/qutebrowser/mainwindow/messageview.py
index 5e389e23c..43ddd5248 100644
--- a/qutebrowser/mainwindow/messageview.py
+++ b/qutebrowser/mainwindow/messageview.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/prompt.py b/qutebrowser/mainwindow/prompt.py
index 3d21a52e0..df4c45096 100644
--- a/qutebrowser/mainwindow/prompt.py
+++ b/qutebrowser/mainwindow/prompt.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/__init__.py b/qutebrowser/mainwindow/statusbar/__init__.py
index eb3ed7193..eee7cf990 100644
--- a/qutebrowser/mainwindow/statusbar/__init__.py
+++ b/qutebrowser/mainwindow/statusbar/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/backforward.py b/qutebrowser/mainwindow/statusbar/backforward.py
index 3a566e105..b214b894d 100644
--- a/qutebrowser/mainwindow/statusbar/backforward.py
+++ b/qutebrowser/mainwindow/statusbar/backforward.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/bar.py b/qutebrowser/mainwindow/statusbar/bar.py
index ae7a3954d..ae6832eb0 100644
--- a/qutebrowser/mainwindow/statusbar/bar.py
+++ b/qutebrowser/mainwindow/statusbar/bar.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 26ba802c0..5f1451af3 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/keystring.py b/qutebrowser/mainwindow/statusbar/keystring.py
index dd9825ab2..29dd3b790 100644
--- a/qutebrowser/mainwindow/statusbar/keystring.py
+++ b/qutebrowser/mainwindow/statusbar/keystring.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/percentage.py b/qutebrowser/mainwindow/statusbar/percentage.py
index 0d75e8163..a3f30e50d 100644
--- a/qutebrowser/mainwindow/statusbar/percentage.py
+++ b/qutebrowser/mainwindow/statusbar/percentage.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/progress.py b/qutebrowser/mainwindow/statusbar/progress.py
index c8707e0b1..930282771 100644
--- a/qutebrowser/mainwindow/statusbar/progress.py
+++ b/qutebrowser/mainwindow/statusbar/progress.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/tabindex.py b/qutebrowser/mainwindow/statusbar/tabindex.py
index 6a4cc987c..47a775f34 100644
--- a/qutebrowser/mainwindow/statusbar/tabindex.py
+++ b/qutebrowser/mainwindow/statusbar/tabindex.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/text.py b/qutebrowser/mainwindow/statusbar/text.py
index b232cedc8..0a57446f1 100644
--- a/qutebrowser/mainwindow/statusbar/text.py
+++ b/qutebrowser/mainwindow/statusbar/text.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/textbase.py b/qutebrowser/mainwindow/statusbar/textbase.py
index 0ae271191..5c157e52a 100644
--- a/qutebrowser/mainwindow/statusbar/textbase.py
+++ b/qutebrowser/mainwindow/statusbar/textbase.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/url.py b/qutebrowser/mainwindow/statusbar/url.py
index a91c67550..f24e79834 100644
--- a/qutebrowser/mainwindow/statusbar/url.py
+++ b/qutebrowser/mainwindow/statusbar/url.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index d8056d853..824abf25b 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py
index ac3a34581..da1f2624b 100644
--- a/qutebrowser/mainwindow/tabwidget.py
+++ b/qutebrowser/mainwindow/tabwidget.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/__init__.py b/qutebrowser/misc/__init__.py
index 03ad27aa8..2be43490a 100644
--- a/qutebrowser/misc/__init__.py
+++ b/qutebrowser/misc/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/autoupdate.py b/qutebrowser/misc/autoupdate.py
index 15a3b6670..d056d61b6 100644
--- a/qutebrowser/misc/autoupdate.py
+++ b/qutebrowser/misc/autoupdate.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/backendproblem.py b/qutebrowser/misc/backendproblem.py
index cf1024c57..d6ac36d10 100644
--- a/qutebrowser/misc/backendproblem.py
+++ b/qutebrowser/misc/backendproblem.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/checkpyver.py b/qutebrowser/misc/checkpyver.py
index da71b278d..50330ef88 100644
--- a/qutebrowser/misc/checkpyver.py
+++ b/qutebrowser/misc/checkpyver.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The-Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The-Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/cmdhistory.py b/qutebrowser/misc/cmdhistory.py
index a24f6b816..9fa273c1c 100644
--- a/qutebrowser/misc/cmdhistory.py
+++ b/qutebrowser/misc/cmdhistory.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/consolewidget.py b/qutebrowser/misc/consolewidget.py
index b5ca8dd78..661c7b805 100644
--- a/qutebrowser/misc/consolewidget.py
+++ b/qutebrowser/misc/consolewidget.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/crashdialog.py b/qutebrowser/misc/crashdialog.py
index 9ef0e573c..4d395b8ec 100644
--- a/qutebrowser/misc/crashdialog.py
+++ b/qutebrowser/misc/crashdialog.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/crashsignal.py b/qutebrowser/misc/crashsignal.py
index b8d63ad58..5224c31cc 100644
--- a/qutebrowser/misc/crashsignal.py
+++ b/qutebrowser/misc/crashsignal.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py
index 10530eecf..c78d0848d 100644
--- a/qutebrowser/misc/earlyinit.py
+++ b/qutebrowser/misc/earlyinit.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The-Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The-Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index 553c700e7..6b464724f 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/guiprocess.py b/qutebrowser/misc/guiprocess.py
index 384c3ae30..52dc352a7 100644
--- a/qutebrowser/misc/guiprocess.py
+++ b/qutebrowser/misc/guiprocess.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/httpclient.py b/qutebrowser/misc/httpclient.py
index 4d33d487e..b0b41af76 100644
--- a/qutebrowser/misc/httpclient.py
+++ b/qutebrowser/misc/httpclient.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/ipc.py b/qutebrowser/misc/ipc.py
index c9f982365..8af5ba6bf 100644
--- a/qutebrowser/misc/ipc.py
+++ b/qutebrowser/misc/ipc.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/keyhintwidget.py b/qutebrowser/misc/keyhintwidget.py
index 46d1d3f24..fad58da2d 100644
--- a/qutebrowser/misc/keyhintwidget.py
+++ b/qutebrowser/misc/keyhintwidget.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2016-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/lineparser.py b/qutebrowser/misc/lineparser.py
index 155cbd1b0..6e50edb9b 100644
--- a/qutebrowser/misc/lineparser.py
+++ b/qutebrowser/misc/lineparser.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/miscwidgets.py b/qutebrowser/misc/miscwidgets.py
index 5d3e9b5ca..2e868e27c 100644
--- a/qutebrowser/misc/miscwidgets.py
+++ b/qutebrowser/misc/miscwidgets.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/msgbox.py b/qutebrowser/misc/msgbox.py
index 459ab8b61..053534158 100644
--- a/qutebrowser/misc/msgbox.py
+++ b/qutebrowser/misc/msgbox.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/objects.py b/qutebrowser/misc/objects.py
index 60d764620..d6c116eab 100644
--- a/qutebrowser/misc/objects.py
+++ b/qutebrowser/misc/objects.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/pastebin.py b/qutebrowser/misc/pastebin.py
index 9609481b6..d022fc526 100644
--- a/qutebrowser/misc/pastebin.py
+++ b/qutebrowser/misc/pastebin.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/readline.py b/qutebrowser/misc/readline.py
index 51ce6bb94..3846b77e0 100644
--- a/qutebrowser/misc/readline.py
+++ b/qutebrowser/misc/readline.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/savemanager.py b/qutebrowser/misc/savemanager.py
index 436e3b66f..0d79c97db 100644
--- a/qutebrowser/misc/savemanager.py
+++ b/qutebrowser/misc/savemanager.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index d18cebf32..a8a652dbb 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/split.py b/qutebrowser/misc/split.py
index 2ae8b3792..31738fbcc 100644
--- a/qutebrowser/misc/split.py
+++ b/qutebrowser/misc/split.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/sql.py b/qutebrowser/misc/sql.py
index 65a93a461..9b09fb132 100644
--- a/qutebrowser/misc/sql.py
+++ b/qutebrowser/misc/sql.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2016-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/utilcmds.py b/qutebrowser/misc/utilcmds.py
index 4054f85bb..c0d83b7eb 100644
--- a/qutebrowser/misc/utilcmds.py
+++ b/qutebrowser/misc/utilcmds.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/qutebrowser.py b/qutebrowser/qutebrowser.py
index fc113a5d4..815ffd5a7 100644
--- a/qutebrowser/qutebrowser.py
+++ b/qutebrowser/qutebrowser.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/__init__.py b/qutebrowser/utils/__init__.py
index c28a40b10..16069f3ae 100644
--- a/qutebrowser/utils/__init__.py
+++ b/qutebrowser/utils/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/debug.py b/qutebrowser/utils/debug.py
index 813b02e7a..06bdd2909 100644
--- a/qutebrowser/utils/debug.py
+++ b/qutebrowser/utils/debug.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/docutils.py b/qutebrowser/utils/docutils.py
index e54effe8d..9ae2039ac 100644
--- a/qutebrowser/utils/docutils.py
+++ b/qutebrowser/utils/docutils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/error.py b/qutebrowser/utils/error.py
index 0d045bf19..b9abcdfe1 100644
--- a/qutebrowser/utils/error.py
+++ b/qutebrowser/utils/error.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/javascript.py b/qutebrowser/utils/javascript.py
index f536fed1f..335b1b983 100644
--- a/qutebrowser/utils/javascript.py
+++ b/qutebrowser/utils/javascript.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/jinja.py b/qutebrowser/utils/jinja.py
index 802fc5fff..d4ce3368f 100644
--- a/qutebrowser/utils/jinja.py
+++ b/qutebrowser/utils/jinja.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/log.py b/qutebrowser/utils/log.py
index 1a65b6eb8..d6cae1312 100644
--- a/qutebrowser/utils/log.py
+++ b/qutebrowser/utils/log.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/message.py b/qutebrowser/utils/message.py
index 32395b8bd..49fb021a4 100644
--- a/qutebrowser/utils/message.py
+++ b/qutebrowser/utils/message.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/objreg.py b/qutebrowser/utils/objreg.py
index f65e4efab..8d44a9eb5 100644
--- a/qutebrowser/utils/objreg.py
+++ b/qutebrowser/utils/objreg.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/qtutils.py b/qutebrowser/utils/qtutils.py
index 87978274f..8a42fb073 100644
--- a/qutebrowser/utils/qtutils.py
+++ b/qutebrowser/utils/qtutils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/standarddir.py b/qutebrowser/utils/standarddir.py
index 64f7eb9a8..40f1fa966 100644
--- a/qutebrowser/utils/standarddir.py
+++ b/qutebrowser/utils/standarddir.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py
index 0cbe6d88e..2ed466dd1 100644
--- a/qutebrowser/utils/urlutils.py
+++ b/qutebrowser/utils/urlutils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/usertypes.py b/qutebrowser/utils/usertypes.py
index aad685d07..dc57e708c 100644
--- a/qutebrowser/utils/usertypes.py
+++ b/qutebrowser/utils/usertypes.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index f29db578e..079866920 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index 624197bdd..aff7ed07b 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/asciidoc2html.py b/scripts/asciidoc2html.py
index 01af53693..1827dc2a3 100755
--- a/scripts/asciidoc2html.py
+++ b/scripts/asciidoc2html.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/build_release.py b/scripts/dev/build_release.py
index aa4046adc..eba7610af 100755
--- a/scripts/dev/build_release.py
+++ b/scripts/dev/build_release.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/check_coverage.py b/scripts/dev/check_coverage.py
index 8ec4f80f7..45ad534e1 100644
--- a/scripts/dev/check_coverage.py
+++ b/scripts/dev/check_coverage.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/check_doc_changes.py b/scripts/dev/check_doc_changes.py
index 1cc2a90f9..3d90bea5e 100755
--- a/scripts/dev/check_doc_changes.py
+++ b/scripts/dev/check_doc_changes.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/cleanup.py b/scripts/dev/cleanup.py
index 086b210ab..d1bb84a2f 100755
--- a/scripts/dev/cleanup.py
+++ b/scripts/dev/cleanup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/get_coredumpctl_traces.py b/scripts/dev/get_coredumpctl_traces.py
index 3935abdc8..d286d381e 100644
--- a/scripts/dev/get_coredumpctl_traces.py
+++ b/scripts/dev/get_coredumpctl_traces.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/misc_checks.py b/scripts/dev/misc_checks.py
index ff372a7ae..299246448 100644
--- a/scripts/dev/misc_checks.py
+++ b/scripts/dev/misc_checks.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/pylint_checkers/qute_pylint/config.py b/scripts/dev/pylint_checkers/qute_pylint/config.py
index da7fbf32f..5aa52502f 100644
--- a/scripts/dev/pylint_checkers/qute_pylint/config.py
+++ b/scripts/dev/pylint_checkers/qute_pylint/config.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/pylint_checkers/qute_pylint/modeline.py b/scripts/dev/pylint_checkers/qute_pylint/modeline.py
index ee3de13c9..429974cb9 100644
--- a/scripts/dev/pylint_checkers/qute_pylint/modeline.py
+++ b/scripts/dev/pylint_checkers/qute_pylint/modeline.py
@@ -1,4 +1,4 @@
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
 # This file is part of qutebrowser.
diff --git a/scripts/dev/pylint_checkers/qute_pylint/openencoding.py b/scripts/dev/pylint_checkers/qute_pylint/openencoding.py
index eccc152ba..f577011ca 100644
--- a/scripts/dev/pylint_checkers/qute_pylint/openencoding.py
+++ b/scripts/dev/pylint_checkers/qute_pylint/openencoding.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/pylint_checkers/qute_pylint/settrace.py b/scripts/dev/pylint_checkers/qute_pylint/settrace.py
index 2bfa9f06f..c82d646aa 100644
--- a/scripts/dev/pylint_checkers/qute_pylint/settrace.py
+++ b/scripts/dev/pylint_checkers/qute_pylint/settrace.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/pylint_checkers/setup.py b/scripts/dev/pylint_checkers/setup.py
index 960fdd2b7..7833c7dbd 100644
--- a/scripts/dev/pylint_checkers/setup.py
+++ b/scripts/dev/pylint_checkers/setup.py
@@ -2,7 +2,7 @@
 
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/recompile_requirements.py b/scripts/dev/recompile_requirements.py
index 191f52031..6e26145e9 100644
--- a/scripts/dev/recompile_requirements.py
+++ b/scripts/dev/recompile_requirements.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/run_profile.py b/scripts/dev/run_profile.py
index 2247bd842..93e0b611c 100755
--- a/scripts/dev/run_profile.py
+++ b/scripts/dev/run_profile.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/run_pylint_on_tests.py b/scripts/dev/run_pylint_on_tests.py
index 3dba0318d..7adf45f76 100644
--- a/scripts/dev/run_pylint_on_tests.py
+++ b/scripts/dev/run_pylint_on_tests.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/run_vulture.py b/scripts/dev/run_vulture.py
index 2bc7283d0..cb19d6211 100755
--- a/scripts/dev/run_vulture.py
+++ b/scripts/dev/run_vulture.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/segfault_test.py b/scripts/dev/segfault_test.py
index efd60c232..aaf495fc1 100755
--- a/scripts/dev/segfault_test.py
+++ b/scripts/dev/segfault_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/src2asciidoc.py b/scripts/dev/src2asciidoc.py
index 5dc3d05ac..6307e3a5c 100755
--- a/scripts/dev/src2asciidoc.py
+++ b/scripts/dev/src2asciidoc.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/standardpaths_tester.py b/scripts/dev/standardpaths_tester.py
index 1cf2fbe4f..27b8382e6 100644
--- a/scripts/dev/standardpaths_tester.py
+++ b/scripts/dev/standardpaths_tester.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/ua_fetch.py b/scripts/dev/ua_fetch.py
index b276eff27..75ce4c2f7 100755
--- a/scripts/dev/ua_fetch.py
+++ b/scripts/dev/ua_fetch.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 lamarpavel
-# Copyright 2015-2017 Alexey Nabrodov (Averrin)
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 lamarpavel
+# Copyright 2015-2018 Alexey Nabrodov (Averrin)
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/update_3rdparty.py b/scripts/dev/update_3rdparty.py
index 9c67db107..c40015d22 100755
--- a/scripts/dev/update_3rdparty.py
+++ b/scripts/dev/update_3rdparty.py
@@ -2,7 +2,7 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
 # Copyright 2015 Daniel Schadt
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dictcli.py b/scripts/dictcli.py
index 796544365..12c80b72d 100755
--- a/scripts/dictcli.py
+++ b/scripts/dictcli.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Michal Siedlaczek <michal.siedlaczek@gmail.com>
+# Copyright 2017-2018 Michal Siedlaczek <michal.siedlaczek@gmail.com>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/hist_importer.py b/scripts/hist_importer.py
index c7c49c200..914701a19 100755
--- a/scripts/hist_importer.py
+++ b/scripts/hist_importer.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
-# Copyright 2017 Josefson Souza <josefson.br@gmail.com>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Josefson Souza <josefson.br@gmail.com>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/importer.py b/scripts/importer.py
index d81ace0d0..eb808a615 100755
--- a/scripts/importer.py
+++ b/scripts/importer.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Claude (longneck) <longneck@scratchbook.ch>
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Claude (longneck) <longneck@scratchbook.ch>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/keytester.py b/scripts/keytester.py
index b147599b6..80260f6bf 100644
--- a/scripts/keytester.py
+++ b/scripts/keytester.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/link_pyqt.py b/scripts/link_pyqt.py
index 02f979137..e29a69c3a 100644
--- a/scripts/link_pyqt.py
+++ b/scripts/link_pyqt.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/setupcommon.py b/scripts/setupcommon.py
index 1832ead86..50eabacd0 100644
--- a/scripts/setupcommon.py
+++ b/scripts/setupcommon.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/testbrowser/testbrowser_webengine.py b/scripts/testbrowser/testbrowser_webengine.py
index e6353dc23..fdf67286c 100755
--- a/scripts/testbrowser/testbrowser_webengine.py
+++ b/scripts/testbrowser/testbrowser_webengine.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/testbrowser/testbrowser_webkit.py b/scripts/testbrowser/testbrowser_webkit.py
index 7c7081f18..73cae08b1 100755
--- a/scripts/testbrowser/testbrowser_webkit.py
+++ b/scripts/testbrowser/testbrowser_webkit.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/utils.py b/scripts/utils.py
index 6793bb2a7..9a1a751b2 100644
--- a/scripts/utils.py
+++ b/scripts/utils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/conftest.py b/tests/conftest.py
index 42d7e2c81..7d6a0da09 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/conftest.py b/tests/end2end/conftest.py
index 084f5439d..d3d34097b 100644
--- a/tests/end2end/conftest.py
+++ b/tests/end2end/conftest.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/data/misc/pyeval_file.py b/tests/end2end/data/misc/pyeval_file.py
index e8ede9444..1dadc6853 100644
--- a/tests/end2end/data/misc/pyeval_file.py
+++ b/tests/end2end/data/misc/pyeval_file.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/data/userscripts/stdinclose.py b/tests/end2end/data/userscripts/stdinclose.py
index 8862fe7ba..21a7e6ca1 100755
--- a/tests/end2end/data/userscripts/stdinclose.py
+++ b/tests/end2end/data/userscripts/stdinclose.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/conftest.py b/tests/end2end/features/conftest.py
index 228e80f06..4752e2393 100644
--- a/tests/end2end/features/conftest.py
+++ b/tests/end2end/features/conftest.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_backforward_bdd.py b/tests/end2end/features/test_backforward_bdd.py
index 187882b67..6d9ab626e 100644
--- a/tests/end2end/features/test_backforward_bdd.py
+++ b/tests/end2end/features/test_backforward_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_caret_bdd.py b/tests/end2end/features/test_caret_bdd.py
index ec9506859..d444f72b1 100644
--- a/tests/end2end/features/test_caret_bdd.py
+++ b/tests/end2end/features/test_caret_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_completion_bdd.py b/tests/end2end/features/test_completion_bdd.py
index 82e2df030..cd0254a83 100644
--- a/tests/end2end/features/test_completion_bdd.py
+++ b/tests/end2end/features/test_completion_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_downloads_bdd.py b/tests/end2end/features/test_downloads_bdd.py
index 843385a36..4aa58d053 100644
--- a/tests/end2end/features/test_downloads_bdd.py
+++ b/tests/end2end/features/test_downloads_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_editor_bdd.py b/tests/end2end/features/test_editor_bdd.py
index 260197a46..24309d070 100644
--- a/tests/end2end/features/test_editor_bdd.py
+++ b/tests/end2end/features/test_editor_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_hints_bdd.py b/tests/end2end/features/test_hints_bdd.py
index e637fb886..d0f25b16f 100644
--- a/tests/end2end/features/test_hints_bdd.py
+++ b/tests/end2end/features/test_hints_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_history_bdd.py b/tests/end2end/features/test_history_bdd.py
index 8bdd8c396..6efa08330 100644
--- a/tests/end2end/features/test_history_bdd.py
+++ b/tests/end2end/features/test_history_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_invoke_bdd.py b/tests/end2end/features/test_invoke_bdd.py
index 46a6ca637..801de132f 100644
--- a/tests/end2end/features/test_invoke_bdd.py
+++ b/tests/end2end/features/test_invoke_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_javascript_bdd.py b/tests/end2end/features/test_javascript_bdd.py
index 631a422a5..3753d12ad 100644
--- a/tests/end2end/features/test_javascript_bdd.py
+++ b/tests/end2end/features/test_javascript_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_keyinput_bdd.py b/tests/end2end/features/test_keyinput_bdd.py
index ef5be0ee9..67795d437 100644
--- a/tests/end2end/features/test_keyinput_bdd.py
+++ b/tests/end2end/features/test_keyinput_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_marks_bdd.py b/tests/end2end/features/test_marks_bdd.py
index 5d31298ff..4734147af 100644
--- a/tests/end2end/features/test_marks_bdd.py
+++ b/tests/end2end/features/test_marks_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2016-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_misc_bdd.py b/tests/end2end/features/test_misc_bdd.py
index 19d94ce6a..7d3da36eb 100644
--- a/tests/end2end/features/test_misc_bdd.py
+++ b/tests/end2end/features/test_misc_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_navigate_bdd.py b/tests/end2end/features/test_navigate_bdd.py
index 03812df83..a78042f67 100644
--- a/tests/end2end/features/test_navigate_bdd.py
+++ b/tests/end2end/features/test_navigate_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_open_bdd.py b/tests/end2end/features/test_open_bdd.py
index cb2310a07..8081e1fb0 100644
--- a/tests/end2end/features/test_open_bdd.py
+++ b/tests/end2end/features/test_open_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_private_bdd.py b/tests/end2end/features/test_private_bdd.py
index 6e591a2e0..f02602d0f 100644
--- a/tests/end2end/features/test_private_bdd.py
+++ b/tests/end2end/features/test_private_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_prompts_bdd.py b/tests/end2end/features/test_prompts_bdd.py
index 7a95d48c8..12d9cbeec 100644
--- a/tests/end2end/features/test_prompts_bdd.py
+++ b/tests/end2end/features/test_prompts_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_qutescheme_bdd.py b/tests/end2end/features/test_qutescheme_bdd.py
index 1269d10ed..8706a1a9c 100644
--- a/tests/end2end/features/test_qutescheme_bdd.py
+++ b/tests/end2end/features/test_qutescheme_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_scroll_bdd.py b/tests/end2end/features/test_scroll_bdd.py
index 966d5c9bb..99de7e8e6 100644
--- a/tests/end2end/features/test_scroll_bdd.py
+++ b/tests/end2end/features/test_scroll_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_search_bdd.py b/tests/end2end/features/test_search_bdd.py
index 73a4af131..9a4e33208 100644
--- a/tests/end2end/features/test_search_bdd.py
+++ b/tests/end2end/features/test_search_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_sessions_bdd.py b/tests/end2end/features/test_sessions_bdd.py
index b4f5dcf2c..942a16425 100644
--- a/tests/end2end/features/test_sessions_bdd.py
+++ b/tests/end2end/features/test_sessions_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_spawn_bdd.py b/tests/end2end/features/test_spawn_bdd.py
index 432f95a53..d7f72acde 100644
--- a/tests/end2end/features/test_spawn_bdd.py
+++ b/tests/end2end/features/test_spawn_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_tabs_bdd.py b/tests/end2end/features/test_tabs_bdd.py
index e86204ba9..962a41b5b 100644
--- a/tests/end2end/features/test_tabs_bdd.py
+++ b/tests/end2end/features/test_tabs_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_urlmarks_bdd.py b/tests/end2end/features/test_urlmarks_bdd.py
index 554ede3ec..20364cebd 100644
--- a/tests/end2end/features/test_urlmarks_bdd.py
+++ b/tests/end2end/features/test_urlmarks_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_utilcmds_bdd.py b/tests/end2end/features/test_utilcmds_bdd.py
index 01bfb1440..338c500ca 100644
--- a/tests/end2end/features/test_utilcmds_bdd.py
+++ b/tests/end2end/features/test_utilcmds_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_yankpaste_bdd.py b/tests/end2end/features/test_yankpaste_bdd.py
index c891bf7b4..364044085 100644
--- a/tests/end2end/features/test_yankpaste_bdd.py
+++ b/tests/end2end/features/test_yankpaste_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_zoom_bdd.py b/tests/end2end/features/test_zoom_bdd.py
index f16b2d12f..c397fd715 100644
--- a/tests/end2end/features/test_zoom_bdd.py
+++ b/tests/end2end/features/test_zoom_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py
index a2947e5af..c62de1dc9 100644
--- a/tests/end2end/fixtures/quteprocess.py
+++ b/tests/end2end/fixtures/quteprocess.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/fixtures/test_quteprocess.py b/tests/end2end/fixtures/test_quteprocess.py
index aa3fb5857..9aab0aa0f 100644
--- a/tests/end2end/fixtures/test_quteprocess.py
+++ b/tests/end2end/fixtures/test_quteprocess.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/fixtures/test_testprocess.py b/tests/end2end/fixtures/test_testprocess.py
index 6ceb032af..5b9979f85 100644
--- a/tests/end2end/fixtures/test_testprocess.py
+++ b/tests/end2end/fixtures/test_testprocess.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/fixtures/test_webserver.py b/tests/end2end/fixtures/test_webserver.py
index 331c0906d..a59d425e2 100644
--- a/tests/end2end/fixtures/test_webserver.py
+++ b/tests/end2end/fixtures/test_webserver.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/fixtures/testprocess.py b/tests/end2end/fixtures/testprocess.py
index 99ea81337..d0af5bebc 100644
--- a/tests/end2end/fixtures/testprocess.py
+++ b/tests/end2end/fixtures/testprocess.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/fixtures/webserver.py b/tests/end2end/fixtures/webserver.py
index 93ef04f03..2beb6fb95 100644
--- a/tests/end2end/fixtures/webserver.py
+++ b/tests/end2end/fixtures/webserver.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/fixtures/webserver_sub.py b/tests/end2end/fixtures/webserver_sub.py
index 6e0b740ba..4ec4619f7 100644
--- a/tests/end2end/fixtures/webserver_sub.py
+++ b/tests/end2end/fixtures/webserver_sub.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/fixtures/webserver_sub_ssl.py b/tests/end2end/fixtures/webserver_sub_ssl.py
index d8a8f1025..41a9c5ace 100644
--- a/tests/end2end/fixtures/webserver_sub_ssl.py
+++ b/tests/end2end/fixtures/webserver_sub_ssl.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/test_dirbrowser.py b/tests/end2end/test_dirbrowser.py
index ea92e2ca2..3702c4ee7 100644
--- a/tests/end2end/test_dirbrowser.py
+++ b/tests/end2end/test_dirbrowser.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Daniel Schadt
+# Copyright 2015-2018 Daniel Schadt
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/test_hints_html.py b/tests/end2end/test_hints_html.py
index fb30abefe..abc94d70d 100644
--- a/tests/end2end/test_hints_html.py
+++ b/tests/end2end/test_hints_html.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/test_insert_mode.py b/tests/end2end/test_insert_mode.py
index 746fde50f..690b5d38b 100644
--- a/tests/end2end/test_insert_mode.py
+++ b/tests/end2end/test_insert_mode.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/test_invocations.py b/tests/end2end/test_invocations.py
index ef4808718..4cc8f1b59 100644
--- a/tests/end2end/test_invocations.py
+++ b/tests/end2end/test_invocations.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/test_mhtml_e2e.py b/tests/end2end/test_mhtml_e2e.py
index 012c2ea2a..78cc9eb81 100644
--- a/tests/end2end/test_mhtml_e2e.py
+++ b/tests/end2end/test_mhtml_e2e.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/helpers/fixtures.py b/tests/helpers/fixtures.py
index 715e0168d..686db4125 100644
--- a/tests/helpers/fixtures.py
+++ b/tests/helpers/fixtures.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/helpers/logfail.py b/tests/helpers/logfail.py
index ba7ed24b8..8eee34911 100644
--- a/tests/helpers/logfail.py
+++ b/tests/helpers/logfail.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/helpers/messagemock.py b/tests/helpers/messagemock.py
index 6fad75281..39e653719 100644
--- a/tests/helpers/messagemock.py
+++ b/tests/helpers/messagemock.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/helpers/stubs.py b/tests/helpers/stubs.py
index 3f6a23958..711b1105f 100644
--- a/tests/helpers/stubs.py
+++ b/tests/helpers/stubs.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/helpers/test_helper_utils.py b/tests/helpers/test_helper_utils.py
index a783d98f8..a0f3a0885 100644
--- a/tests/helpers/test_helper_utils.py
+++ b/tests/helpers/test_helper_utils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/helpers/test_logfail.py b/tests/helpers/test_logfail.py
index 48aaaa201..d84ee4a14 100644
--- a/tests/helpers/test_logfail.py
+++ b/tests/helpers/test_logfail.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/helpers/test_stubs.py b/tests/helpers/test_stubs.py
index a5c1d27fb..197148b0c 100644
--- a/tests/helpers/test_stubs.py
+++ b/tests/helpers/test_stubs.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/helpers/utils.py b/tests/helpers/utils.py
index 82c07fbd2..834803f61 100644
--- a/tests/helpers/utils.py
+++ b/tests/helpers/utils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/test_conftest.py b/tests/test_conftest.py
index 74db4bf78..2d94add22 100644
--- a/tests/test_conftest.py
+++ b/tests/test_conftest.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/test_hints.py b/tests/unit/browser/test_hints.py
index 6792d1754..69be5c420 100644
--- a/tests/unit/browser/test_hints.py
+++ b/tests/unit/browser/test_hints.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/test_history.py b/tests/unit/browser/test_history.py
index c5734d34a..43476d7e0 100644
--- a/tests/unit/browser/test_history.py
+++ b/tests/unit/browser/test_history.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/test_qutescheme.py b/tests/unit/browser/test_qutescheme.py
index e7c6cc9eb..39df01389 100644
--- a/tests/unit/browser/test_qutescheme.py
+++ b/tests/unit/browser/test_qutescheme.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Imran Sobir
+# Copyright 2017-2018 Imran Sobir
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/test_shared.py b/tests/unit/browser/test_shared.py
index 7d7da1d13..f24f7ad97 100644
--- a/tests/unit/browser/test_shared.py
+++ b/tests/unit/browser/test_shared.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/test_signalfilter.py b/tests/unit/browser/test_signalfilter.py
index fb4ed474c..18f52a32a 100644
--- a/tests/unit/browser/test_signalfilter.py
+++ b/tests/unit/browser/test_signalfilter.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/test_tab.py b/tests/unit/browser/test_tab.py
index 3fc923b1f..05a178b81 100644
--- a/tests/unit/browser/test_tab.py
+++ b/tests/unit/browser/test_tab.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webengine/test_spell.py b/tests/unit/browser/webengine/test_spell.py
index 9e38c1883..efe62fb20 100644
--- a/tests/unit/browser/webengine/test_spell.py
+++ b/tests/unit/browser/webengine/test_spell.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Michal Siedlaczek <michal.siedlaczek@gmail.com>
+# Copyright 2017-2018 Michal Siedlaczek <michal.siedlaczek@gmail.com>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webengine/test_webenginedownloads.py b/tests/unit/browser/webengine/test_webenginedownloads.py
index 043bed1a5..a34962522 100644
--- a/tests/unit/browser/webengine/test_webenginedownloads.py
+++ b/tests/unit/browser/webengine/test_webenginedownloads.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webengine/test_webenginesettings.py b/tests/unit/browser/webengine/test_webenginesettings.py
index 6c58e29af..995dec44a 100644
--- a/tests/unit/browser/webengine/test_webenginesettings.py
+++ b/tests/unit/browser/webengine/test_webenginesettings.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/http/test_content_disposition.py b/tests/unit/browser/webkit/http/test_content_disposition.py
index 5aa25166e..c85174b6a 100644
--- a/tests/unit/browser/webkit/http/test_content_disposition.py
+++ b/tests/unit/browser/webkit/http/test_content_disposition.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/http/test_http.py b/tests/unit/browser/webkit/http/test_http.py
index 1f9b7d75d..161efd482 100644
--- a/tests/unit/browser/webkit/http/test_http.py
+++ b/tests/unit/browser/webkit/http/test_http.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/http/test_http_hypothesis.py b/tests/unit/browser/webkit/http/test_http_hypothesis.py
index 42290a8f4..ec8ee4aff 100644
--- a/tests/unit/browser/webkit/http/test_http_hypothesis.py
+++ b/tests/unit/browser/webkit/http/test_http_hypothesis.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/network/test_filescheme.py b/tests/unit/browser/webkit/network/test_filescheme.py
index a3f546628..8b3287830 100644
--- a/tests/unit/browser/webkit/network/test_filescheme.py
+++ b/tests/unit/browser/webkit/network/test_filescheme.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Antoni Boucher (antoyo) <bouanto@zoho.com>
+# Copyright 2015-2018 Antoni Boucher (antoyo) <bouanto@zoho.com>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/network/test_networkmanager.py b/tests/unit/browser/webkit/network/test_networkmanager.py
index a8301dde1..cfc268406 100644
--- a/tests/unit/browser/webkit/network/test_networkmanager.py
+++ b/tests/unit/browser/webkit/network/test_networkmanager.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/network/test_networkreply.py b/tests/unit/browser/webkit/network/test_networkreply.py
index 8d24ebab8..6dffa87cf 100644
--- a/tests/unit/browser/webkit/network/test_networkreply.py
+++ b/tests/unit/browser/webkit/network/test_networkreply.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/network/test_pac.py b/tests/unit/browser/webkit/network/test_pac.py
index ea8a7acaf..ff0346411 100644
--- a/tests/unit/browser/webkit/network/test_pac.py
+++ b/tests/unit/browser/webkit/network/test_pac.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/network/test_schemehandler.py b/tests/unit/browser/webkit/network/test_schemehandler.py
index 1f5464a85..24e54e0d9 100644
--- a/tests/unit/browser/webkit/network/test_schemehandler.py
+++ b/tests/unit/browser/webkit/network/test_schemehandler.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/network/test_webkitqutescheme.py b/tests/unit/browser/webkit/network/test_webkitqutescheme.py
index 769ecc751..c1775121e 100644
--- a/tests/unit/browser/webkit/network/test_webkitqutescheme.py
+++ b/tests/unit/browser/webkit/network/test_webkitqutescheme.py
@@ -1,7 +1,7 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Daniel Schadt
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Daniel Schadt
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/test_cache.py b/tests/unit/browser/webkit/test_cache.py
index 6a7357eb7..3fcc833d8 100644
--- a/tests/unit/browser/webkit/test_cache.py
+++ b/tests/unit/browser/webkit/test_cache.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 lamarpavel
+# Copyright 2015-2018 lamarpavel
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/test_cookies.py b/tests/unit/browser/webkit/test_cookies.py
index d8f95ad11..99e6d9edc 100644
--- a/tests/unit/browser/webkit/test_cookies.py
+++ b/tests/unit/browser/webkit/test_cookies.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Alexander Cogneau (acogneau) <alexander.cogneau@gmail.com>:
+# Copyright 2015-2018 Alexander Cogneau (acogneau) <alexander.cogneau@gmail.com>:
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/test_downloads.py b/tests/unit/browser/webkit/test_downloads.py
index 77a1b0298..da1fcb424 100644
--- a/tests/unit/browser/webkit/test_downloads.py
+++ b/tests/unit/browser/webkit/test_downloads.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/test_mhtml.py b/tests/unit/browser/webkit/test_mhtml.py
index 230565680..015e90b3f 100644
--- a/tests/unit/browser/webkit/test_mhtml.py
+++ b/tests/unit/browser/webkit/test_mhtml.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Daniel Schadt
+# Copyright 2015-2018 Daniel Schadt
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/test_qt_javascript.py b/tests/unit/browser/webkit/test_qt_javascript.py
index 72d1f4ce0..901c373c4 100644
--- a/tests/unit/browser/webkit/test_qt_javascript.py
+++ b/tests/unit/browser/webkit/test_qt_javascript.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/test_tabhistory.py b/tests/unit/browser/webkit/test_tabhistory.py
index 67602db4c..84a535fa0 100644
--- a/tests/unit/browser/webkit/test_tabhistory.py
+++ b/tests/unit/browser/webkit/test_tabhistory.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/test_webkitelem.py b/tests/unit/browser/webkit/test_webkitelem.py
index 35b9c354b..df3de6310 100644
--- a/tests/unit/browser/webkit/test_webkitelem.py
+++ b/tests/unit/browser/webkit/test_webkitelem.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/commands/test_argparser.py b/tests/unit/commands/test_argparser.py
index 00f000acb..624306ded 100644
--- a/tests/unit/commands/test_argparser.py
+++ b/tests/unit/commands/test_argparser.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/commands/test_cmdutils.py b/tests/unit/commands/test_cmdutils.py
index ca751074d..66233c052 100644
--- a/tests/unit/commands/test_cmdutils.py
+++ b/tests/unit/commands/test_cmdutils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/commands/test_runners.py b/tests/unit/commands/test_runners.py
index 0cbcd37a5..db831bd7e 100644
--- a/tests/unit/commands/test_runners.py
+++ b/tests/unit/commands/test_runners.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/commands/test_userscripts.py b/tests/unit/commands/test_userscripts.py
index 3b6a69710..cfbfa0a86 100644
--- a/tests/unit/commands/test_userscripts.py
+++ b/tests/unit/commands/test_userscripts.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/completion/test_completer.py b/tests/unit/completion/test_completer.py
index 4b39b7032..ecb58f3ec 100644
--- a/tests/unit/completion/test_completer.py
+++ b/tests/unit/completion/test_completer.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2016-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/completion/test_completionmodel.py b/tests/unit/completion/test_completionmodel.py
index b0775428f..e0e044ffb 100644
--- a/tests/unit/completion/test_completionmodel.py
+++ b/tests/unit/completion/test_completionmodel.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2017-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/completion/test_completionwidget.py b/tests/unit/completion/test_completionwidget.py
index ba6e40e4a..01bd3ec03 100644
--- a/tests/unit/completion/test_completionwidget.py
+++ b/tests/unit/completion/test_completionwidget.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2016-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/completion/test_histcategory.py b/tests/unit/completion/test_histcategory.py
index e42f9b91f..d03098090 100644
--- a/tests/unit/completion/test_histcategory.py
+++ b/tests/unit/completion/test_histcategory.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2016-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/completion/test_listcategory.py b/tests/unit/completion/test_listcategory.py
index 10cde7a60..36ea74e41 100644
--- a/tests/unit/completion/test_listcategory.py
+++ b/tests/unit/completion/test_listcategory.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2017-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/completion/test_models.py b/tests/unit/completion/test_models.py
index 1a0fe57b0..ff9a24112 100644
--- a/tests/unit/completion/test_models.py
+++ b/tests/unit/completion/test_models.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2016-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
index d8bf73700..1d1e1fc70 100644
--- a/tests/unit/config/test_config.py
+++ b/tests/unit/config/test_config.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/config/test_configcommands.py b/tests/unit/config/test_configcommands.py
index 92796e8e5..f98f09ca8 100644
--- a/tests/unit/config/test_configcommands.py
+++ b/tests/unit/config/test_configcommands.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/config/test_configdata.py b/tests/unit/config/test_configdata.py
index b7e960ac6..595dbb90b 100644
--- a/tests/unit/config/test_configdata.py
+++ b/tests/unit/config/test_configdata.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/config/test_configexc.py b/tests/unit/config/test_configexc.py
index 8fd99a9c7..f415ed2fb 100644
--- a/tests/unit/config/test_configexc.py
+++ b/tests/unit/config/test_configexc.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index e195f720c..d0f1ff0ee 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/config/test_configinit.py b/tests/unit/config/test_configinit.py
index 79ac43219..a845f84f2 100644
--- a/tests/unit/config/test_configinit.py
+++ b/tests/unit/config/test_configinit.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/config/test_configtypes.py b/tests/unit/config/test_configtypes.py
index 556b3f9e2..81a7d53e1 100644
--- a/tests/unit/config/test_configtypes.py
+++ b/tests/unit/config/test_configtypes.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/javascript/conftest.py b/tests/unit/javascript/conftest.py
index c5c384c26..254ead335 100644
--- a/tests/unit/javascript/conftest.py
+++ b/tests/unit/javascript/conftest.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/javascript/position_caret/test_position_caret.py b/tests/unit/javascript/position_caret/test_position_caret.py
index fcfa5cf5d..c47f94e30 100644
--- a/tests/unit/javascript/position_caret/test_position_caret.py
+++ b/tests/unit/javascript/position_caret/test_position_caret.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/javascript/stylesheet/test_stylesheet.py b/tests/unit/javascript/stylesheet/test_stylesheet.py
index 083265db7..d640e8a19 100644
--- a/tests/unit/javascript/stylesheet/test_stylesheet.py
+++ b/tests/unit/javascript/stylesheet/test_stylesheet.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Jay Kamat
+# Copyright 2017-2018 Jay Kamat
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/javascript/test_greasemonkey.py b/tests/unit/javascript/test_greasemonkey.py
index 1aaa3380f..52af51a4b 100644
--- a/tests/unit/javascript/test_greasemonkey.py
+++ b/tests/unit/javascript/test_greasemonkey.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/keyinput/conftest.py b/tests/unit/keyinput/conftest.py
index 684e5792e..0713c5d26 100644
--- a/tests/unit/keyinput/conftest.py
+++ b/tests/unit/keyinput/conftest.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>:
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>:
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/keyinput/test_basekeyparser.py b/tests/unit/keyinput/test_basekeyparser.py
index c4ce838da..423076bdd 100644
--- a/tests/unit/keyinput/test_basekeyparser.py
+++ b/tests/unit/keyinput/test_basekeyparser.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>:
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>:
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/keyinput/test_modeman.py b/tests/unit/keyinput/test_modeman.py
index 5185636a6..221b675be 100644
--- a/tests/unit/keyinput/test_modeman.py
+++ b/tests/unit/keyinput/test_modeman.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/keyinput/test_modeparsers.py b/tests/unit/keyinput/test_modeparsers.py
index 4d2024eac..ade8c15cc 100644
--- a/tests/unit/keyinput/test_modeparsers.py
+++ b/tests/unit/keyinput/test_modeparsers.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>:
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>:
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/mainwindow/statusbar/test_backforward.py b/tests/unit/mainwindow/statusbar/test_backforward.py
index 6a3df1947..b355fcfdf 100644
--- a/tests/unit/mainwindow/statusbar/test_backforward.py
+++ b/tests/unit/mainwindow/statusbar/test_backforward.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/mainwindow/statusbar/test_percentage.py b/tests/unit/mainwindow/statusbar/test_percentage.py
index 6622b06f4..91de051d1 100644
--- a/tests/unit/mainwindow/statusbar/test_percentage.py
+++ b/tests/unit/mainwindow/statusbar/test_percentage.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/mainwindow/statusbar/test_progress.py b/tests/unit/mainwindow/statusbar/test_progress.py
index bada52c12..763ea1059 100644
--- a/tests/unit/mainwindow/statusbar/test_progress.py
+++ b/tests/unit/mainwindow/statusbar/test_progress.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/mainwindow/statusbar/test_tabindex.py b/tests/unit/mainwindow/statusbar/test_tabindex.py
index 99b5d9114..352089099 100644
--- a/tests/unit/mainwindow/statusbar/test_tabindex.py
+++ b/tests/unit/mainwindow/statusbar/test_tabindex.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/mainwindow/statusbar/test_textbase.py b/tests/unit/mainwindow/statusbar/test_textbase.py
index b976f5c6f..c73a87831 100644
--- a/tests/unit/mainwindow/statusbar/test_textbase.py
+++ b/tests/unit/mainwindow/statusbar/test_textbase.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/mainwindow/statusbar/test_url.py b/tests/unit/mainwindow/statusbar/test_url.py
index 096cb3fee..bda51b504 100644
--- a/tests/unit/mainwindow/statusbar/test_url.py
+++ b/tests/unit/mainwindow/statusbar/test_url.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Clayton Craft (craftyguy) <craftyguy@gmail.com>
+# Copyright 2016-2018 Clayton Craft (craftyguy) <craftyguy@gmail.com>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/mainwindow/test_messageview.py b/tests/unit/mainwindow/test_messageview.py
index 6c9d767c5..64468bcfb 100644
--- a/tests/unit/mainwindow/test_messageview.py
+++ b/tests/unit/mainwindow/test_messageview.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/mainwindow/test_prompt.py b/tests/unit/mainwindow/test_prompt.py
index 76886d340..eb0ba9e69 100644
--- a/tests/unit/mainwindow/test_prompt.py
+++ b/tests/unit/mainwindow/test_prompt.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/mainwindow/test_tabwidget.py b/tests/unit/mainwindow/test_tabwidget.py
index dd87c7ce2..1f0ff55d5 100644
--- a/tests/unit/mainwindow/test_tabwidget.py
+++ b/tests/unit/mainwindow/test_tabwidget.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Daniel Schadt
+# Copyright 2015-2018 Daniel Schadt
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_autoupdate.py b/tests/unit/misc/test_autoupdate.py
index d803e4877..4f5a9dc0e 100644
--- a/tests/unit/misc/test_autoupdate.py
+++ b/tests/unit/misc/test_autoupdate.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Alexander Cogneau (acogneau) <alexander.cogneau@gmail.com>:
+# Copyright 2015-2018 Alexander Cogneau (acogneau) <alexander.cogneau@gmail.com>:
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_checkpyver.py b/tests/unit/misc/test_checkpyver.py
index b61fadc59..17e910a5f 100644
--- a/tests/unit/misc/test_checkpyver.py
+++ b/tests/unit/misc/test_checkpyver.py
@@ -1,4 +1,4 @@
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
 # This file is part of qutebrowser.
diff --git a/tests/unit/misc/test_cmdhistory.py b/tests/unit/misc/test_cmdhistory.py
index 0e6f9748e..8204feb0e 100644
--- a/tests/unit/misc/test_cmdhistory.py
+++ b/tests/unit/misc/test_cmdhistory.py
@@ -1,7 +1,7 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Alexander Cogneau (acogneau) <alexander.cogneau@gmail.com>
-# Copyright 2015-2017 Florian Bruhin (The-Compiler) <me@the-compiler.org>
+# Copyright 2015-2018 Alexander Cogneau (acogneau) <alexander.cogneau@gmail.com>
+# Copyright 2015-2018 Florian Bruhin (The-Compiler) <me@the-compiler.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_crashdialog.py b/tests/unit/misc/test_crashdialog.py
index f8768e806..ccaf6dac5 100644
--- a/tests/unit/misc/test_crashdialog.py
+++ b/tests/unit/misc/test_crashdialog.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_earlyinit.py b/tests/unit/misc/test_earlyinit.py
index fa63dc5b0..0882e610f 100644
--- a/tests/unit/misc/test_earlyinit.py
+++ b/tests/unit/misc/test_earlyinit.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The-Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The-Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_editor.py b/tests/unit/misc/test_editor.py
index 7dea6e069..e334b2645 100644
--- a/tests/unit/misc/test_editor.py
+++ b/tests/unit/misc/test_editor.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_guiprocess.py b/tests/unit/misc/test_guiprocess.py
index 78c55bf98..329dc2ae0 100644
--- a/tests/unit/misc/test_guiprocess.py
+++ b/tests/unit/misc/test_guiprocess.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_ipc.py b/tests/unit/misc/test_ipc.py
index fdb03cfd9..73a9b4f12 100644
--- a/tests/unit/misc/test_ipc.py
+++ b/tests/unit/misc/test_ipc.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_keyhints.py b/tests/unit/misc/test_keyhints.py
index 3e94f1271..c45913a2a 100644
--- a/tests/unit/misc/test_keyhints.py
+++ b/tests/unit/misc/test_keyhints.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2016-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_lineparser.py b/tests/unit/misc/test_lineparser.py
index 0c78035b7..c3624cc1d 100644
--- a/tests/unit/misc/test_lineparser.py
+++ b/tests/unit/misc/test_lineparser.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_miscwidgets.py b/tests/unit/misc/test_miscwidgets.py
index 1ee351a81..ccf3b5593 100644
--- a/tests/unit/misc/test_miscwidgets.py
+++ b/tests/unit/misc/test_miscwidgets.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_msgbox.py b/tests/unit/misc/test_msgbox.py
index 783816011..e2fd7bffe 100644
--- a/tests/unit/misc/test_msgbox.py
+++ b/tests/unit/misc/test_msgbox.py
@@ -1,4 +1,4 @@
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
 # This file is part of qutebrowser.
diff --git a/tests/unit/misc/test_objects.py b/tests/unit/misc/test_objects.py
index 7de92b12d..8d3c934c8 100644
--- a/tests/unit/misc/test_objects.py
+++ b/tests/unit/misc/test_objects.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_pastebin.py b/tests/unit/misc/test_pastebin.py
index a0be9eb39..b352f52c8 100644
--- a/tests/unit/misc/test_pastebin.py
+++ b/tests/unit/misc/test_pastebin.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Anna Kobak (avk) <awerk@onet.eu>:
+# Copyright 2016-2018 Anna Kobak (avk) <awerk@onet.eu>:
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_readline.py b/tests/unit/misc/test_readline.py
index 4b58cccec..6aedc0951 100644
--- a/tests/unit/misc/test_readline.py
+++ b/tests/unit/misc/test_readline.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_sessions.py b/tests/unit/misc/test_sessions.py
index b2cb8a3dd..b9fcaf571 100644
--- a/tests/unit/misc/test_sessions.py
+++ b/tests/unit/misc/test_sessions.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_split.py b/tests/unit/misc/test_split.py
index eff6d2269..fa26e94e8 100644
--- a/tests/unit/misc/test_split.py
+++ b/tests/unit/misc/test_split.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_split_hypothesis.py b/tests/unit/misc/test_split_hypothesis.py
index c63ddff09..c8d6d5147 100644
--- a/tests/unit/misc/test_split_hypothesis.py
+++ b/tests/unit/misc/test_split_hypothesis.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_sql.py b/tests/unit/misc/test_sql.py
index 048826513..050359b47 100644
--- a/tests/unit/misc/test_sql.py
+++ b/tests/unit/misc/test_sql.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2016-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_utilcmds.py b/tests/unit/misc/test_utilcmds.py
index 9c679774a..c63c7bf86 100644
--- a/tests/unit/misc/test_utilcmds.py
+++ b/tests/unit/misc/test_utilcmds.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/scripts/test_check_coverage.py b/tests/unit/scripts/test_check_coverage.py
index d7183111f..026479e38 100644
--- a/tests/unit/scripts/test_check_coverage.py
+++ b/tests/unit/scripts/test_check_coverage.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/scripts/test_dictcli.py b/tests/unit/scripts/test_dictcli.py
index 3471251ba..4df65ead6 100644
--- a/tests/unit/scripts/test_dictcli.py
+++ b/tests/unit/scripts/test_dictcli.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Michal Siedlaczek <michal.siedlaczek@gmail.com>
+# Copyright 2017-2018 Michal Siedlaczek <michal.siedlaczek@gmail.com>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/scripts/test_importer.py b/tests/unit/scripts/test_importer.py
index 7c9ada1c4..ada0d886c 100644
--- a/tests/unit/scripts/test_importer.py
+++ b/tests/unit/scripts/test_importer.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/scripts/test_run_vulture.py b/tests/unit/scripts/test_run_vulture.py
index 2d66d185d..c33a7f616 100644
--- a/tests/unit/scripts/test_run_vulture.py
+++ b/tests/unit/scripts/test_run_vulture.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/test_app.py b/tests/unit/test_app.py
index 080399ecc..1c2341d2b 100644
--- a/tests/unit/test_app.py
+++ b/tests/unit/test_app.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/overflow_test_cases.py b/tests/unit/utils/overflow_test_cases.py
index 450522d6b..c13f3da5c 100644
--- a/tests/unit/utils/overflow_test_cases.py
+++ b/tests/unit/utils/overflow_test_cases.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/test_debug.py b/tests/unit/utils/test_debug.py
index b7b5cf3ca..518bf9b4a 100644
--- a/tests/unit/utils/test_debug.py
+++ b/tests/unit/utils/test_debug.py
@@ -1,4 +1,4 @@
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
 #
diff --git a/tests/unit/utils/test_error.py b/tests/unit/utils/test_error.py
index 43ebc01b7..951aa21f6 100644
--- a/tests/unit/utils/test_error.py
+++ b/tests/unit/utils/test_error.py
@@ -1,4 +1,4 @@
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
 # This file is part of qutebrowser.
diff --git a/tests/unit/utils/test_javascript.py b/tests/unit/utils/test_javascript.py
index 82974876f..864483bf0 100644
--- a/tests/unit/utils/test_javascript.py
+++ b/tests/unit/utils/test_javascript.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py
index 1278d7bc1..f47155f91 100644
--- a/tests/unit/utils/test_jinja.py
+++ b/tests/unit/utils/test_jinja.py
@@ -1,4 +1,4 @@
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
 #
diff --git a/tests/unit/utils/test_log.py b/tests/unit/utils/test_log.py
index fb2723cc6..f7b954052 100644
--- a/tests/unit/utils/test_log.py
+++ b/tests/unit/utils/test_log.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/test_qtutils.py b/tests/unit/utils/test_qtutils.py
index b817eeed0..6de085b25 100644
--- a/tests/unit/utils/test_qtutils.py
+++ b/tests/unit/utils/test_qtutils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/test_standarddir.py b/tests/unit/utils/test_standarddir.py
index e13b5e917..c95e83c41 100644
--- a/tests/unit/utils/test_standarddir.py
+++ b/tests/unit/utils/test_standarddir.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/test_urlutils.py b/tests/unit/utils/test_urlutils.py
index d7f009a37..6621edfed 100644
--- a/tests/unit/utils/test_urlutils.py
+++ b/tests/unit/utils/test_urlutils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/test_utils.py b/tests/unit/utils/test_utils.py
index 28837e93c..4b8c50813 100644
--- a/tests/unit/utils/test_utils.py
+++ b/tests/unit/utils/test_utils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py
index aa9df5419..da65422a7 100644
--- a/tests/unit/utils/test_version.py
+++ b/tests/unit/utils/test_version.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/usertypes/test_misc.py b/tests/unit/utils/usertypes/test_misc.py
index d21816ace..631321278 100644
--- a/tests/unit/utils/usertypes/test_misc.py
+++ b/tests/unit/utils/usertypes/test_misc.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/usertypes/test_neighborlist.py b/tests/unit/utils/usertypes/test_neighborlist.py
index 804ed51ed..7ee1725c2 100644
--- a/tests/unit/utils/usertypes/test_neighborlist.py
+++ b/tests/unit/utils/usertypes/test_neighborlist.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/usertypes/test_question.py b/tests/unit/utils/usertypes/test_question.py
index ebb209326..20569aab1 100644
--- a/tests/unit/utils/usertypes/test_question.py
+++ b/tests/unit/utils/usertypes/test_question.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/usertypes/test_timer.py b/tests/unit/utils/usertypes/test_timer.py
index 81ea6feae..2ead0dc60 100644
--- a/tests/unit/utils/usertypes/test_timer.py
+++ b/tests/unit/utils/usertypes/test_timer.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #

From 8fc88a68fb4dc28efca19d40de5eac9879f5f72a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:13 +0100
Subject: [PATCH 242/574] Update codecov from 2.0.14 to 2.0.15

---
 misc/requirements/requirements-codecov.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-codecov.txt b/misc/requirements/requirements-codecov.txt
index 26008b77b..d0b277af5 100644
--- a/misc/requirements/requirements-codecov.txt
+++ b/misc/requirements/requirements-codecov.txt
@@ -2,7 +2,7 @@
 
 certifi==2018.1.18
 chardet==3.0.4
-codecov==2.0.14
+codecov==2.0.15
 coverage==4.4.2
 idna==2.6
 requests==2.18.4

From 075dd8e0a45fdbf5a434742680784820796a1436 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:15 +0100
Subject: [PATCH 243/574] Update coverage from 4.4.2 to 4.5

---
 misc/requirements/requirements-codecov.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-codecov.txt b/misc/requirements/requirements-codecov.txt
index d0b277af5..df27fc428 100644
--- a/misc/requirements/requirements-codecov.txt
+++ b/misc/requirements/requirements-codecov.txt
@@ -3,7 +3,7 @@
 certifi==2018.1.18
 chardet==3.0.4
 codecov==2.0.15
-coverage==4.4.2
+coverage==4.5
 idna==2.6
 requests==2.18.4
 urllib3==1.22

From cfcd1bba1e00e9a22e83539258a7f7ca90c89e0e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:16 +0100
Subject: [PATCH 244/574] Update coverage from 4.4.2 to 4.5

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 0bd38e349..874d5ef06 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -5,7 +5,7 @@ beautifulsoup4==4.6.0
 cheroot==6.0.0
 click==6.7
 # colorama==0.3.9
-coverage==4.4.2
+coverage==4.5
 EasyProcess==0.2.3
 fields==5.0.0
 Flask==0.12.2

From 46b85c11f130831baf3dbc5c63072c784d247f7c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:18 +0100
Subject: [PATCH 245/574] Update flake8-bugbear from 17.12.0 to 18.2.0

---
 misc/requirements/requirements-flake8.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index 0ae43d663..5a43e66d1 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -2,7 +2,7 @@
 
 attrs==17.4.0
 flake8==3.5.0
-flake8-bugbear==17.12.0
+flake8-bugbear==18.2.0
 flake8-builtins==1.0.post0
 flake8-comprehensions==1.4.1
 flake8-copyright==0.2.0

From d3050d73ba16d799debdbe6a1f6404b980db0066 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:19 +0100
Subject: [PATCH 246/574] Update setuptools from 38.4.0 to 38.5.0

---
 misc/requirements/requirements-pip.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pip.txt b/misc/requirements/requirements-pip.txt
index 54cacc3c3..bd9654b1b 100644
--- a/misc/requirements/requirements-pip.txt
+++ b/misc/requirements/requirements-pip.txt
@@ -3,6 +3,6 @@
 appdirs==1.4.3
 packaging==16.8
 pyparsing==2.2.0
-setuptools==38.4.0
+setuptools==38.5.0
 six==1.11.0
 wheel==0.30.0

From 417a114a94e9ed427f9d561409c22eec1595e290 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:21 +0100
Subject: [PATCH 247/574] Update isort from 4.2.15 to 4.3.2

---
 misc/requirements/requirements-pylint-master.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pylint-master.txt b/misc/requirements/requirements-pylint-master.txt
index 5a414b3db..d23d2ea57 100644
--- a/misc/requirements/requirements-pylint-master.txt
+++ b/misc/requirements/requirements-pylint-master.txt
@@ -5,7 +5,7 @@ certifi==2018.1.18
 chardet==3.0.4
 github3.py==0.9.6
 idna==2.6
-isort==4.2.15
+isort==4.3.2
 lazy-object-proxy==1.3.1
 mccabe==0.6.1
 -e git+https://github.com/PyCQA/pylint.git#egg=pylint

From 8579616fea8a88375057c2332a78e36b30a76205 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:23 +0100
Subject: [PATCH 248/574] Update isort from 4.2.15 to 4.3.2

---
 misc/requirements/requirements-pylint.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index b5aab6354..cc9d099f3 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -5,7 +5,7 @@ certifi==2018.1.18
 chardet==3.0.4
 github3.py==0.9.6
 idna==2.6
-isort==4.2.15
+isort==4.3.2
 lazy-object-proxy==1.3.1
 mccabe==0.6.1
 pylint==1.8.1

From 08ea34174cb3b114bc0f9e70f57ae94c6cf1ebd6 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:24 +0100
Subject: [PATCH 249/574] Update astroid from 1.6.0 to 1.6.1

---
 misc/requirements/requirements-pylint.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index cc9d099f3..756a19047 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -1,6 +1,6 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-astroid==1.6.0
+astroid==1.6.1
 certifi==2018.1.18
 chardet==3.0.4
 github3.py==0.9.6

From 4a9cbf8930fe8ab2bf644bb897ccbb08b7443749 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:26 +0100
Subject: [PATCH 250/574] Update pylint from 1.8.1 to 1.8.2

---
 misc/requirements/requirements-pylint.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index 756a19047..e86be34e2 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -8,7 +8,7 @@ idna==2.6
 isort==4.3.2
 lazy-object-proxy==1.3.1
 mccabe==0.6.1
-pylint==1.8.1
+pylint==1.8.2
 ./scripts/dev/pylint_checkers
 requests==2.18.4
 six==1.11.0

From 67623930dd98d8f850596e86d731ebb32f7b2741 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:27 +0100
Subject: [PATCH 251/574] Update pyqt5 from 5.9.2 to 5.10

---
 misc/requirements/requirements-pyqt.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt
index 5a08f2f73..49d240f95 100644
--- a/misc/requirements/requirements-pyqt.txt
+++ b/misc/requirements/requirements-pyqt.txt
@@ -1,4 +1,4 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt5==5.9.2
+PyQt5==5.10
 sip==4.19.6

From fac666e607666b6d09019b8feb4efea65b01a3db Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:29 +0100
Subject: [PATCH 252/574] Update sip from 4.19.6 to 4.19.7

---
 misc/requirements/requirements-pyqt.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt
index 49d240f95..99ba1b7cc 100644
--- a/misc/requirements/requirements-pyqt.txt
+++ b/misc/requirements/requirements-pyqt.txt
@@ -1,4 +1,4 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 PyQt5==5.10
-sip==4.19.6
+sip==4.19.7

From 8ee3c743e4d784204f2262495bcd789c6f95e8a8 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:30 +0100
Subject: [PATCH 253/574] Update hypothesis from 3.44.21 to 3.44.25

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 874d5ef06..a638c4b19 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -11,7 +11,7 @@ fields==5.0.0
 Flask==0.12.2
 glob2==0.6
 hunter==2.0.2
-hypothesis==3.44.21
+hypothesis==3.44.25
 itsdangerous==0.24
 # Jinja2==2.10
 Mako==1.0.7

From 782ec573ab429ae348355f0e213c33992f99a263 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:32 +0100
Subject: [PATCH 254/574] Update pytest from 3.3.1 to 3.4.0

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index a638c4b19..8b5dce6d2 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -21,7 +21,7 @@ parse-type==0.4.2
 pluggy==0.6.0
 py==1.5.2
 py-cpuinfo==3.3.0
-pytest==3.3.1  # rq.filter: != 3.3.2
+pytest==3.4.0  # rq.filter: != 3.3.2
 pytest-bdd==2.19.0
 pytest-benchmark==3.1.1
 pytest-cov==2.5.1

From 9eefbf24a25a96fcd50c0bf9268eea381e391c2a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:33 +0100
Subject: [PATCH 255/574] Update pytest-bdd from 2.19.0 to 2.20.0

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 8b5dce6d2..1752f08c7 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -22,7 +22,7 @@ pluggy==0.6.0
 py==1.5.2
 py-cpuinfo==3.3.0
 pytest==3.4.0  # rq.filter: != 3.3.2
-pytest-bdd==2.19.0
+pytest-bdd==2.20.0
 pytest-benchmark==3.1.1
 pytest-cov==2.5.1
 pytest-faulthandler==1.3.1

From bfeac178e22f97289f5cb82e5443fcdaf4b1cbd9 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Mon, 5 Feb 2018 21:00:29 +0000
Subject: [PATCH 256/574] Make {suburl} expand to {url}

This is useful for the following case from IRC:
`:set aliases '{"twmpv": "spawn mpv {suburl}"}'

which now sets:
:twmpv -> spawn mpv {url}
---
 qutebrowser/commands/runners.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qutebrowser/commands/runners.py b/qutebrowser/commands/runners.py
index 9fe53f07a..5e4d0f687 100644
--- a/qutebrowser/commands/runners.py
+++ b/qutebrowser/commands/runners.py
@@ -65,6 +65,7 @@ def replace_variables(win_id, arglist):
             QUrl.DecodeReserved | QUrl.RemovePassword),
         'clipboard': utils.get_clipboard,
         'primary': lambda: utils.get_clipboard(selection=True),
+        'suburl': lambda: '{url}'
     }
     values = {}
     args = []

From 8b29ce93ecec8590e2bb4135cca2fc7b2480265b Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Mon, 5 Feb 2018 21:40:12 +0000
Subject: [PATCH 257/574] Add substitutions for the other 3 types

---
 qutebrowser/commands/runners.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/commands/runners.py b/qutebrowser/commands/runners.py
index 5e4d0f687..793ac6682 100644
--- a/qutebrowser/commands/runners.py
+++ b/qutebrowser/commands/runners.py
@@ -65,7 +65,10 @@ def replace_variables(win_id, arglist):
             QUrl.DecodeReserved | QUrl.RemovePassword),
         'clipboard': utils.get_clipboard,
         'primary': lambda: utils.get_clipboard(selection=True),
-        'suburl': lambda: '{url}'
+        'suburl': lambda: '{url}',
+        'suburl:pretty': lambda: '{url:pretty}',
+        'subclipboard': lambda: '{clipboard}',
+        'subprimary': lambda: '{primary}',
     }
     values = {}
     args = []

From 22c33ddfb8e128b34be586984bcebfd93b3ea8a4 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Mon, 5 Feb 2018 21:45:49 +0000
Subject: [PATCH 258/574] Add special cases of double quotes: eg {{url}}

This allows a second level of indirection quite cheaply, but is a
band-aid fix.

This commit should be taken as temporary until command arguments are
reworked.
---
 qutebrowser/commands/runners.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/commands/runners.py b/qutebrowser/commands/runners.py
index 793ac6682..40c927379 100644
--- a/qutebrowser/commands/runners.py
+++ b/qutebrowser/commands/runners.py
@@ -65,10 +65,10 @@ def replace_variables(win_id, arglist):
             QUrl.DecodeReserved | QUrl.RemovePassword),
         'clipboard': utils.get_clipboard,
         'primary': lambda: utils.get_clipboard(selection=True),
-        'suburl': lambda: '{url}',
-        'suburl:pretty': lambda: '{url:pretty}',
-        'subclipboard': lambda: '{clipboard}',
-        'subprimary': lambda: '{primary}',
+        '{url}': lambda: '{url}',
+        '{url:pretty}': lambda: '{url:pretty}',
+        '{clipboard}': lambda: '{clipboard}',
+        '{primary}': lambda: '{primary}',
     }
     values = {}
     args = []

From 8c39e8f7649e703eaf8f12ed204df3623bbbbe7d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 6 Feb 2018 14:13:06 +0100
Subject: [PATCH 259/574] Update changelog

[ci skip]
---
 doc/changelog.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 8e943d2c7..3f3b53287 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -36,7 +36,7 @@ Changed
 - `:tab-only` with pinned tabs now still closes unpinned tabs.
 - GreaseMonkey `@include` and `@exclude` now support
   regex matches. With QtWebEngine and Qt 5.8 and newer, Qt handles the matching,
-  but similar functionality will likely land in Qt 5.11.
+  but similar functionality was added in Qt 5.11.
 - The sqlite history now uses write-ahead logging which should be
   a performance and stability improvement.
 - The `url.incdec_segments` option now also can take `port` as possible segment.

From 26810e02c1b36a904e9bff55856b820c80c3eb04 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Tue, 6 Feb 2018 17:22:59 +0000
Subject: [PATCH 260/574] Add a way to view source in editor

---
 qutebrowser/browser/commands.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 0ebcf3240..08bbdedf0 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1505,7 +1505,7 @@ class CommandDispatcher:
             )
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
-    def view_source(self):
+    def view_source(self, edit=False):
         """Show the source of the current page in a new tab."""
         tab = self._current_widget()
         try:
@@ -1515,8 +1515,12 @@ class CommandDispatcher:
             return
         if current_url.scheme() == 'view-source':
             raise cmdexc.CommandError("Already viewing source!")
+        if editor:
+            ed = editor.ExternalEditor(self._tabbed_browser)
 
-        tab.action.show_source()
+            tab._widget.page().toHtml(ed.edit)
+        else:
+            tab.action.show_source()
 
     @cmdutils.register(instance='command-dispatcher', scope='window',
                        debug=True)

From 0893e3a03813a71677930e0af69ddab7cf276c18 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Tue, 6 Feb 2018 17:35:24 +0000
Subject: [PATCH 261/574] Fix boolean variable name

---
 qutebrowser/browser/commands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 08bbdedf0..1c08cede6 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1515,7 +1515,7 @@ class CommandDispatcher:
             return
         if current_url.scheme() == 'view-source':
             raise cmdexc.CommandError("Already viewing source!")
-        if editor:
+        if edit:
             ed = editor.ExternalEditor(self._tabbed_browser)
 
             tab._widget.page().toHtml(ed.edit)

From 9c471287998ec4ea3f1665dfaec1c56b1a0edfc3 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Tue, 6 Feb 2018 18:25:15 +0000
Subject: [PATCH 262/574] Use provided methods instead of protected members

---
 qutebrowser/browser/browsertab.py | 2 +-
 qutebrowser/browser/commands.py   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 1a514f4a3..02048473d 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -806,7 +806,7 @@ class AbstractTab(QWidget):
         raise NotImplementedError
 
     def dump_async(self, callback, *, plain=False):
-        """Dump the current page to a file ascync.
+        """Dump the current page's html asynchronously.
 
         The given callback will be called with the result when dumping is
         complete.
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 1c08cede6..3063c8cda 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1515,10 +1515,10 @@ class CommandDispatcher:
             return
         if current_url.scheme() == 'view-source':
             raise cmdexc.CommandError("Already viewing source!")
+
         if edit:
             ed = editor.ExternalEditor(self._tabbed_browser)
-
-            tab._widget.page().toHtml(ed.edit)
+            tab.dump_async(ed.edit)
         else:
             tab.action.show_source()
 

From 5ceecc2b045c40f0ce2f0fcfd7c37409b73ac64a Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Tue, 6 Feb 2018 18:53:45 +0000
Subject: [PATCH 263/574] Add docstring for new argument

---
 qutebrowser/browser/commands.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 3063c8cda..460467848 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1506,7 +1506,10 @@ class CommandDispatcher:
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     def view_source(self, edit=False):
-        """Show the source of the current page in a new tab."""
+        """Show the source of the current page in a new tab.
+
+        Args:
+            edit: Open source in editor instead of tab."""
         tab = self._current_widget()
         try:
             current_url = self._current_url()

From 16375f20d560f2d1fcccc00153168148f1e99a19 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 6 Feb 2018 21:25:08 +0100
Subject: [PATCH 264/574] Always use JavaScript to get selection

It looks like getting the selection via the widget has issues even with Qt 5.10.

On Windows, we always get wrong results.

On Linux, it seems to be flaky. I first thought this was because of a race
between JavaScript setting the selection and Qt getting it, as now we don't use
JS to get the selection anymore, so it's possible that we get it before the
older JS code finished running. However, even calling selectedText() from a JS
callback didn't seem to help...

Since has_selection also is flawed and it taking a callback would make code more
complex as well, let's just assume there is a selection if the text is not
empty. In fact, that is exactly what QtWebEngine does for hasSelection anyways!

Fixes #3523
---
 qutebrowser/browser/browsertab.py             |  3 ---
 qutebrowser/browser/commands.py               |  4 ++--
 qutebrowser/browser/webengine/webenginetab.py | 21 ++++++-------------
 qutebrowser/browser/webkit/webkittab.py       |  7 ++-----
 4 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 1a514f4a3..add08e66f 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -392,9 +392,6 @@ class AbstractCaret(QObject):
     def drop_selection(self):
         raise NotImplementedError
 
-    def has_selection(self):
-        raise NotImplementedError
-
     def selection(self, html=False, callback=None):
         raise NotImplementedError
 
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 0ebcf3240..57f6cce47 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -853,7 +853,7 @@ class CommandDispatcher:
             what = 'URL'  # For printing
         elif what == 'selection':
             def _selection_callback(s):
-                if not self._current_widget().caret.has_selection() or not s:
+                if not s:
                     message.info("Nothing to yank")
                     return
                 self._yank_to_target(s, sel, what, keep)
@@ -1267,7 +1267,7 @@ class CommandDispatcher:
             env['QUTE_TITLE'] = self._tabbed_browser.page_title(idx)
 
         tab = self._tabbed_browser.currentWidget()
-        if tab is not None and tab.caret.has_selection():
+        if tab is not None:
             env['QUTE_SELECTED_TEXT'] = selection
             try:
                 env['QUTE_SELECTED_HTML'] = tab.caret.selection(html=True)
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index ecbe81922..c90481c21 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -289,24 +289,15 @@ class WebEngineCaret(browsertab.AbstractCaret):
     def drop_selection(self):
         self._js_call('dropSelection')
 
-    def has_selection(self):
-        if qtutils.version_check('5.10'):
-            return self._widget.hasSelection()
-        else:
-            # WORKAROUND for
-            # https://bugreports.qt.io/browse/QTBUG-53134
-            return True
-
     def selection(self, html=False, callback=None):
         if html:
             raise browsertab.UnsupportedOperationError
-        if qtutils.version_check('5.10'):
-            callback(self._widget.selectedText())
-        else:
-            # WORKAROUND for
-            # https://bugreports.qt.io/browse/QTBUG-53134
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'getSelection'), callback)
+        # Not using selectedText() as WORKAROUND for
+        # https://bugreports.qt.io/browse/QTBUG-53134
+        # Even on Qt 5.10 selectedText() seems to work poorly, see
+        # https://github.com/qutebrowser/qutebrowser/issues/3523
+        self._tab.run_js_async(javascript.assemble('caret', 'getSelection'),
+                               callback)
 
     def _follow_selected_cb(self, js_elem, tab=False):
         """Callback for javascript which clicks the selected element.
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 4ad177a2a..a493ce495 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -360,9 +360,6 @@ class WebKitCaret(browsertab.AbstractCaret):
     def drop_selection(self):
         self._widget.triggerPageAction(QWebPage.MoveToNextChar)
 
-    def has_selection(self):
-        return self._widget.hasSelection()
-
     def selection(self, html=False, callback=False):
         callback(self._selection(html))
 
@@ -373,8 +370,6 @@ class WebKitCaret(browsertab.AbstractCaret):
             return self._widget.selectedText()
 
     def follow_selected(self, *, tab=False):
-        if not self.has_selection():
-            return
         if QWebSettings.globalSettings().testAttribute(
                 QWebSettings.JavascriptEnabled):
             if tab:
@@ -383,6 +378,8 @@ class WebKitCaret(browsertab.AbstractCaret):
                 'window.getSelection().anchorNode.parentNode.click()')
         else:
             selection = self._selection(html=True)
+            if not selection:
+                return
             try:
                 selected_element = xml.etree.ElementTree.fromstring(
                     '<html>{}</html>'.format(selection)).find('a')

From ce8d15d2b01d1df0c0f291b10828eab4aa142511 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 6 Feb 2018 22:48:00 +0100
Subject: [PATCH 265/574] Simplify selection handling and remove
 QUTE_SELECTED_HTML

It was broken at least since caret support was introduced and it was only
available for QtWebKit anyways, so let's just drop it. This also makes the tab
API a bit simpler.
---
 doc/changelog.asciidoc                        |  6 ++++++
 doc/userscripts.asciidoc                      |  2 --
 qutebrowser/browser/browsertab.py             |  2 +-
 qutebrowser/browser/commands.py               | 10 ++--------
 qutebrowser/browser/webengine/webenginetab.py |  4 +---
 qutebrowser/browser/webkit/webkittab.py       | 14 ++++----------
 6 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 3f3b53287..448aa1be3 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -55,6 +55,12 @@ Fixed
 - `:bookmark-add "" foo` can now be used to save the current URL with a custom
   title.
 
+Removed
+~~~~~~~
+
+- `QUTE_SELECTED_HTML` is now not set for userscripts anymore except when called
+  via hints.
+
 v1.1.1
 ------
 
diff --git a/doc/userscripts.asciidoc b/doc/userscripts.asciidoc
index 7f43e969b..c2f35b026 100644
--- a/doc/userscripts.asciidoc
+++ b/doc/userscripts.asciidoc
@@ -45,8 +45,6 @@ In `command` mode:
 - `QUTE_URL`: The current URL.
 - `QUTE_TITLE`: The title of the current page.
 - `QUTE_SELECTED_TEXT`: The text currently selected on the page.
-- `QUTE_SELECTED_HTML` The HTML currently selected on the page (not supported
-  with QtWebEngine).
 
 In `hints` mode:
 
diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index add08e66f..e0435587e 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -392,7 +392,7 @@ class AbstractCaret(QObject):
     def drop_selection(self):
         raise NotImplementedError
 
-    def selection(self, html=False, callback=None):
+    def selection(self, callback=None):
         raise NotImplementedError
 
     def follow_selected(self, *, tab=False):
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 57f6cce47..7be7937a0 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1260,21 +1260,15 @@ class CommandDispatcher:
         """
         env = {
             'QUTE_MODE': 'command',
+            'QUTE_SELECTED_TEXT': selection,
         }
 
         idx = self._current_index()
         if idx != -1:
             env['QUTE_TITLE'] = self._tabbed_browser.page_title(idx)
 
-        tab = self._tabbed_browser.currentWidget()
-        if tab is not None:
-            env['QUTE_SELECTED_TEXT'] = selection
-            try:
-                env['QUTE_SELECTED_HTML'] = tab.caret.selection(html=True)
-            except browsertab.UnsupportedOperationError:
-                pass
-
         # FIXME:qtwebengine: If tab is None, run_async will fail!
+        tab = self._tabbed_browser.currentWidget()
 
         try:
             url = self._tabbed_browser.current_url()
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index c90481c21..f42f01c24 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -289,9 +289,7 @@ class WebEngineCaret(browsertab.AbstractCaret):
     def drop_selection(self):
         self._js_call('dropSelection')
 
-    def selection(self, html=False, callback=None):
-        if html:
-            raise browsertab.UnsupportedOperationError
+    def selection(self, callback=None):
         # Not using selectedText() as WORKAROUND for
         # https://bugreports.qt.io/browse/QTBUG-53134
         # Even on Qt 5.10 selectedText() seems to work poorly, see
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index a493ce495..6c1698c85 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -188,7 +188,7 @@ class WebKitCaret(browsertab.AbstractCaret):
 
         settings = self._widget.settings()
         settings.setAttribute(QWebSettings.CaretBrowsingEnabled, True)
-        self.selection_enabled = bool(self._selection())
+        self.selection_enabled = self._widget.hasSelection()
 
         if self._widget.isVisible():
             # Sometimes the caret isn't immediately visible, but unfocusing
@@ -360,14 +360,8 @@ class WebKitCaret(browsertab.AbstractCaret):
     def drop_selection(self):
         self._widget.triggerPageAction(QWebPage.MoveToNextChar)
 
-    def selection(self, html=False, callback=False):
-        callback(self._selection(html))
-
-    def _selection(self, html=False):
-        if html:
-            return self._widget.selectedHtml()
-        else:
-            return self._widget.selectedText()
+    def selection(self, callback):
+        callback(self._widget.selectedText())
 
     def follow_selected(self, *, tab=False):
         if QWebSettings.globalSettings().testAttribute(
@@ -377,7 +371,7 @@ class WebKitCaret(browsertab.AbstractCaret):
             self._tab.run_js_async(
                 'window.getSelection().anchorNode.parentNode.click()')
         else:
-            selection = self._selection(html=True)
+            selection = self._widget.selectedHtml()
             if not selection:
                 return
             try:

From 20d5b4e384e812a64b547220f7341c6004c602e5 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 6 Feb 2018 23:17:40 +0100
Subject: [PATCH 266/574] Update pytest log handling

In pytest 3.4, we now need to explicitly set the log level and caplog.at_level
now sets the level of the root handler.
---
 pytest.ini               |  1 +
 tests/helpers/logfail.py | 12 +-----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/pytest.ini b/pytest.ini
index 4fefa0f77..56cd808ad 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,4 +1,5 @@
 [pytest]
+log_level = NOTSET
 addopts = --strict -rfEw --faulthandler-timeout=90 --instafail --pythonwarnings error --benchmark-columns=Min,Max,Median
 testpaths = tests
 markers =
diff --git a/tests/helpers/logfail.py b/tests/helpers/logfail.py
index 8eee34911..740dd4333 100644
--- a/tests/helpers/logfail.py
+++ b/tests/helpers/logfail.py
@@ -22,7 +22,6 @@
 import logging
 
 import pytest
-import _pytest.logging
 
 
 class LogFailHandler(logging.Handler):
@@ -40,17 +39,8 @@ class LogFailHandler(logging.Handler):
         if logger.name == 'messagemock':
             return
 
-        for h in root_logger.handlers:
-            if isinstance(h, _pytest.logging.LogCaptureHandler):
-                capture_handler = h
-                break
-        else:
-            # The LogCaptureHandler is not available anymore during fixture
-            # teardown, so we ignore logging messages emitted there..
-            return
-
         if (logger.level == record.levelno or
-                capture_handler.level == record.levelno):
+                root_logger.level == record.levelno):
             # caplog.at_level(...) was used with the level of this message,
             # i.e.  it was expected.
             return

From c987a94596751a033326177c6860a1171de580bf Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 6 Feb 2018 23:18:53 +0100
Subject: [PATCH 267/574] Downgrade PyQt again

Upgrading PyQt in a separate branch.
---
 misc/requirements/requirements-pyqt.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt
index 99ba1b7cc..58f51d203 100644
--- a/misc/requirements/requirements-pyqt.txt
+++ b/misc/requirements/requirements-pyqt.txt
@@ -1,4 +1,4 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt5==5.10
-sip==4.19.7
+PyQt5==5.9
+sip==4.19.6

From 5fd3943ebcc2b1f5ebf91f9253f854fe07ffe96e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 6 Feb 2018 23:32:50 +0100
Subject: [PATCH 268/574] Make callback mandatory for tab.selection()

---
 qutebrowser/browser/browsertab.py             | 2 +-
 qutebrowser/browser/webengine/webenginetab.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index e0435587e..2c0aa6722 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -392,7 +392,7 @@ class AbstractCaret(QObject):
     def drop_selection(self):
         raise NotImplementedError
 
-    def selection(self, callback=None):
+    def selection(self, callback):
         raise NotImplementedError
 
     def follow_selected(self, *, tab=False):
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index f42f01c24..dfb4d898c 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -289,7 +289,7 @@ class WebEngineCaret(browsertab.AbstractCaret):
     def drop_selection(self):
         self._js_call('dropSelection')
 
-    def selection(self, callback=None):
+    def selection(self, callback):
         # Not using selectedText() as WORKAROUND for
         # https://bugreports.qt.io/browse/QTBUG-53134
         # Even on Qt 5.10 selectedText() seems to work poorly, see

From ec7583eb97e9d73371e7c3ca8fefacd1a3de89ef Mon Sep 17 00:00:00 2001
From: Perry Thompson <contact@ryper.org>
Date: Tue, 6 Feb 2018 17:23:09 -0600
Subject: [PATCH 269/574] Add troubleshooting info for widevine to FAQ

---
 doc/faq.asciidoc | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/doc/faq.asciidoc b/doc/faq.asciidoc
index 0d94796a4..9c8c51f16 100644
--- a/doc/faq.asciidoc
+++ b/doc/faq.asciidoc
@@ -216,6 +216,29 @@ And then re-emerging qtwebengine with: +
     
     emerge -1 qtwebengine
 
+Unable to view DRM content (Netflix, Spotify, etc.).::
+    You will need to install `widevine` and set `qt.args` to point to it.
+    QT5.9 currently only supports widevine up to Chrome version 61.
++
+On Arch, simply install `qt5-webengine-widevine` from the AUR and run:
++
+----
+:set qt.args '["ppapi-widevine-path=/usr/lib/qt/plugins/ppapi/libwidevinecdmadapter.so"]'
+:restart
+----
++
+For other distributions, download the chromium tarball and widevine-cdm zip from
+https://aur.archlinux.org/packages/qt5-webengine-widevine/[the AUR page],
+extract `libwidevinecdmadapter.so` and `libwidevinecdm.so` files, respectively,
+and move them to the `ppapi` plugin directory in your QT library directory (create it if it does not exist).
++
+Lastly, set your `qt.args` to point to that directory and restart qutebrowser:
++
+----
+:set qt.args '["ppapi-widevine-path=/usr/lib64/qt5/plugins/ppapi/libwidevinecdmadapter.so"]'
+:restart
+----
+
 My issue is not listed.::
     If you experience any segfaults or crashes, you can report the issue in
     https://github.com/qutebrowser/qutebrowser/issues[the issue tracker] or

From d9e095f7cf73a77379e27602257f2c9a55b72a24 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 10:52:10 +0100
Subject: [PATCH 270/574] Add PyQt 5.10 to Travis CI

See #3522
---
 .travis.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 251842d06..d5ebb1dec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,17 @@ matrix:
       env: TESTENV=py35-pyqt59
     - os: linux
       env: TESTENV=py36-pyqt59-cov
+    - os: linux
+      env: TESTENV=py36-pyqt510
+      # We need a newer Xvfb as a WORKAROUND for:
+      # https://bugreports.qt.io/browse/QTBUG-64928
+      sudo: required
+      addons:
+         apt:
+           sources:
+           - sourceline: "deb http://us.archive.ubuntu.com/ubuntu/ xenial main universe"
+           packages:
+           - xvfb
     - os: osx
       env: TESTENV=py36 OSX=sierra
       osx_image: xcode9.2

From 7537acfd5db1457c36a8e15e08bb13bcf7f2800c Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 10:52:26 +0100
Subject: [PATCH 271/574] Use PyQt 5.10 on AppVeyor

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 837ebb1d4..f2424fc94 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -7,7 +7,7 @@ environment:
     PYTHONUNBUFFERED: 1
     PYTHON: C:\Python36\python.exe
     matrix:
-    - TESTENV: py36-pyqt59
+    - TESTENV: py36-pyqt510
     - TESTENV: pylint
 
 install:

From 054b92bbe8417dbabc75bb1e662da73ff1af5266 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 11:19:41 +0100
Subject: [PATCH 272/574] Support retrying downloads with Qt 5.10

Fixes #2787
---
 doc/changelog.asciidoc                           |  1 +
 .../browser/webengine/webenginedownloads.py      | 12 +++++++++---
 tests/end2end/features/downloads.feature         | 16 +++++++++++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 448aa1be3..da814e2ce 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -25,6 +25,7 @@ Added
 - A new `qute://bindings` page, opened by `:bind`, shows all keybindings.
 - `:session-load` has a new `--delete` flag which deletes the
   session after loading it.
+- QtWebEngine: Retrying downloads is now supported with Qt 5.10 or newer.
 
 Changed
 ~~~~~~~
diff --git a/qutebrowser/browser/webengine/webenginedownloads.py b/qutebrowser/browser/webengine/webenginedownloads.py
index fac04686a..ca18d7df8 100644
--- a/qutebrowser/browser/webengine/webenginedownloads.py
+++ b/qutebrowser/browser/webengine/webenginedownloads.py
@@ -96,9 +96,15 @@ class DownloadItem(downloads.AbstractDownloadItem):
         self._qt_item.cancel()
 
     def retry(self):
-        # https://bugreports.qt.io/browse/QTBUG-56840
-        raise downloads.UnsupportedOperationError(
-            "Retrying downloads is unsupported with QtWebEngine")
+        state = self._qt_item.state()
+        assert state == QWebEngineDownloadItem.DownloadInterrupted, state
+
+        try:
+            self._qt_item.resume()
+        except AttributeError:
+            raise downloads.UnsupportedOperationError(
+                "Retrying downloads is unsupported with QtWebEngine on "
+                "Qt/PyQt < 5.10")
 
     def _get_open_filename(self):
         return self._filename
diff --git a/tests/end2end/features/downloads.feature b/tests/end2end/features/downloads.feature
index 26e3421a1..da5b0b5ae 100644
--- a/tests/end2end/features/downloads.feature
+++ b/tests/end2end/features/downloads.feature
@@ -193,13 +193,23 @@ Feature: Downloading things from a website.
             does-not-exist
             does-not-exist
 
-    @qtwebkit_skip
-    Scenario: Retrying a failed download with QtWebEngine
+    @qtwebkit_skip @qt<5.10
+    Scenario: Retrying a failed download with QtWebEngine (Qt < 5.10)
         When I open data/downloads/issue2298.html
         And I run :click-element id download
         And I wait for "Download error: *" in the log
         And I run :download-retry
-        Then the error "Retrying downloads is unsupported with QtWebEngine" should be shown
+        Then the error "Retrying downloads is unsupported *" should be shown
+
+    @qtwebkit_skip @qt>=5.10
+    Scenario: Retrying a failed download with QtWebEngine (Qt >= 5.10)
+        When I open data/downloads/issue2298.html
+        And I run :click-element id download
+        And I wait for "Download error: *" in the log
+        And I run :download-retry
+        # For some reason it doesn't actually try again here, but let's hope it
+        # works e.g. on a connection loss, which we can't test automatically.
+        Then "Retrying downloads is unsupported *" should not be logged
 
     Scenario: Retrying with count
         When I run :download http://localhost:(port)/data/downloads/download.bin

From e6a4237e1b88e4039582a401fa6c4b309820cb63 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 11:53:47 +0100
Subject: [PATCH 273/574] Revert "Downgrade PyQt again"

This reverts commit c987a94596751a033326177c6860a1171de580bf.
---
 misc/requirements/requirements-pyqt.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt
index 58f51d203..99ba1b7cc 100644
--- a/misc/requirements/requirements-pyqt.txt
+++ b/misc/requirements/requirements-pyqt.txt
@@ -1,4 +1,4 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt5==5.9
-sip==4.19.6
+PyQt5==5.10
+sip==4.19.7

From 6d1e3fb2b7b9c96307394fdf3e7924f7d43e3558 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 12:04:09 +0100
Subject: [PATCH 274/574] Add missing more-itertools requirements

---
 misc/requirements/requirements-tests.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 1752f08c7..658fc1580 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -16,6 +16,7 @@ itsdangerous==0.24
 # Jinja2==2.10
 Mako==1.0.7
 # MarkupSafe==1.0
+more-itertools==4.1.0
 parse==1.8.2
 parse-type==0.4.2
 pluggy==0.6.0

From 5135e0f35d913ef79d094820fa1098a98d1a6240 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 12:04:42 +0100
Subject: [PATCH 275/574] Add .pytest_cache to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 54a0dcae6..85233aa2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ __pycache__
 /.tox
 /testresults.html
 /.cache
+/.pytest_cache
 /.testmondata
 /.hypothesis
 /.mypy_cache

From e874db9ce3ac759b2028eb7e624e04f910c2f521 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 12:05:13 +0100
Subject: [PATCH 276/574] Remove pytest version filter

---
 misc/requirements/requirements-tests.txt     | 2 +-
 misc/requirements/requirements-tests.txt-raw | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 658fc1580..eebd2945b 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -22,7 +22,7 @@ parse-type==0.4.2
 pluggy==0.6.0
 py==1.5.2
 py-cpuinfo==3.3.0
-pytest==3.4.0  # rq.filter: != 3.3.2
+pytest==3.4.0
 pytest-bdd==2.20.0
 pytest-benchmark==3.1.1
 pytest-cov==2.5.1
diff --git a/misc/requirements/requirements-tests.txt-raw b/misc/requirements/requirements-tests.txt-raw
index 174eeb7df..121689980 100644
--- a/misc/requirements/requirements-tests.txt-raw
+++ b/misc/requirements/requirements-tests.txt-raw
@@ -4,7 +4,7 @@ coverage
 Flask
 hunter
 hypothesis
-pytest==3.3.1
+pytest
 pytest-bdd
 pytest-benchmark
 pytest-cov
@@ -19,4 +19,3 @@ pytest-xvfb
 vulture
 
 #@ ignore: Jinja2, MarkupSafe, colorama
-#@ filter: pytest != 3.3.2

From 0bdee1e2920b3a905205b5cf5f4ee4f0cc83f46f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 18:05:15 +0100
Subject: [PATCH 277/574] Stabilize the flaky iframe test

The test above this one loads hello.txt, but we don't wait for the "load
finished" message, so it can arrive after the previous test already finished and
make this test not wait properly.

However, we also can't easily wait for the load finished message in the
previous test as it only appears with QtWebEngine, not QtWebKit.

As a workaround, we simply load another file in that test, to circumvent this
kind of cross-interaction.
---
 tests/end2end/data/hints/iframe_target.html | 1 +
 tests/end2end/features/hints.feature        | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/end2end/data/hints/iframe_target.html b/tests/end2end/data/hints/iframe_target.html
index db8afad27..bd1e281c2 100644
--- a/tests/end2end/data/hints/iframe_target.html
+++ b/tests/end2end/data/hints/iframe_target.html
@@ -9,6 +9,7 @@
         <iframe id="my-iframe"></iframe>
         <p>
             A <a href="/data/hello.txt" target="my-iframe">link</a> to be opened in the iframe above.
+            A <a href="/data/hello2.txt" target="my-iframe">second link</a> for the iframe.
         </p>
     </body>
 </html>
diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature
index 5da03a085..909eeaf07 100644
--- a/tests/end2end/features/hints.feature
+++ b/tests/end2end/features/hints.feature
@@ -239,12 +239,11 @@ Feature: Using hints
     Scenario: Opening a link with specific target frame in a new tab
         When I open data/hints/iframe_target.html
         And I run :tab-only
-        And I hint with args "links tab" and follow a
-        And I wait until data/hello.txt is loaded
-        And I wait 0.5s
+        And I hint with args "links tab" and follow s
+        And I wait until data/hello2.txt is loaded
         Then the following tabs should be open:
             - data/hints/iframe_target.html
-            - data/hello.txt (active)
+            - data/hello2.txt (active)
 
     Scenario: Clicking on iframe with :hint all current
         When I open data/hints/iframe.html

From 1c662ae94c53ad7337c396d704b8482df9bd74cf Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 18:25:25 +0100
Subject: [PATCH 278/574] Revive iframe test as flaky

See #1525
---
 tests/end2end/features/hints.feature | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature
index 909eeaf07..dc14750e1 100644
--- a/tests/end2end/features/hints.feature
+++ b/tests/end2end/features/hints.feature
@@ -222,13 +222,12 @@ Feature: Using hints
         # The actual check is already done above
         Then no crash should happen
 
-    ### FIXME currenly skipped, see https://github.com/qutebrowser/qutebrowser/issues/1525
-    @xfail_norun
+    @flaky  # FIXME https://github.com/qutebrowser/qutebrowser/issues/1525
     Scenario: Using :follow-hint inside a scrolled iframe
         When I open data/hints/iframe_scroll.html
         And I hint with args "all normal" and follow a
         And I run :scroll bottom
-        And I hint wht args "links normal" and follow a
+        And I hint with args "links normal" and follow a
         Then "navigation request: url http://localhost:*/data/hello2.txt, type NavigationTypeLinkClicked, *" should be logged
 
     Scenario: Opening a link inside a specific iframe

From 7dbe9a59e8039a16f42602affcc89624d8becb1c Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 18:26:43 +0100
Subject: [PATCH 279/574] Update changelog

---
 doc/changelog.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index da814e2ce..2262927de 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -26,6 +26,8 @@ Added
 - `:session-load` has a new `--delete` flag which deletes the
   session after loading it.
 - QtWebEngine: Retrying downloads is now supported with Qt 5.10 or newer.
+- QtWebEngine: Hinting and other features inside same-origin frames is now
+  supported.
 
 Changed
 ~~~~~~~

From 1d568a5cf490c98c7e1f78d2e45419260911ce63 Mon Sep 17 00:00:00 2001
From: Bryan Kok <bryan.wyern1@gmail.com>
Date: Thu, 11 Jan 2018 05:59:42 +0800
Subject: [PATCH 280/574] Add feature to pastebin version string

Added a --paste flag to the :version command and a JS button with corresponding qutescheme URL in the Version debug page to enable pastebinning version.
---
 qutebrowser/browser/qutescheme.py |  7 +++++++
 qutebrowser/html/version.html     | 14 +++++++++++++
 qutebrowser/misc/pastebin.py      |  7 +++++--
 qutebrowser/misc/utilcmds.py      |  5 ++++-
 qutebrowser/utils/utils.py        | 33 ++++++++++++++++++++++++++++++-
 5 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 320e7873a..50b25aa74 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -476,3 +476,10 @@ def qute_configdiff(url):
     else:
         data = config.instance.dump_userconfig().encode('utf-8')
         return 'text/plain', data
+
+
+@add_handler('pastebin-version')
+def qute_pastebin_version(url):  # transfusion: pylint: disable=unused-argument
+    """Handler that pastebins the version string."""
+    utils.pastebin_version()
+    return 'text/plain', b'Paste called.'
diff --git a/qutebrowser/html/version.html b/qutebrowser/html/version.html
index 736eb7547..9532c3d62 100644
--- a/qutebrowser/html/version.html
+++ b/qutebrowser/html/version.html
@@ -1,4 +1,17 @@
 {% extends "base.html" %}
+
+{% block script %}
+var paste_version = function(){
+  xhr = new XMLHttpRequest();
+  xhr.open("GET", "qute://pastebin-version");
+  xhr.send();
+}
+{% endblock %}
+
+{% block style %}
+#paste { margin: auto; display: block; }
+{% endblock %}
+
 {% block content %}
 {{ super() }}
 <h1>Version info</h1>
@@ -23,4 +36,5 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <a href="http://www.gnu.org/licenses/">
 http://www.gnu.org/licenses/</a> or open <a href="qute://gpl">qute://gpl</a>.
 </p>
+<button id="paste" onclick="paste_version()">Pastebin Version Info</button>
 {% endblock %}
diff --git a/qutebrowser/misc/pastebin.py b/qutebrowser/misc/pastebin.py
index d022fc526..423709910 100644
--- a/qutebrowser/misc/pastebin.py
+++ b/qutebrowser/misc/pastebin.py
@@ -42,20 +42,23 @@ class PastebinClient(QObject):
     """
 
     API_URL = 'https://crashes.qutebrowser.org/api/'
+    MISC_API_URL = 'http://paste.the-compiler.org/api/'
     success = pyqtSignal(str)
     error = pyqtSignal(str)
 
-    def __init__(self, client, parent=None):
+    def __init__(self, client, parent=None, api_url=API_URL):
         """Constructor.
 
         Args:
             client: The HTTPClient to use. Will be reparented.
+            api_url: The Stikked pastebin endpoint to use.
         """
         super().__init__(parent)
         client.setParent(self)
         client.error.connect(self.error)
         client.success.connect(self.on_client_success)
         self._client = client
+        self.api_url = api_url
 
     def paste(self, name, title, text, parent=None):
         """Paste the text into a pastebin and return the URL.
@@ -74,7 +77,7 @@ class PastebinClient(QObject):
         }
         if parent is not None:
             data['reply'] = parent
-        url = QUrl(urllib.parse.urljoin(self.API_URL, 'create'))
+        url = QUrl(urllib.parse.urljoin(self.api_url, 'create'))
         self._client.post(url, data)
 
     @pyqtSlot(str)
diff --git a/qutebrowser/misc/utilcmds.py b/qutebrowser/misc/utilcmds.py
index c0d83b7eb..093f79aaa 100644
--- a/qutebrowser/misc/utilcmds.py
+++ b/qutebrowser/misc/utilcmds.py
@@ -369,8 +369,11 @@ def nop():
 
 @cmdutils.register()
 @cmdutils.argument('win_id', win_id=True)
-def version(win_id):
+def version(win_id, paste=False):
     """Show version information."""
     tabbed_browser = objreg.get('tabbed-browser', scope='window',
                                 window=win_id)
     tabbed_browser.openurl(QUrl('qute://version'), newtab=True)
+
+    if paste:
+        utils.pastebin_version()
diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index 079866920..3579ac243 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -33,9 +33,10 @@ import functools
 import contextlib
 import socket
 import shlex
+import getpass
 
 import attr
-from PyQt5.QtCore import Qt, QUrl
+from PyQt5.QtCore import Qt, QUrl, pyqtSlot
 from PyQt5.QtGui import QKeySequence, QColor, QClipboard, QDesktopServices
 from PyQt5.QtWidgets import QApplication
 import pkg_resources
@@ -49,6 +50,7 @@ except ImportError:  # pragma: no cover
 
 import qutebrowser
 from qutebrowser.utils import qtutils, log, debug
+from qutebrowser.misc import httpclient, pastebin
 
 
 fake_clipboard = None
@@ -915,3 +917,32 @@ def yaml_dump(data, f=None):
         return None
     else:
         return yaml_data.decode('utf-8')
+
+
+def pastebin_version():
+    """Pastebins version and logs to messages"""
+
+    app = qutebrowser.utils.objreg.get('app')
+    http_client = httpclient.HTTPClient()
+
+    def _get_paste_title():
+        return "qute version info {}".format(qutebrowser.__version__)
+
+    @pyqtSlot(str)
+    def _on_paste_version_success(url):
+        qutebrowser.utils.message.info("Version info pastebinned"
+                                       " to: {}".format(url))
+
+    @pyqtSlot(str)
+    def _on_paste_version_err(text):
+        qutebrowser.utils.message.info("Failed to pastebin version"
+                                       " info: {}".format(text))
+
+    pbclient = pastebin.PastebinClient(http_client, parent=app,
+                                       api_url=
+                                       pastebin.PastebinClient.MISC_API_URL)
+    pbclient.success.connect(_on_paste_version_success)
+    pbclient.error.connect(_on_paste_version_err)
+
+    pbclient.paste(getpass.getuser(), _get_paste_title(),
+                   qutebrowser.utils.version.version())

From f45d572677ed6356a798b9ed109bca62e85a0bf9 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Tue, 6 Feb 2018 19:48:31 +0000
Subject: [PATCH 281/574] Some style fixes in PR #3480's review

---
 qutebrowser/browser/qutescheme.py | 2 +-
 qutebrowser/misc/pastebin.py      | 6 +++---
 qutebrowser/misc/utilcmds.py      | 6 +++++-
 qutebrowser/utils/utils.py        | 8 ++++----
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 50b25aa74..9779b3949 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -479,7 +479,7 @@ def qute_configdiff(url):
 
 
 @add_handler('pastebin-version')
-def qute_pastebin_version(url):  # transfusion: pylint: disable=unused-argument
+def qute_pastebin_version(_url):
     """Handler that pastebins the version string."""
     utils.pastebin_version()
     return 'text/plain', b'Paste called.'
diff --git a/qutebrowser/misc/pastebin.py b/qutebrowser/misc/pastebin.py
index 423709910..0f2ed8ce4 100644
--- a/qutebrowser/misc/pastebin.py
+++ b/qutebrowser/misc/pastebin.py
@@ -42,7 +42,7 @@ class PastebinClient(QObject):
     """
 
     API_URL = 'https://crashes.qutebrowser.org/api/'
-    MISC_API_URL = 'http://paste.the-compiler.org/api/'
+    MISC_API_URL = 'https://paste.the-compiler.org/api/'
     success = pyqtSignal(str)
     error = pyqtSignal(str)
 
@@ -58,7 +58,7 @@ class PastebinClient(QObject):
         client.error.connect(self.error)
         client.success.connect(self.on_client_success)
         self._client = client
-        self.api_url = api_url
+        self._api_url = api_url
 
     def paste(self, name, title, text, parent=None):
         """Paste the text into a pastebin and return the URL.
@@ -77,7 +77,7 @@ class PastebinClient(QObject):
         }
         if parent is not None:
             data['reply'] = parent
-        url = QUrl(urllib.parse.urljoin(self.api_url, 'create'))
+        url = QUrl(urllib.parse.urljoin(self._api_url, 'create'))
         self._client.post(url, data)
 
     @pyqtSlot(str)
diff --git a/qutebrowser/misc/utilcmds.py b/qutebrowser/misc/utilcmds.py
index 093f79aaa..e1ad25350 100644
--- a/qutebrowser/misc/utilcmds.py
+++ b/qutebrowser/misc/utilcmds.py
@@ -370,7 +370,11 @@ def nop():
 @cmdutils.register()
 @cmdutils.argument('win_id', win_id=True)
 def version(win_id, paste=False):
-    """Show version information."""
+    """Show version information.
+
+    Args:
+        paste: Paste to pastebin.
+    """
     tabbed_browser = objreg.get('tabbed-browser', scope='window',
                                 window=win_id)
     tabbed_browser.openurl(QUrl('qute://version'), newtab=True)
diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index 3579ac243..afad0f0c2 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -920,8 +920,7 @@ def yaml_dump(data, f=None):
 
 
 def pastebin_version():
-    """Pastebins version and logs to messages"""
-
+    """Pastebin the version and log the url to messages."""
     app = qutebrowser.utils.objreg.get('app')
     http_client = httpclient.HTTPClient()
 
@@ -938,9 +937,10 @@ def pastebin_version():
         qutebrowser.utils.message.info("Failed to pastebin version"
                                        " info: {}".format(text))
 
+    misc_api = pastebin.PastebinClient.MISC_API_URL
     pbclient = pastebin.PastebinClient(http_client, parent=app,
-                                       api_url=
-                                       pastebin.PastebinClient.MISC_API_URL)
+                                       api_url=misc_api)
+
     pbclient.success.connect(_on_paste_version_success)
     pbclient.error.connect(_on_paste_version_err)
 

From 86d3abc0c47e0bf0b788e034b1a16e4989749fd8 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Wed, 7 Feb 2018 15:21:19 +0000
Subject: [PATCH 282/574] Additional code review changes from PR #3480

---
 qutebrowser/utils/utils.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index afad0f0c2..efcd76013 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -49,7 +49,7 @@ except ImportError:  # pragma: no cover
     YAML_C_EXT = False
 
 import qutebrowser
-from qutebrowser.utils import qtutils, log, debug
+from qutebrowser.utils import qtutils, log, debug, message, version
 from qutebrowser.misc import httpclient, pastebin
 
 
@@ -921,7 +921,7 @@ def yaml_dump(data, f=None):
 
 def pastebin_version():
     """Pastebin the version and log the url to messages."""
-    app = qutebrowser.utils.objreg.get('app')
+    app = QApplication.instance()
     http_client = httpclient.HTTPClient()
 
     def _get_paste_title():
@@ -929,20 +929,20 @@ def pastebin_version():
 
     @pyqtSlot(str)
     def _on_paste_version_success(url):
-        qutebrowser.utils.message.info("Version info pastebinned"
-                                       " to: {}".format(url))
+        set_clipboard(url)
+        message.info("Version url {} yanked to clipboard.".format(url))
 
     @pyqtSlot(str)
     def _on_paste_version_err(text):
-        qutebrowser.utils.message.info("Failed to pastebin version"
-                                       " info: {}".format(text))
+        message.error("Failed to pastebin version"
+                      " info: {}".format(text))
 
-    misc_api = pastebin.PastebinClient.MISC_API_URL
+    MISC_API = pastebin.PastebinClient.MISC_API_URL
     pbclient = pastebin.PastebinClient(http_client, parent=app,
-                                       api_url=misc_api)
+                                       api_url=MISC_API)
 
     pbclient.success.connect(_on_paste_version_success)
     pbclient.error.connect(_on_paste_version_err)
 
     pbclient.paste(getpass.getuser(), _get_paste_title(),
-                   qutebrowser.utils.version.version())
+                   version.version())

From d0ec33730ee56954f1fd438e40efce314ccdf2be Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Wed, 7 Feb 2018 15:28:58 +0000
Subject: [PATCH 283/574] Add deleteLater to the paste callbacks

---
 qutebrowser/utils/utils.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index efcd76013..ffe6ca297 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -931,11 +931,13 @@ def pastebin_version():
     def _on_paste_version_success(url):
         set_clipboard(url)
         message.info("Version url {} yanked to clipboard.".format(url))
+        pbclient.deleteLater()
 
     @pyqtSlot(str)
     def _on_paste_version_err(text):
         message.error("Failed to pastebin version"
                       " info: {}".format(text))
+        pbclient.deleteLater()
 
     MISC_API = pastebin.PastebinClient.MISC_API_URL
     pbclient = pastebin.PastebinClient(http_client, parent=app,

From a3d62c86df03e9292e16d0748fd3abf77fc543fd Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Wed, 7 Feb 2018 17:25:19 +0000
Subject: [PATCH 284/574] Fix style for linter

---
 qutebrowser/utils/utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index ffe6ca297..b314fc4c8 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -939,9 +939,9 @@ def pastebin_version():
                       " info: {}".format(text))
         pbclient.deleteLater()
 
-    MISC_API = pastebin.PastebinClient.MISC_API_URL
+    misc_api = pastebin.PastebinClient.MISC_API_URL
     pbclient = pastebin.PastebinClient(http_client, parent=app,
-                                       api_url=MISC_API)
+                                       api_url=misc_api)
 
     pbclient.success.connect(_on_paste_version_success)
     pbclient.error.connect(_on_paste_version_err)

From 9128afa01db7dcbb0b7a55424d278fe8c7bb3755 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Wed, 7 Feb 2018 19:03:05 +0000
Subject: [PATCH 285/574] Move pastebin_version() to version.py

This also fixes the introduced cyclic dependencies
---
 qutebrowser/browser/qutescheme.py |  2 +-
 qutebrowser/misc/utilcmds.py      |  2 +-
 qutebrowser/utils/utils.py        | 37 ++-----------------------------
 qutebrowser/utils/version.py      | 33 +++++++++++++++++++++++++--
 4 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 9779b3949..cca74cb63 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -481,5 +481,5 @@ def qute_configdiff(url):
 @add_handler('pastebin-version')
 def qute_pastebin_version(_url):
     """Handler that pastebins the version string."""
-    utils.pastebin_version()
+    version.pastebin_version()
     return 'text/plain', b'Paste called.'
diff --git a/qutebrowser/misc/utilcmds.py b/qutebrowser/misc/utilcmds.py
index e1ad25350..cc494a180 100644
--- a/qutebrowser/misc/utilcmds.py
+++ b/qutebrowser/misc/utilcmds.py
@@ -380,4 +380,4 @@ def version(win_id, paste=False):
     tabbed_browser.openurl(QUrl('qute://version'), newtab=True)
 
     if paste:
-        utils.pastebin_version()
+        utils.version.pastebin_version()
diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index b314fc4c8..f9361e3d5 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -36,7 +36,7 @@ import shlex
 import getpass
 
 import attr
-from PyQt5.QtCore import Qt, QUrl, pyqtSlot
+from PyQt5.QtCore import Qt, QUrl
 from PyQt5.QtGui import QKeySequence, QColor, QClipboard, QDesktopServices
 from PyQt5.QtWidgets import QApplication
 import pkg_resources
@@ -49,9 +49,7 @@ except ImportError:  # pragma: no cover
     YAML_C_EXT = False
 
 import qutebrowser
-from qutebrowser.utils import qtutils, log, debug, message, version
-from qutebrowser.misc import httpclient, pastebin
-
+from qutebrowser.utils import qtutils, log, debug
 
 fake_clipboard = None
 log_clipboard = False
@@ -917,34 +915,3 @@ def yaml_dump(data, f=None):
         return None
     else:
         return yaml_data.decode('utf-8')
-
-
-def pastebin_version():
-    """Pastebin the version and log the url to messages."""
-    app = QApplication.instance()
-    http_client = httpclient.HTTPClient()
-
-    def _get_paste_title():
-        return "qute version info {}".format(qutebrowser.__version__)
-
-    @pyqtSlot(str)
-    def _on_paste_version_success(url):
-        set_clipboard(url)
-        message.info("Version url {} yanked to clipboard.".format(url))
-        pbclient.deleteLater()
-
-    @pyqtSlot(str)
-    def _on_paste_version_err(text):
-        message.error("Failed to pastebin version"
-                      " info: {}".format(text))
-        pbclient.deleteLater()
-
-    misc_api = pastebin.PastebinClient.MISC_API_URL
-    pbclient = pastebin.PastebinClient(http_client, parent=app,
-                                       api_url=misc_api)
-
-    pbclient.success.connect(_on_paste_version_success)
-    pbclient.error.connect(_on_paste_version_err)
-
-    pbclient.paste(getpass.getuser(), _get_paste_title(),
-                   version.version())
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index aff7ed07b..fd6fdfa23 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -49,8 +49,8 @@ except ImportError:  # pragma: no cover
     QWebEngineProfile = None
 
 import qutebrowser
-from qutebrowser.utils import log, utils, standarddir, usertypes
-from qutebrowser.misc import objects, earlyinit, sql
+from qutebrowser.utils import log, utils, standarddir, usertypes, message
+from qutebrowser.misc import objects, earlyinit, sql, httpclient, pastebin
 from qutebrowser.browser import pdfjs
 
 
@@ -449,3 +449,32 @@ def opengl_vendor():  # pragma: no cover
         ctx.doneCurrent()
         if old_context and old_surface:
             old_context.makeCurrent(old_surface)
+
+
+def pastebin_version():
+    """Pastebin the version and log the url to messages."""
+    app = QApplication.instance()
+    http_client = httpclient.HTTPClient()
+
+    def _get_paste_title():
+        return "qute version info {}".format(qutebrowser.__version__)
+
+    def _on_paste_version_success(url):
+        utils.set_clipboard(url)
+        message.info("Version url {} yanked to clipboard.".format(url))
+        pbclient.deleteLater()
+
+    def _on_paste_version_err(text):
+        message.error("Failed to pastebin version"
+                      " info: {}".format(text))
+        pbclient.deleteLater()
+
+    misc_api = pastebin.PastebinClient.MISC_API_URL
+    pbclient = pastebin.PastebinClient(http_client, parent=app,
+                                       api_url=misc_api)
+
+    pbclient.success.connect(_on_paste_version_success)
+    pbclient.error.connect(_on_paste_version_err)
+
+    pbclient.paste(utils.getpass.getuser(), _get_paste_title(),
+                   version())

From 682c3462f12d36a4c2b52c0d89b5e8a70786f5cb Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Wed, 7 Feb 2018 19:21:53 +0000
Subject: [PATCH 286/574] Ensure version info only gets pasted once

---
 qutebrowser/misc/utilcmds.py |  3 ++-
 qutebrowser/utils/version.py | 18 ++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/qutebrowser/misc/utilcmds.py b/qutebrowser/misc/utilcmds.py
index cc494a180..d2743d56e 100644
--- a/qutebrowser/misc/utilcmds.py
+++ b/qutebrowser/misc/utilcmds.py
@@ -39,6 +39,7 @@ from qutebrowser.utils import log, objreg, usertypes, message, debug, utils
 from qutebrowser.commands import cmdutils, runners, cmdexc
 from qutebrowser.config import config, configdata
 from qutebrowser.misc import consolewidget
+from qutebrowser.utils.version import pastebin_version
 
 
 @cmdutils.register(maxsplit=1, no_cmd_split=True, no_replace_variables=True)
@@ -380,4 +381,4 @@ def version(win_id, paste=False):
     tabbed_browser.openurl(QUrl('qute://version'), newtab=True)
 
     if paste:
-        utils.version.pastebin_version()
+        pastebin_version()
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index fd6fdfa23..779be348b 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -65,6 +65,7 @@ class DistributionInfo:
     pretty = attr.ib()
 
 
+PASTEBIN_URL = None
 Distribution = enum.Enum(
     'Distribution', ['unknown', 'ubuntu', 'debian', 'void', 'arch',
                      'gentoo', 'fedora', 'opensuse', 'linuxmint', 'manjaro'])
@@ -453,22 +454,31 @@ def opengl_vendor():  # pragma: no cover
 
 def pastebin_version():
     """Pastebin the version and log the url to messages."""
-    app = QApplication.instance()
-    http_client = httpclient.HTTPClient()
-
     def _get_paste_title():
         return "qute version info {}".format(qutebrowser.__version__)
 
-    def _on_paste_version_success(url):
+    def _yank_url(url):
         utils.set_clipboard(url)
         message.info("Version url {} yanked to clipboard.".format(url))
+
+    def _on_paste_version_success(url):
+        global PASTEBIN_URL
+        _yank_url(url)
         pbclient.deleteLater()
+        PASTEBIN_URL = url
 
     def _on_paste_version_err(text):
         message.error("Failed to pastebin version"
                       " info: {}".format(text))
         pbclient.deleteLater()
 
+    if PASTEBIN_URL:
+        _yank_url(PASTEBIN_URL)
+        return
+
+    app = QApplication.instance()
+    http_client = httpclient.HTTPClient()
+
     misc_api = pastebin.PastebinClient.MISC_API_URL
     pbclient = pastebin.PastebinClient(http_client, parent=app,
                                        api_url=misc_api)

From 0ee53028368536fef3ee9342d0d7567bd337d5a5 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Wed, 7 Feb 2018 20:03:46 +0000
Subject: [PATCH 287/574] Pylint fixes

---
 qutebrowser/utils/utils.py   | 1 -
 qutebrowser/utils/version.py | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index f9361e3d5..2d96613ee 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -33,7 +33,6 @@ import functools
 import contextlib
 import socket
 import shlex
-import getpass
 
 import attr
 from PyQt5.QtCore import Qt, QUrl
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index 779be348b..941ad2123 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -29,6 +29,7 @@ import importlib
 import collections
 import enum
 import datetime
+import getpass
 
 import attr
 import pkg_resources
@@ -486,5 +487,5 @@ def pastebin_version():
     pbclient.success.connect(_on_paste_version_success)
     pbclient.error.connect(_on_paste_version_err)
 
-    pbclient.paste(utils.getpass.getuser(), _get_paste_title(),
+    pbclient.paste(getpass.getuser(), _get_paste_title(),
                    version())

From abd56a5abd21613697b1933624d2d23abe027bb4 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 21:40:03 +0100
Subject: [PATCH 288/574] Wait until the mtime changed

---
 tests/unit/misc/test_editor.py | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/tests/unit/misc/test_editor.py b/tests/unit/misc/test_editor.py
index 58f6edae7..3a60aaff7 100644
--- a/tests/unit/misc/test_editor.py
+++ b/tests/unit/misc/test_editor.py
@@ -19,6 +19,7 @@
 
 """Tests for qutebrowser.misc.editor."""
 
+import time
 import os
 import os.path
 import logging
@@ -179,19 +180,31 @@ def test_modify(qtbot, editor, initial_text, edited_text):
     assert blocker.args == [edited_text]
 
 
+def _update_file(filename, contents):
+    """Update the given file and make sure its mtime changed.
+
+    This might write the file multiple times, but different systems have
+    different mtime's, so we can't be sure how long to wait otherwise.
+    """
+    old_mtime = new_mtime = os.stat(filename).st_mtime
+    while old_mtime == new_mtime:
+        time.sleep(0.1)
+        with open(filename, 'w', encoding='utf-8') as f:
+            f.write(contents)
+        new_mtime = os.stat(filename).st_mtime
+
+
 def test_modify_watch(qtbot):
     """Test that saving triggers file_updated when watch=True."""
     editor = editormod.ExternalEditor(watch=True)
     editor.edit('foo')
 
     with qtbot.wait_signal(editor.file_updated, timeout=3000) as blocker:
-        with open(editor._filename, 'w', encoding='utf-8') as f:
-            f.write('bar')
+        _update_file(editor._filename, 'bar')
     assert blocker.args == ['bar']
 
     with qtbot.wait_signal(editor.file_updated) as blocker:
-        with open(editor._filename, 'w', encoding='utf-8') as f:
-            f.write('baz')
+        _update_file(editor._filename, 'baz')
     assert blocker.args == ['baz']
 
     with qtbot.assert_not_emitted(editor.file_updated):

From 01ccbc679d05adf9fd193f1688d76c1170865a17 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 22:26:32 +0100
Subject: [PATCH 289/574] Fix lint

---
 qutebrowser/browser/commands.py           | 2 +-
 qutebrowser/misc/editor.py                | 9 +++------
 tests/end2end/features/test_editor_bdd.py | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 094563bcc..da5ccbc89 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1639,7 +1639,7 @@ class CommandDispatcher:
     def on_file_updated(self, elem, text):
         """Write the editor text into the form field and clean up tempfile.
 
-        Callback for GUIProcess when the editor was closed.
+        Callback for GUIProcess when the edited text was updated.
 
         Args:
             elem: The WebElementWrapper which was modified.
diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index 9565ce28b..db7d3e3e2 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -51,10 +51,7 @@ class ExternalEditor(QObject):
         self._filename = None
         self._proc = None
         self._remove_file = None
-        if watch:
-            self._watcher = QFileSystemWatcher(parent=self)
-        else:
-            self._watcher = None
+        self._watcher = QFileSystemWatcher(parent=self) if watch else None
         self._content = None
 
     def _cleanup(self):
@@ -125,10 +122,10 @@ class ExternalEditor(QObject):
         line, column = self._calc_line_and_column(text, caret_position)
         self._start_editor(line=line, column=column)
 
+    @pyqtSlot(str)
     def _on_file_changed(self, path):
-        encoding = config.val.editor.encoding
         try:
-            with open(path, 'r', encoding=encoding) as f:
+            with open(path, 'r', encoding=config.val.editor.encoding) as f:
                 text = f.read()
         except OSError as e:
             # NOTE: Do not replace this with "raise CommandError" as it's
diff --git a/tests/end2end/features/test_editor_bdd.py b/tests/end2end/features/test_editor_bdd.py
index 4e480b85d..12de7c92c 100644
--- a/tests/end2end/features/test_editor_bdd.py
+++ b/tests/end2end/features/test_editor_bdd.py
@@ -84,7 +84,7 @@ def set_up_editor_wait(quteproc, tmpdir, text):
         import time
         import signal
 
-        def handle(sig, frame):
+        def handle(sig, _frame):
             with open(sys.argv[1], 'w', encoding='utf-8') as f:
                 f.write({text!r})
             if sig == signal.SIGUSR1:

From cd97d5e6e2b78c570f19eda91720b9d95b7eed81 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 22:31:28 +0100
Subject: [PATCH 290/574] Update changelog

---
 doc/changelog.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index c9cb327b3..56f3a4b30 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -41,6 +41,8 @@ Changed
   a performance and stability improvement.
 - The `url.incdec_segments` option now also can take `port` as possible segment.
 - QtWebEngine: `:view-source` now uses Chromium's `view-source:` scheme.
+- When an editor is spawned with `:open-editor` and `:config-edit`, the changes
+  are now applied as soon as the file is saved in the editor.
 
 Fixed
 ~~~~~

From 37a9691e295938b53a6b746967f7356ef587bdf6 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 23:13:13 +0100
Subject: [PATCH 291/574] Only focus qutebrowser again after editing finished

See #3431, #3432
---
 qutebrowser/browser/commands.py | 4 ++--
 qutebrowser/misc/editor.py      | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 97f631df9..2267f9e41 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1619,6 +1619,8 @@ class CommandDispatcher:
         ed = editor.ExternalEditor(watch=True, parent=self._tabbed_browser)
         ed.file_updated.connect(functools.partial(
             self.on_file_updated, elem))
+        ed.editing_finished.connect(lambda: mainwindow.raise_window(
+            objreg.last_focused_window(), alert=False))
         ed.edit(text, caret_position)
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
@@ -1647,8 +1649,6 @@ class CommandDispatcher:
         except webelem.Error as e:
             raise cmdexc.CommandError(str(e))
 
-        mainwindow.raise_window(objreg.last_focused_window(), alert=False)
-
     @cmdutils.register(instance='command-dispatcher', maxsplit=0,
                        scope='window')
     def insert_text(self, text):
diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index c562a1d67..4fd6ab3b6 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -42,9 +42,15 @@ class ExternalEditor(QObject):
         _proc: The GUIProcess of the editor.
         _watcher: A QFileSystemWatcher to watch the edited file for changes.
                   Only set if watch=True.
+
+    Signals:
+        file_updated: The text in the edited file was updated.
+                      arg: The new text.
+        editing_finished: The editor process was closed.
     """
 
     file_updated = pyqtSignal(str)
+    editing_finished = pyqtSignal()
 
     def __init__(self, parent=None, watch=False):
         super().__init__(parent)
@@ -84,6 +90,7 @@ class ExternalEditor(QObject):
             return
         # do a final read to make sure we don't miss the last signal
         self._on_file_changed(self._filename)
+        self.editing_finished.emit()
         self._cleanup()
 
     @pyqtSlot(QProcess.ProcessError)

From a9dfed948a42e1b91df7b3342c51901edf18b1d4 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Wed, 7 Feb 2018 22:55:42 +0000
Subject: [PATCH 292/574] Remove extraneous function

---
 qutebrowser/utils/version.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index 941ad2123..e246cb8c5 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -455,9 +455,6 @@ def opengl_vendor():  # pragma: no cover
 
 def pastebin_version():
     """Pastebin the version and log the url to messages."""
-    def _get_paste_title():
-        return "qute version info {}".format(qutebrowser.__version__)
-
     def _yank_url(url):
         utils.set_clipboard(url)
         message.info("Version url {} yanked to clipboard.".format(url))
@@ -487,5 +484,5 @@ def pastebin_version():
     pbclient.success.connect(_on_paste_version_success)
     pbclient.error.connect(_on_paste_version_err)
 
-    pbclient.paste(getpass.getuser(), _get_paste_title(),
-                   version())
+    pbclient.paste(getpass.getuser(),
+        "qute version info {}".format(qutebrowser.__version__), version())

From f51ac8ab6e7ffdc95a3e8ac91098764f79302a15 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 00:32:02 +0100
Subject: [PATCH 293/574] Log QFileSystemWatcher errors

---
 qutebrowser/misc/editor.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index 4fd6ab3b6..abb37819b 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -64,7 +64,9 @@ class ExternalEditor(QObject):
         """Clean up temporary files after the editor closed."""
         assert self._remove_file is not None
         if self._watcher:
-            self._watcher.removePaths(self._watcher.files())
+            failed = self._watcher.removePaths(self._watcher.files())
+            if failed:
+                log.procs.error("Failed to unwatch paths: {}".format(failed))
         if self._filename is None or not self._remove_file:
             # Could not create initial file.
             return
@@ -164,7 +166,9 @@ class ExternalEditor(QObject):
         executable = editor[0]
 
         if self._watcher:
-            self._watcher.addPath(self._filename)
+            ok = self._watcher.addPath(self._filename)
+            if not ok:
+                log.procs.error("Failed to watch path: {}".format(self._filename))
             self._watcher.fileChanged.connect(self._on_file_changed)
 
         args = [self._sub_placeholder(arg, line, column) for arg in editor[1:]]

From 35b56f265958c2141eb59313a7b244fc24c3e8b0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 09:51:06 +0100
Subject: [PATCH 294/574] Remove eslint max-lines suppression

We already turn that off globally now.
---
 qutebrowser/javascript/caret.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js
index 3a7bb5bde..5088c3e2f 100644
--- a/qutebrowser/javascript/caret.js
+++ b/qutebrowser/javascript/caret.js
@@ -1,4 +1,4 @@
-/* eslint-disable max-lines, max-len, max-statements, complexity,
+/* eslint-disable max-len, max-statements, complexity,
 max-params, default-case, valid-jsdoc */
 
 // Copyright 2014 The Chromium Authors. All rights reserved.

From b6f311f4b223b345c2e1c976eee0a4b408014718 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 09:52:14 +0100
Subject: [PATCH 295/574] Remove workaround for old pylint issue

---
 qutebrowser/mainwindow/mainwindow.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index 0e6b64936..e5257e558 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -105,8 +105,7 @@ def raise_window(window, alert=True):
         QApplication.instance().alert(window)
 
 
-# WORKAROUND for https://github.com/PyCQA/pylint/issues/1770
-def get_target_window():  # pylint: disable=inconsistent-return-statements
+def get_target_window():
     """Get the target window for new tabs, or None if none exist."""
     try:
         win_mode = config.val.new_instance_open_target_window

From 1da58b6a4cbbf455d5d92bea4a8812a8661d8ce0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 09:54:20 +0100
Subject: [PATCH 296/574] Break long line

---
 qutebrowser/misc/editor.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index abb37819b..80bf9cd16 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -168,7 +168,8 @@ class ExternalEditor(QObject):
         if self._watcher:
             ok = self._watcher.addPath(self._filename)
             if not ok:
-                log.procs.error("Failed to watch path: {}".format(self._filename))
+                log.procs.error("Failed to watch path: {}"
+                                .format(self._filename))
             self._watcher.fileChanged.connect(self._on_file_changed)
 
         args = [self._sub_placeholder(arg, line, column) for arg in editor[1:]]

From 9d32807e3333630bac025d18354958ae2a721348 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 10:20:30 +0100
Subject: [PATCH 297/574] Don't try to remove watched files if none exist

If we try to remove watched files but we couldn't actually watch any earlier,
we'd get a Qt warning message:

QtWarningMsg: QFileSystemWatcher::removePaths: list is empty
---
 qutebrowser/misc/editor.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index 80bf9cd16..154660001 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -63,10 +63,13 @@ class ExternalEditor(QObject):
     def _cleanup(self):
         """Clean up temporary files after the editor closed."""
         assert self._remove_file is not None
-        if self._watcher:
-            failed = self._watcher.removePaths(self._watcher.files())
+
+        watched_files = self._watcher.files() if self._watcher else []
+        if watched_files:
+            failed = self._watcher.removePaths(watched_files)
             if failed:
                 log.procs.error("Failed to unwatch paths: {}".format(failed))
+
         if self._filename is None or not self._remove_file:
             # Could not create initial file.
             return

From c520130389e1aee793532467d9c1cd634a5c6441 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 10:18:08 +0100
Subject: [PATCH 298/574] Add tests for a failing watch/unwatch

---
 tests/unit/misc/test_editor.py | 39 ++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/tests/unit/misc/test_editor.py b/tests/unit/misc/test_editor.py
index c9842cc7a..38d0808e9 100644
--- a/tests/unit/misc/test_editor.py
+++ b/tests/unit/misc/test_editor.py
@@ -211,6 +211,45 @@ def test_modify_watch(qtbot):
         editor._proc.finished.emit(0, QProcess.NormalExit)
 
 
+def test_failing_watch(qtbot, caplog, monkeypatch):
+    """When watching failed, an error should be logged.
+
+    Also, updating should still work when closing the process.
+    """
+    editor = editormod.ExternalEditor(watch=True)
+    monkeypatch.setattr(editor._watcher, 'addPath', lambda _path: False)
+
+    with caplog.at_level(logging.ERROR):
+        editor.edit('foo')
+
+    with qtbot.assert_not_emitted(editor.file_updated):
+        _update_file(editor._filename, 'bar')
+
+    with qtbot.wait_signal(editor.file_updated) as blocker:
+        editor._proc.finished.emit(0, QProcess.NormalExit)
+    assert blocker.args == ['bar']
+
+    message = 'Failed to watch path: {}'.format(editor._filename)
+    assert caplog.records[0].msg == message
+
+
+def test_failing_unwatch(qtbot, caplog, monkeypatch):
+    """When unwatching failed, an error should be logged."""
+    editor = editormod.ExternalEditor(watch=True)
+    monkeypatch.setattr(editor._watcher, 'addPath', lambda _path: True)
+    monkeypatch.setattr(editor._watcher, 'files', lambda: [editor._filename])
+    monkeypatch.setattr(editor._watcher, 'removePaths', lambda paths: paths)
+
+    editor.edit('foo')
+
+    with caplog.at_level(logging.ERROR):
+        editor._proc.finished.emit(0, QProcess.NormalExit)
+
+    message = 'Failed to unwatch paths: [{!r}]'.format(editor._filename)
+    assert caplog.records[-1].msg == message
+
+
+
 @pytest.mark.parametrize('text, caret_position, result', [
     ('', 0, (1, 1)),
     ('a', 0, (1, 1)),

From 53e7d13c2d35c083bf820fbfbcd8271f8001f52e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 10:42:55 +0100
Subject: [PATCH 299/574] Skip failing scrolling tests on Qt 5.10 on Travis

See #3572
---
 pytest.ini                            | 1 +
 tests/conftest.py                     | 4 ++++
 tests/end2end/features/scroll.feature | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/pytest.ini b/pytest.ini
index 56cd808ad..89571aebc 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -26,6 +26,7 @@ markers =
     this: Used to mark tests during development
     no_invalid_lines: Don't fail on unparseable lines in end2end tests
     issue2478: Tests which are broken on Windows with QtWebEngine, https://github.com/qutebrowser/qutebrowser/issues/2478
+    issue3572: Tests which are broken with QtWebEngine and Qt 5.10, https://github.com/qutebrowser/qutebrowser/issues/3572
     fake_os: Fake utils.is_* to a fake operating system
     unicode_locale: Tests which need an unicode locale to work
 qt_log_level_fail = WARNING
diff --git a/tests/conftest.py b/tests/conftest.py
index 7d6a0da09..d9d5fc034 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -64,6 +64,10 @@ def _apply_platform_markers(config, item):
         ('no_ci', 'CI' in os.environ, "Skipped on CI."),
         ('issue2478', utils.is_windows and config.webengine,
          "Broken with QtWebEngine on Windows"),
+        ('issue3572',
+         qtutils.version_check('5.10', compiled=False, exact=True) and
+         config.webengine and 'TRAVIS' in os.environ,
+         "Broken with QtWebEngine with Qt 5.10 on Travis"),
         ('unicode_locale', sys.getfilesystemencoding() == 'ascii',
          "Skipped because of ASCII locale"),
     ]
diff --git a/tests/end2end/features/scroll.feature b/tests/end2end/features/scroll.feature
index e77b57dc8..f73eb352b 100644
--- a/tests/end2end/features/scroll.feature
+++ b/tests/end2end/features/scroll.feature
@@ -233,6 +233,7 @@ Feature: Scrolling
         Then the page should be scrolled vertically
         
     # https://github.com/qutebrowser/qutebrowser/issues/1821
+    @issue3572
     Scenario: :scroll-to-perc without doctype
         When I open data/scroll/no_doctype.html
         And I run :scroll-to-perc 100
@@ -315,6 +316,7 @@ Feature: Scrolling
 
     ## issues
 
+    @issue3572
     Scenario: Relative scroll position with a position:absolute page
         When I open data/scroll/position_absolute.html
         And I run :scroll-to-perc 100

From 15fecc962d1c8b5ea88e2692cf473d872cc12cd3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 11:41:58 +0100
Subject: [PATCH 300/574] Fix lint

---
 tests/unit/misc/test_editor.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/misc/test_editor.py b/tests/unit/misc/test_editor.py
index 38d0808e9..8cf778d89 100644
--- a/tests/unit/misc/test_editor.py
+++ b/tests/unit/misc/test_editor.py
@@ -249,7 +249,6 @@ def test_failing_unwatch(qtbot, caplog, monkeypatch):
     assert caplog.records[-1].msg == message
 
 
-
 @pytest.mark.parametrize('text, caret_position, result', [
     ('', 0, (1, 1)),
     ('a', 0, (1, 1)),

From 950e4227e37ba1534d4bd61bfec0acce0f5d457a Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Thu, 8 Feb 2018 14:01:51 +0000
Subject: [PATCH 301/574] Pylint fix

---
 qutebrowser/utils/version.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index e246cb8c5..67bf5f423 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -485,4 +485,5 @@ def pastebin_version():
     pbclient.error.connect(_on_paste_version_err)
 
     pbclient.paste(getpass.getuser(),
-        "qute version info {}".format(qutebrowser.__version__), version())
+                   "qute version info {}".format(qutebrowser.__version__),
+                   version())

From ea80ded8d5057e7a8ad92315cae4a5e9088069ea Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 20:21:25 +0100
Subject: [PATCH 302/574] Try to stabilize editor end2end test

Let's also wait until we're sure the mtime changed here.
---
 tests/end2end/features/test_editor_bdd.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/end2end/features/test_editor_bdd.py b/tests/end2end/features/test_editor_bdd.py
index 2f425c41b..bc1397bf7 100644
--- a/tests/end2end/features/test_editor_bdd.py
+++ b/tests/end2end/features/test_editor_bdd.py
@@ -85,8 +85,13 @@ def set_up_editor_wait(quteproc, tmpdir, text):
         import signal
 
         def handle(sig, _frame):
-            with open(sys.argv[1], 'w', encoding='utf-8') as f:
-                f.write({text!r})
+            filename = sys.argv[1]
+            old_mtime = new_mtime = os.stat(filename).st_mtime
+            while old_mtime == new_mtime:
+                time.sleep(0.1)
+                with open(filename, 'w', encoding='utf-8') as f:
+                    f.write({text!r})
+                new_mtime = os.stat(filename).st_mtime
             if sig == signal.SIGUSR1:
                 sys.exit(0)
 

From e0dd7970d874518fbdbaef117a9cdae2f0b936ea Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 20:23:34 +0100
Subject: [PATCH 303/574] Skip fragment test

Looks like this now XPASSes with Qt 5.10 on Windows
---
 tests/end2end/features/marks.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/end2end/features/marks.feature b/tests/end2end/features/marks.feature
index f7da07255..ca05b7fad 100644
--- a/tests/end2end/features/marks.feature
+++ b/tests/end2end/features/marks.feature
@@ -73,7 +73,7 @@ Feature: Setting positional marks
         And I run :jump-mark b
         Then the error "Mark b is not set" should be shown
 
-    @qtwebengine_todo: Does not emit loaded signal for fragments? @flaky
+    @qtwebengine_skip: Does not emit loaded signal for fragments?
     Scenario: Jumping to a local mark after changing fragments
         When I open data/marks.html#top
         And I run :scroll 'top'

From 298dcb4c9057a483ecb125672ca554606fc4e3ec Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 21:46:03 +0100
Subject: [PATCH 304/574] Validate config separately from migrations

It makes for cleaner code, and it makes sure the target of renamed options
actually exists.
---
 qutebrowser/config/configfiles.py     |  9 ++++++---
 tests/unit/config/test_configfiles.py | 19 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 8a5cb6697..400816656 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -166,6 +166,7 @@ class YamlConfig(QObject):
         self._dirty = False
 
         self._handle_migrations()
+        self._validate()
 
     def _handle_migrations(self):
         """Handle unknown/renamed keys."""
@@ -178,9 +179,11 @@ class YamlConfig(QObject):
             elif name in configdata.MIGRATIONS.deleted:
                 log.config.debug("Removing {}".format(name))
                 del self._values[name]
-            elif name in configdata.DATA:
-                pass
-            else:
+
+    def _validate(self):
+        """Make sure all settings exist."""
+        for name in self._values:
+            if name not in configdata.DATA:
                 desc = configexc.ConfigErrorDesc(
                     "While loading options",
                     "Unknown option {}".format(name))
diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index d0f1ff0ee..d2f37ec25 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -145,7 +145,8 @@ class TestYaml:
         autoconfig = config_tmpdir / 'autoconfig.yml'
         autoconfig.write_text('global:\n  old: value', encoding='utf-8')
 
-        monkeypatch.setattr(configdata.MIGRATIONS, 'renamed', {'old': 'new'})
+        monkeypatch.setattr(configdata.MIGRATIONS, 'renamed',
+                            {'old': 'tabs.show'})
 
         yaml.load()
         yaml._save()
@@ -154,6 +155,22 @@ class TestYaml:
         assert '  old:' not in lines
         assert '  new:' not in lines
 
+    def test_renamed_key_unknown_target(self, monkeypatch, yaml, config_tmpdir):
+        """A key marked as renamed with invalid name should raise an error."""
+        autoconfig = config_tmpdir / 'autoconfig.yml'
+        autoconfig.write_text('global:\n  old: value', encoding='utf-8')
+
+        monkeypatch.setattr(configdata.MIGRATIONS, 'renamed',
+                            {'old': 'new'})
+
+        with pytest.raises(configexc.ConfigFileErrors) as excinfo:
+            yaml.load()
+
+        assert len(excinfo.value.errors) == 1
+        error = excinfo.value.errors[0]
+        assert error.text == "While loading options"
+        assert str(error.exception) == "Unknown option new"
+
     @pytest.mark.parametrize('old_config', [
         None,
         'global:\n  colors.hints.fg: magenta',

From 1a88b64c67f92ac4befa1eb5a2cc5c2fedfaea11 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 21:53:41 +0100
Subject: [PATCH 305/574] Add a test for keyconfig.get_command(...,
 default=True)

---
 tests/unit/config/test_config.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
index 1d1e1fc70..ce6e4e461 100644
--- a/tests/unit/config/test_config.py
+++ b/tests/unit/config/test_config.py
@@ -149,6 +149,14 @@ class TestKeyConfig:
         config_stub.val.bindings.commands = no_bindings
         assert key_config_stub.get_command('foobar', 'normal') is None
 
+    def test_get_command_default(self, key_config_stub, config_stub):
+        config_stub.val.bindings.default = {
+            'normal': {'x': 'message-info default'}}
+        config_stub.val.bindings.commands = {
+            'normal': {'x': 'message-info custom'}}
+        cmd = 'message-info default'
+        assert key_config_stub.get_command('x', 'normal', default=True) == cmd
+
     @pytest.mark.parametrize('bindings, expected', [
         # Simple
         ({'a': 'message-info foo', 'b': 'message-info bar'},

From 1a81f7231b35f22d36cd8dace44e9c2335689e4a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 22:02:22 +0100
Subject: [PATCH 306/574] Make sure multiple wrong keys are reported

---
 qutebrowser/config/configfiles.py     | 12 ++++++------
 tests/unit/config/test_configfiles.py | 14 ++++++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 400816656..77b5190ce 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -182,12 +182,12 @@ class YamlConfig(QObject):
 
     def _validate(self):
         """Make sure all settings exist."""
-        for name in self._values:
-            if name not in configdata.DATA:
-                desc = configexc.ConfigErrorDesc(
-                    "While loading options",
-                    "Unknown option {}".format(name))
-                raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
+        unknown = set(self._values) - set(configdata.DATA)
+        if unknown:
+            errors = [configexc.ConfigErrorDesc("While loading options",
+                                                "Unknown option {}".format(e))
+                      for e in sorted(unknown)]
+            raise configexc.ConfigFileErrors('autoconfig.yml', errors)
 
     def unset(self, name):
         """Remove the given option name if it's configured."""
diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index d2f37ec25..63f6fbd3f 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -127,6 +127,20 @@ class TestYaml:
         assert error.text == "While loading options"
         assert str(error.exception) == "Unknown option hello"
 
+    def test_multiple_unknown_keys(self, yaml, config_tmpdir):
+        """With multiple unknown settings, all should be shown."""
+        autoconfig = config_tmpdir / 'autoconfig.yml'
+        autoconfig.write_text('global:\n  one: 1\n  two: 2', encoding='utf-8')
+
+        with pytest.raises(configexc.ConfigFileErrors) as excinfo:
+            yaml.load()
+
+        assert len(excinfo.value.errors) == 2
+        error1, error2 = excinfo.value.errors
+        assert error1.text == error2.text == "While loading options"
+        assert str(error1.exception) == "Unknown option one"
+        assert str(error2.exception) == "Unknown option two"
+
     def test_deleted_key(self, monkeypatch, yaml, config_tmpdir):
         """A key marked as deleted should be removed."""
         autoconfig = config_tmpdir / 'autoconfig.yml'

From f92b52b20c1fb13d3763c3493cbee1289c5e2638 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 10:38:42 +0100
Subject: [PATCH 307/574] Update changelog

---
 doc/changelog.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index ea9025280..25ddb60ab 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -47,6 +47,8 @@ Changed
 - Tabs now show their full title as tooltip.
 - When an editor is spawned with `:open-editor` and `:config-edit`, the changes
   are now applied as soon as the file is saved in the editor.
+- When there are multiple unknown keys in a autoconfig.yml, they now all get
+  reported in one error.
 
 Fixed
 ~~~~~

From 589605fe92d6a055c5b9b32261aac1dcb81e2221 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 10:39:16 +0100
Subject: [PATCH 308/574] Fix lint

---
 tests/unit/config/test_configfiles.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index 63f6fbd3f..8659cf891 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -169,7 +169,8 @@ class TestYaml:
         assert '  old:' not in lines
         assert '  new:' not in lines
 
-    def test_renamed_key_unknown_target(self, monkeypatch, yaml, config_tmpdir):
+    def test_renamed_key_unknown_target(self, monkeypatch, yaml,
+                                        config_tmpdir):
         """A key marked as renamed with invalid name should raise an error."""
         autoconfig = config_tmpdir / 'autoconfig.yml'
         autoconfig.write_text('global:\n  old: value', encoding='utf-8')

From 3e38aab0f62ae936af0b7c1302f277621f6bede3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 11:31:25 +0100
Subject: [PATCH 309/574] Document configdata.Migrations

---
 qutebrowser/config/configdata.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py
index bcad53e00..3e0a6d8b1 100644
--- a/qutebrowser/config/configdata.py
+++ b/qutebrowser/config/configdata.py
@@ -54,7 +54,12 @@ class Option:
 @attr.s
 class Migrations:
 
-    """Nigrated options in configdata.yml."""
+    """Nigrated options in configdata.yml.
+
+    Attributes:
+        renamed: A dict mapping old option names to new names.
+        deleted: A list of option names which have been removed.
+    """
 
     renamed = attr.ib(default=attr.Factory(dict))
     deleted = attr.ib(default=attr.Factory(list))

From 7caab75fa4aa2756a4cc5fb2295c21462af7672e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 12:14:07 +0100
Subject: [PATCH 310/574] Clean up cycle-inputs.js

---
 scripts/cycle-inputs.js | 54 ++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/scripts/cycle-inputs.js b/scripts/cycle-inputs.js
index 94c50fb72..bb667bda7 100644
--- a/scripts/cycle-inputs.js
+++ b/scripts/cycle-inputs.js
@@ -9,38 +9,38 @@
  * By dive on freenode <dave@dawoodfall.net>
  */
 
-"use strict";
-var inputs = document.getElementsByTagName("input");
-var types = /text|password|date|email|month|number|range|search|tel|time|url|week/;
-var hidden = /hidden/;
-var found = false;
-var i = 0;
-var k = 0;
+(function() {
+    "use strict";
+    const inputs = document.getElementsByTagName("input");
+    const types = /text|password|date|email|month|number|range|search|tel|time|url|week/;
+    const hidden = /hidden/;
+    let found = false;
 
-function ishidden(el) {
-    return hidden.test(el.attributes.value) || el.offsetParent === null;
-}
-
-for (i = 0; i < inputs.length; i++) {
-    if (inputs[i] === document.activeElement) {
-        for (k = i + 1; k < inputs.length; k++) {
-            if (!ishidden(inputs[k]) && types.test(inputs[k].type)) {
-                inputs[k].focus();
-                found = true;
-                break;
-            }
-        }
-        break;
+    function ishidden(el) {
+        return hidden.test(el.attributes.value) || el.offsetParent === null;
     }
-}
 
-if (!found) {
-    for (i = 0; i < inputs.length; i++) {
-        if (!ishidden(inputs[i]) && types.test(inputs[i].type)) {
-            inputs[i].focus();
+    for (let i = 0; i < inputs.length; i++) {
+        if (inputs[i] === document.activeElement) {
+            for (let k = i + 1; k < inputs.length; k++) {
+                if (!ishidden(inputs[k]) && types.test(inputs[k].type)) {
+                    inputs[k].focus();
+                    found = true;
+                    break;
+                }
+            }
             break;
         }
     }
-}
+
+    if (!found) {
+        for (let i = 0; i < inputs.length; i++) {
+            if (!ishidden(inputs[i]) && types.test(inputs[i].type)) {
+                inputs[i].focus();
+                break;
+            }
+        }
+    }
+})();
 
 // vim: tw=0 expandtab tabstop=4 softtabstop=4 shiftwidth=4

From 89bd723eaaebe21e9f50bdc087aef45d1f812b6d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 13:18:12 +0100
Subject: [PATCH 311/574] Add scripts/*.js to MANIFEST.in

---
 MANIFEST.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index b20c2bc77..9dace6f98 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -8,7 +8,7 @@ graft icons
 graft doc/img
 graft misc/apparmor
 graft misc/userscripts
-recursive-include scripts *.py *.sh
+recursive-include scripts *.py *.sh *.js
 include qutebrowser/utils/testfile
 include qutebrowser/git-commit-id
 include LICENSE doc/* README.asciidoc

From 5d8b48a2ed82f831cd4a9a04d5e3094c88b30081 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 16:32:59 +0100
Subject: [PATCH 312/574] Show where a command handler is defined

---
 qutebrowser/commands/cmdutils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/commands/cmdutils.py b/qutebrowser/commands/cmdutils.py
index d261e5e86..f9ce91b8f 100644
--- a/qutebrowser/commands/cmdutils.py
+++ b/qutebrowser/commands/cmdutils.py
@@ -105,7 +105,8 @@ class register:  # noqa: N801,N806 pylint: disable=invalid-name
         else:
             assert isinstance(self._name, str), self._name
             name = self._name
-        log.commands.vdebug("Registering command {}".format(name))
+        log.commands.vdebug("Registering command {} (from {}:{})".format(
+            name, func.__module__, func.__qualname__))
         if name in cmd_dict:
             raise ValueError("{} is already registered!".format(name))
         cmd = command.Command(name=name, instance=self._instance,

From 9e524e4be8190ab2c4d90766d5d0633dae858b1c Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 12 Jan 2018 16:57:05 -0500
Subject: [PATCH 313/574] use tabs.mode_on_change to persist or restore mode

---
 qutebrowser/mainwindow/tabbedbrowser.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 824abf25b..4c8a81df3 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -651,17 +651,23 @@ class TabbedBrowser(tabwidget.TabWidget):
             log.webview.debug("on_current_changed got called with invalid "
                               "index {}".format(idx))
             return
+        if self._now_focused and config.val.tabs.mode_on_change == 'restore':
+            current_mode = modeman.instance(self._win_id).mode
+            if not current_mode in (usertypes.KeyMode.insert,usertypes.KeyMode.passthrough):
+                current_mode = usertypes.KeyMode.normal
+            self._now_focused.data.input_mode = current_mode
 
         log.modes.debug("Current tab changed, focusing {!r}".format(tab))
         tab.setFocus()
 
         modes_to_leave = [usertypes.KeyMode.hint, usertypes.KeyMode.caret]
-        if not config.val.tabs.persist_mode_on_change:
+        if not config.val.tabs.mode_on_change == 'persist':
             modes_to_leave += [usertypes.KeyMode.insert,
                                usertypes.KeyMode.passthrough]
         for mode in modes_to_leave:
             modeman.leave(self._win_id, mode, 'tab changed', maybe=True)
-
+        if config.val.tabs.mode_on_change == 'restore':
+            modeman.enter(self._win_id, tab.data.input_mode, 'restore input mode for tab')
         if self._now_focused is not None:
             objreg.register('last-focused-tab', self._now_focused, update=True,
                             scope='window', window=self._win_id)

From eb7e114e5f0064ee9c0b03a782435991bd4bcf85 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 12 Jan 2018 17:02:34 -0500
Subject: [PATCH 314/574] add propery to save tab input mode

---
 qutebrowser/browser/browsertab.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 2c0aa6722..893bbfd38 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -105,6 +105,7 @@ class TabData:
     override_target = attr.ib(None)
     pinned = attr.ib(False)
     fullscreen = attr.ib(False)
+    input_mode = usertypes.KeyMode.normal
 
 
 class AbstractAction:

From a7db197e45d341e4b85def4102d205f09b2d1fb4 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 12 Jan 2018 17:05:47 -0500
Subject: [PATCH 315/574] replace persist_mode_on_change with mode_on_change

supports old persist_mode_on_change functionality or new save/restore mode
---
 qutebrowser/config/configdata.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index e2daefe3b..680210175 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -1251,10 +1251,15 @@ tabs.padding:
   type: Padding
   desc: Padding (in pixels) around text for tabs.
 
-tabs.persist_mode_on_change:
-  default: false
-  type: Bool
-  desc: Stay in insert/passthrough mode when switching tabs.
+tabs.mode_on_change:
+  default: normal
+  type:
+    name: String
+    valid_values:
+      - persist: "retain the current mode."
+      - restore: "restore previously saved mode"
+      - normal:  "always revert to normal mode"
+  desc: When switching tabs, what input mode is applied.
 
 tabs.position:
   default: top

From 21fc848839b6ae7502ff97b72fa87edc8013133d Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sun, 14 Jan 2018 13:29:51 -0500
Subject: [PATCH 316/574] document code a bit more

---
 qutebrowser/browser/browsertab.py       | 1 +
 qutebrowser/mainwindow/tabbedbrowser.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 893bbfd38..a8ffedc01 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -98,6 +98,7 @@ class TabData:
                          Only used for QtWebKit.
         pinned: Flag to pin the tab.
         fullscreen: Whether the tab has a video shown fullscreen currently.
+        input_mode: current input mode for the tab. (insert, passthrough, normal)
     """
 
     keep_icon = attr.ib(False)
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 4c8a81df3..59e566a5a 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -653,6 +653,7 @@ class TabbedBrowser(tabwidget.TabWidget):
             return
         if self._now_focused and config.val.tabs.mode_on_change == 'restore':
             current_mode = modeman.instance(self._win_id).mode
+            # only save insert & passthrough mode. otherwise default to normal
             if not current_mode in (usertypes.KeyMode.insert,usertypes.KeyMode.passthrough):
                 current_mode = usertypes.KeyMode.normal
             self._now_focused.data.input_mode = current_mode

From f3b52aaf23f37c30f10136b4bd6def5074c99c76 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 15 Jan 2018 09:00:06 -0500
Subject: [PATCH 317/574] fix asciidoc for tabs.mode_on_change

---
 doc/help/settings.asciidoc        | 18 ++++++++++++------
 qutebrowser/config/configdata.yml |  6 +++---
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index c44dfb9a6..279e7889e 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -242,7 +242,7 @@
 |<<tabs.new_position.related,tabs.new_position.related>>|Position of new tabs opened from another tab.
 |<<tabs.new_position.unrelated,tabs.new_position.unrelated>>|Position of new tabs which aren't opened from another tab.
 |<<tabs.padding,tabs.padding>>|Padding (in pixels) around text for tabs.
-|<<tabs.persist_mode_on_change,tabs.persist_mode_on_change>>|Stay in insert/passthrough mode when switching tabs.
+|<<tabs.mode_on_change,tabs.mode_on_change>>|Set input mode behavior when switching tab.
 |<<tabs.pinned.shrink,tabs.pinned.shrink>>|Shrink pinned tabs down to their contents.
 |<<tabs.position,tabs.position>>|Position of the tab bar.
 |<<tabs.select_on_remove,tabs.select_on_remove>>|Which tab to select when the focused tab is removed.
@@ -2825,13 +2825,19 @@ Default:
 - +pass:[right]+: +pass:[5]+
 - +pass:[top]+: +pass:[0]+
 
-[[tabs.persist_mode_on_change]]
-=== tabs.persist_mode_on_change
-Stay in insert/passthrough mode when switching tabs.
+[[tabs.mode_on_change]]
+=== tabs.mode_on_change
+When switching tabs, what input mode is applied.
 
-Type: <<types,Bool>>
+Type: <<types,String>>
 
-Default: +pass:[false]+
+Valid values:
+
+ * +persist+: Retain the current mode.
+ * +restore+: Restore previously saved mode.
+ * +normal+: Always revert to normal mode.
+
+Default: +pass:[normal]+
 
 [[tabs.pinned.shrink]]
 === tabs.pinned.shrink
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 680210175..5e47eb84e 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -1256,9 +1256,9 @@ tabs.mode_on_change:
   type:
     name: String
     valid_values:
-      - persist: "retain the current mode."
-      - restore: "restore previously saved mode"
-      - normal:  "always revert to normal mode"
+      - persist: "Retain the current mode."
+      - restore: "Restore previously saved mode."
+      - normal:  "Always revert to normal mode."
   desc: When switching tabs, what input mode is applied.
 
 tabs.position:

From 91b70fab70e1688d768d2bc16efe73c590e4931a Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 15 Jan 2018 13:39:42 -0500
Subject: [PATCH 318/574] fix pylint/flake8 errors

---
 qutebrowser/mainwindow/tabbedbrowser.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 59e566a5a..617981988 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -654,7 +654,8 @@ class TabbedBrowser(tabwidget.TabWidget):
         if self._now_focused and config.val.tabs.mode_on_change == 'restore':
             current_mode = modeman.instance(self._win_id).mode
             # only save insert & passthrough mode. otherwise default to normal
-            if not current_mode in (usertypes.KeyMode.insert,usertypes.KeyMode.passthrough):
+            input_modes = (usertypes.KeyMode.insert, usertypes.KeyMode.passthrough)
+            if current_mode not in input_modes:
                 current_mode = usertypes.KeyMode.normal
             self._now_focused.data.input_mode = current_mode
 

From fecb551c5ee8912d45c89277a0e0d922b6f549b3 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 15 Jan 2018 16:19:38 -0500
Subject: [PATCH 319/574] shorten lines

---
 qutebrowser/browser/browsertab.py       | 2 +-
 qutebrowser/mainwindow/tabbedbrowser.py | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index a8ffedc01..e855edac7 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -98,7 +98,7 @@ class TabData:
                          Only used for QtWebKit.
         pinned: Flag to pin the tab.
         fullscreen: Whether the tab has a video shown fullscreen currently.
-        input_mode: current input mode for the tab. (insert, passthrough, normal)
+        input_mode: current input mode for the tab.
     """
 
     keep_icon = attr.ib(False)
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 617981988..3bd95a8e3 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -654,8 +654,8 @@ class TabbedBrowser(tabwidget.TabWidget):
         if self._now_focused and config.val.tabs.mode_on_change == 'restore':
             current_mode = modeman.instance(self._win_id).mode
             # only save insert & passthrough mode. otherwise default to normal
-            input_modes = (usertypes.KeyMode.insert, usertypes.KeyMode.passthrough)
-            if current_mode not in input_modes:
+            modes = (usertypes.KeyMode.insert, usertypes.KeyMode.passthrough)
+            if current_mode not in modes:
                 current_mode = usertypes.KeyMode.normal
             self._now_focused.data.input_mode = current_mode
 
@@ -669,7 +669,8 @@ class TabbedBrowser(tabwidget.TabWidget):
         for mode in modes_to_leave:
             modeman.leave(self._win_id, mode, 'tab changed', maybe=True)
         if config.val.tabs.mode_on_change == 'restore':
-            modeman.enter(self._win_id, tab.data.input_mode, 'restore input mode for tab')
+            modeman.enter(self._win_id, tab.data.input_mode,
+                          'restore input mode for tab')
         if self._now_focused is not None:
             objreg.register('last-focused-tab', self._now_focused, update=True,
                             scope='window', window=self._win_id)

From a3ce03e0bd8374d63e3d48aff0acf745f9a16eb2 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 9 Feb 2018 10:31:40 -0500
Subject: [PATCH 320/574] address requested changes

- syntax cleanup
- use attr.ib when declaring class attributes
- remove unnecessary comments
- code simplification
---
 qutebrowser/browser/browsertab.py       |  2 +-
 qutebrowser/mainwindow/tabbedbrowser.py | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index e855edac7..d73607929 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -106,7 +106,7 @@ class TabData:
     override_target = attr.ib(None)
     pinned = attr.ib(False)
     fullscreen = attr.ib(False)
-    input_mode = usertypes.KeyMode.normal
+    input_mode = attr.ib(usertypes.KeyMode.normal)
 
 
 class AbstractAction:
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 3bd95a8e3..cd9f52b37 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -643,6 +643,9 @@ class TabbedBrowser(tabwidget.TabWidget):
     @pyqtSlot(int)
     def on_current_changed(self, idx):
         """Set last-focused-tab and leave hinting mode when focus changed."""
+        mode_on_change = config.val.tabs.mode_on_change
+        modes_to_save = [usertypes.KeyMode.insert,
+                         usertypes.KeyMode.passthrough]
         if idx == -1 or self.shutting_down:
             # closing the last tab (before quitting) or shutting down
             return
@@ -651,11 +654,9 @@ class TabbedBrowser(tabwidget.TabWidget):
             log.webview.debug("on_current_changed got called with invalid "
                               "index {}".format(idx))
             return
-        if self._now_focused and config.val.tabs.mode_on_change == 'restore':
+        if self._now_focused is not None and mode_on_change == 'restore':
             current_mode = modeman.instance(self._win_id).mode
-            # only save insert & passthrough mode. otherwise default to normal
-            modes = (usertypes.KeyMode.insert, usertypes.KeyMode.passthrough)
-            if current_mode not in modes:
+            if current_mode not in modes_to_save:
                 current_mode = usertypes.KeyMode.normal
             self._now_focused.data.input_mode = current_mode
 
@@ -663,12 +664,11 @@ class TabbedBrowser(tabwidget.TabWidget):
         tab.setFocus()
 
         modes_to_leave = [usertypes.KeyMode.hint, usertypes.KeyMode.caret]
-        if not config.val.tabs.mode_on_change == 'persist':
-            modes_to_leave += [usertypes.KeyMode.insert,
-                               usertypes.KeyMode.passthrough]
+        if mode_on_change != 'persist':
+            modes_to_leave += modes_to_save
         for mode in modes_to_leave:
             modeman.leave(self._win_id, mode, 'tab changed', maybe=True)
-        if config.val.tabs.mode_on_change == 'restore':
+        if mode_on_change == 'restore':
             modeman.enter(self._win_id, tab.data.input_mode,
                           'restore input mode for tab')
         if self._now_focused is not None:

From 85dfe5c403b3edd8db05d83ec97b0c09a06ea2d0 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 9 Feb 2018 11:28:21 -0500
Subject: [PATCH 321/574] add special code to migrate
 tabs.persist_mode_on_change setting to tabs.mode_on_change.

---
 qutebrowser/config/configfiles.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 77b5190ce..7b1a26e71 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -180,6 +180,14 @@ class YamlConfig(QObject):
                 log.config.debug("Removing {}".format(name))
                 del self._values[name]
 
+        persist = 'tabs.persist_mode_on_change'
+        if persist in self._values:
+            if self._values[persist]:
+                self._values['tabs.mode_on_change'] = 'persist'
+            else:
+                self._values['tabs.mode_on_change'] = 'normal'
+            del self._values[persist]
+
     def _validate(self):
         """Make sure all settings exist."""
         unknown = set(self._values) - set(configdata.DATA)

From 9b7db8ee8a2bdd57cccd2de213a855d36d4da51a Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 9 Feb 2018 14:41:33 -0500
Subject: [PATCH 322/574] Need to mark config as dirty in _handle_migrations()

Add tests for tabs.persist_mode_on_change migration
---
 qutebrowser/config/configfiles.py     |  3 +--
 tests/unit/config/test_configfiles.py | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 7b1a26e71..e19e15695 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -179,14 +179,13 @@ class YamlConfig(QObject):
             elif name in configdata.MIGRATIONS.deleted:
                 log.config.debug("Removing {}".format(name))
                 del self._values[name]
-
         persist = 'tabs.persist_mode_on_change'
         if persist in self._values:
             if self._values[persist]:
                 self._values['tabs.mode_on_change'] = 'persist'
             else:
                 self._values['tabs.mode_on_change'] = 'normal'
-            del self._values[persist]
+            self.unset(persist)
 
     def _validate(self):
         """Make sure all settings exist."""
diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index 8659cf891..116d305d3 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -169,6 +169,30 @@ class TestYaml:
         assert '  old:' not in lines
         assert '  new:' not in lines
 
+    def test_merge_persist_false(self, monkeypatch, yaml, config_tmpdir):
+        """Migration of tabs.persist_mode_on_change: False."""
+        autoconfig = config_tmpdir / 'autoconfig.yml'
+        autoconfig.write_text('global:\n  tabs.persist_mode_on_change: False', encoding='utf-8')
+
+        yaml.load()
+        yaml._save()
+
+        lines = autoconfig.read_text('utf-8').splitlines()
+        assert '  tabs.persist_mode_on_change:' not in lines
+        assert '  tabs.mode_on_change: normal' in lines
+
+    def test_merge_persist_true(self, monkeypatch, yaml, config_tmpdir):
+        """Migration of tabs.persist_mode_on_change: True."""
+        autoconfig = config_tmpdir / 'autoconfig.yml'
+        autoconfig.write_text('global:\n  tabs.persist_mode_on_change: True', encoding='utf-8')
+
+        yaml.load()
+        yaml._save()
+
+        lines = autoconfig.read_text('utf-8').splitlines()
+        assert '  tabs.persist_mode_on_change:' not in lines
+        assert '  tabs.mode_on_change: persist' in lines
+
     def test_renamed_key_unknown_target(self, monkeypatch, yaml,
                                         config_tmpdir):
         """A key marked as renamed with invalid name should raise an error."""

From 57fe674dc442d8cf8dde9ef077e774c710cf57ea Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 9 Feb 2018 15:22:56 -0500
Subject: [PATCH 323/574] shorten lines

---
 tests/unit/config/test_configfiles.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index 116d305d3..101b883cd 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -172,7 +172,8 @@ class TestYaml:
     def test_merge_persist_false(self, monkeypatch, yaml, config_tmpdir):
         """Migration of tabs.persist_mode_on_change: False."""
         autoconfig = config_tmpdir / 'autoconfig.yml'
-        autoconfig.write_text('global:\n  tabs.persist_mode_on_change: False', encoding='utf-8')
+        autoconfig.write_text('global:\n  tabs.persist_mode_on_change: False',
+                              encoding='utf-8')
 
         yaml.load()
         yaml._save()
@@ -184,7 +185,8 @@ class TestYaml:
     def test_merge_persist_true(self, monkeypatch, yaml, config_tmpdir):
         """Migration of tabs.persist_mode_on_change: True."""
         autoconfig = config_tmpdir / 'autoconfig.yml'
-        autoconfig.write_text('global:\n  tabs.persist_mode_on_change: True', encoding='utf-8')
+        autoconfig.write_text('global:\n  tabs.persist_mode_on_change: True',
+                              encoding='utf-8')
 
         yaml.load()
         yaml._save()

From 9f49ac8e59bc7c420f55b36b3b2e02749fa1ca44 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 9 Feb 2018 15:25:20 -0500
Subject: [PATCH 324/574] revert "fix shorten line" from origin/master

---
 qutebrowser/browser/network/proxy.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/network/proxy.py b/qutebrowser/browser/network/proxy.py
index 9a1f80ae8..96be78742 100644
--- a/qutebrowser/browser/network/proxy.py
+++ b/qutebrowser/browser/network/proxy.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -61,7 +61,8 @@ class ProxyFactory(QNetworkProxyFactory):
         """
         proxy = config.val.content.proxy
         if proxy is configtypes.SYSTEM_PROXY:
-            # On Linux, use "export http_proxy=socks5://host:port" to manually set system proxy
+            # On Linux, use "export http_proxy=socks5://host:port" to manually
+            # set system proxy.
             # ref. http://doc.qt.io/qt-5/qnetworkproxyfactory.html#systemProxyForQuery
             proxies = QNetworkProxyFactory.systemProxyForQuery(query)
         elif isinstance(proxy, pac.PACFetcher):

From 74759fe04c0fa1d465cb36d3f8b00d6ebd9ef49d Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 9 Feb 2018 15:33:02 -0500
Subject: [PATCH 325/574] add missing decorator to _on_proc_finished

---
 qutebrowser/browser/commands.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 3619affc5..7b67133cb 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1218,6 +1218,7 @@ class CommandDispatcher:
         log.procs.debug("Executing {} with args {}, userscript={}".format(
             cmd, args, userscript))
 
+        @pyqtSlot()
         def _on_proc_finished():
             if output:
                 tb = objreg.get('tabbed-browser', scope='window',

From 0b5ba828db6d06c5aaa317ba4f58ccdd708899d3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 22:23:07 +0100
Subject: [PATCH 326/574] Add missing test

---
 tests/end2end/features/tabs.feature | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/end2end/features/tabs.feature b/tests/end2end/features/tabs.feature
index 1c670878e..065b92096 100644
--- a/tests/end2end/features/tabs.feature
+++ b/tests/end2end/features/tabs.feature
@@ -248,6 +248,18 @@ Feature: Tab management
             - data/numbers/2.txt
             - data/numbers/3.txt
 
+    Scenario: :tab-focus with current tab number and --no-last
+        When I open data/numbers/1.txt
+        And I open data/numbers/2.txt in a new tab
+        And I open data/numbers/3.txt in a new tab
+        And I run :tab-focus 1
+        And I run :tab-focus 3
+        And I run :tab-focus --no-last 3
+        Then the following tabs should be open:
+            - data/numbers/1.txt
+            - data/numbers/2.txt
+            - data/numbers/3.txt (active)
+
     Scenario: :tab-focus with -1
         When I open data/numbers/1.txt
         And I open data/numbers/2.txt in a new tab

From 7058a3be742257ab6cd28451aaab3838281c58d8 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 22:25:39 +0100
Subject: [PATCH 327/574] Regenerate docs

---
 doc/help/commands.asciidoc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 82c714cdf..97ce1a41f 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -519,7 +519,8 @@ Show help about a command or setting.
 
 [[hint]]
 === hint
-Syntax: +:hint [*--mode* 'mode'] [*--add-history*] [*--rapid*] ['group'] ['target'] ['args' ['args' ...]]+
+Syntax: +:hint [*--mode* 'mode'] [*--add-history*] [*--rapid*]
+     ['group'] ['target'] ['args' ['args' ...]]+
 
 Start hinting.
 
@@ -769,7 +770,8 @@ Do nothing.
 
 [[open]]
 === open
-Syntax: +:open [*--related*] [*--bg*] [*--tab*] [*--window*] [*--secure*] [*--private*] ['url']+
+Syntax: +:open [*--related*] [*--bg*] [*--tab*] [*--window*] [*--secure*] [*--private*]
+     ['url']+
 
 Open a URL in the current/[count]th tab.
 
@@ -1089,7 +1091,9 @@ Load a session.
 
 [[session-save]]
 === session-save
-Syntax: +:session-save [*--current*] [*--quiet*] [*--force*] [*--only-active-window*] [*--with-private*] ['name']+
+Syntax: +:session-save [*--current*] [*--quiet*] [*--force*] [*--only-active-window*]
+             [*--with-private*]
+             ['name']+
 
 Save a session.
 

From 1ed427c3423828dcaffe3b043742e3b6eece3674 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 22:27:05 +0100
Subject: [PATCH 328/574] Update changelog

---
 doc/changelog.asciidoc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 25ddb60ab..2c34e8005 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -28,6 +28,10 @@ Added
 - QtWebEngine: Retrying downloads is now supported with Qt 5.10 or newer.
 - QtWebEngine: Hinting and other features inside same-origin frames is now
   supported.
+- New `cycle-inputs.js` script in `scripts/` which can be used with `:jseval -f`
+  to cycle through inputs.
+- New `--no-last` flag for `:tab-focus` to not focus the last tab when focusing
+  the currently focused one.
 
 Changed
 ~~~~~~~

From 16a3bece348a4cbcabe9f7a107d6c6c5ab8cf4f6 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 22:28:14 +0100
Subject: [PATCH 329/574] Add missing import

---
 qutebrowser/browser/commands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index ceb3d1c88..12e06d75c 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -26,7 +26,7 @@ import functools
 import typing
 
 from PyQt5.QtWidgets import QApplication, QTabBar, QDialog
-from PyQt5.QtCore import Qt, QUrl, QEvent, QUrlQuery
+from PyQt5.QtCore import pyqtSlot, Qt, QUrl, QEvent, QUrlQuery
 from PyQt5.QtGui import QKeyEvent
 from PyQt5.QtPrintSupport import QPrintDialog, QPrintPreviewDialog
 

From c82be35639f915cc40dcfc27cd0d1eaf9eee2a03 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 22:29:40 +0100
Subject: [PATCH 330/574] Update changelog

---
 doc/changelog.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 2c34e8005..a94f174a4 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -65,6 +65,8 @@ Fixed
   correctly when filtering them in the completion.
 - `:bookmark-add "" foo` can now be used to save the current URL with a custom
   title.
+- `:spawn -o` now waits until the process has finished before trying to show the
+  output. Previously, it incorrectly showed the previous output immediately.
 
 Removed
 ~~~~~~~

From 3779f59a230761d486c29363ac6129641bfeb6ba Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 22:48:51 +0100
Subject: [PATCH 331/574] Update changelog

---
 doc/changelog.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index a94f174a4..6a1037b1b 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -67,6 +67,8 @@ Fixed
   title.
 - `:spawn -o` now waits until the process has finished before trying to show the
   output. Previously, it incorrectly showed the previous output immediately.
+- QtWebEngine: Qt download objects are now cleaned up properly when a download
+  is removed.
 
 Removed
 ~~~~~~~

From b648345bf84ba072ce991d6a8c1913a227e22903 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 22:50:36 +0100
Subject: [PATCH 332/574] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 6a1037b1b..44c4ff39c 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -69,6 +69,7 @@ Fixed
   output. Previously, it incorrectly showed the previous output immediately.
 - QtWebEngine: Qt download objects are now cleaned up properly when a download
   is removed.
+- Suspended pages now should always load the correct page when being un-suspended.
 
 Removed
 ~~~~~~~

From d88a13598a525bf0bed623576af9deee6f8d5061 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 9 Feb 2018 17:14:40 -0500
Subject: [PATCH 333/574] syntax improvements and use real class attributes

---
 qutebrowser/browser/browsertab.py             |  3 ++
 qutebrowser/browser/shared.py                 | 50 ++++++++++++-------
 qutebrowser/browser/webengine/webenginetab.py | 16 +++---
 .../browser/webkit/network/networkmanager.py  |  6 ++-
 qutebrowser/browser/webkit/webkittab.py       |  6 +--
 5 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 331934cb9..677ed7a97 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -99,6 +99,7 @@ class TabData:
                          Only used for QtWebKit.
         pinned: Flag to pin the tab.
         fullscreen: Whether the tab has a video shown fullscreen currently.
+        netrc_used: Whether netrc authentication was performed.
     """
 
     keep_icon = attr.ib(False)
@@ -107,6 +108,7 @@ class TabData:
     override_target = attr.ib(None)
     pinned = attr.ib(False)
     fullscreen = attr.ib(False)
+    netrc_used = attr.ib(False)
 
 
 class AbstractAction:
@@ -762,6 +764,7 @@ class AbstractTab(QWidget):
         else:
             self._set_load_status(usertypes.LoadStatus.error)
         self.load_finished.emit(ok)
+
         if not self.title():
             self.title_changed.emit(self.url().toDisplayString())
         self.zoom.set_current()
diff --git a/qutebrowser/browser/shared.py b/qutebrowser/browser/shared.py
index e6084a7f8..1e2398783 100644
--- a/qutebrowser/browser/shared.py
+++ b/qutebrowser/browser/shared.py
@@ -265,26 +265,38 @@ def get_user_stylesheet():
 
 
 def netrc_authentication(url, authenticator):
-    """performs authorization using netrc."""
-    if 'HOME' in os.environ:
+    """Perform authorization using netrc.
+
+    Args:
+        url: The URL the request was done for.
+        authenticator: QAuthenticator object used to set credentials provided.
+
+    Return:
+        True if netrc found credentials for the URL.
+        False otherwise.
+    """
+    if 'HOME' not in os.environ:
         # We'll get an OSError by netrc if 'HOME' isn't available in
         # os.environ. We don't want to log that, so we prevent it
         # altogether.
-        user, password = None, None
-        try:
-            net = netrc.netrc(config.val.content.netrc_file)
-            authenticators = net.authenticators(url.host())
-            if authenticators is not None:
-                (user, _account, password) = authenticators
-        except FileNotFoundError:
-            log.misc.debug("No .netrc file found")
-        except OSError:
-            log.misc.exception("Unable to read the netrc file")
-        except netrc.NetrcParseError:
-            log.misc.exception("Error when parsing the netrc file")
+        return False
+    user, password = None, None
+    try:
+        net = netrc.netrc(config.val.content.netrc_file)
+        authenticators = net.authenticators(url.host())
+        if authenticators is not None:
+            (user, _account, password) = authenticators
+    except FileNotFoundError:
+        log.misc.debug("No .netrc file found")
+    except OSError:
+        log.misc.exception("Unable to read the netrc file")
+    except netrc.NetrcParseError:
+        log.misc.exception("Error when parsing the netrc file")
 
-        if user is not None:
-            authenticator.setUser(user)
-            authenticator.setPassword(password)
-            return True
-    return False
+    if user is None:
+        return False
+
+    authenticator.setUser(user)
+    authenticator.setPassword(password)
+
+    return True
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 838bf3b55..0dd6d565b 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -739,15 +739,15 @@ class WebEngineTab(browsertab.AbstractTab):
 
     @pyqtSlot(QUrl, 'QAuthenticator*')
     def _on_authentication_required(self, url, authenticator):
-        netrc = None
-        if not hasattr(self, 'netrc_used'):
-            setattr(self, 'netrc_used', True)
-            netrc = shared.netrc_authentication(url, authenticator)
-        if not netrc:
+        netrc_success = False
+        if not self.data.netrc_used:
+            self.data.netrc_used = True
+            netrc_success = shared.netrc_authentication(url, authenticator)
+        if not netrc_success:
             abort_on = [self.shutting_down, self.load_started]
             answer = shared.authentication_required(url, authenticator,
                                                     abort_on)
-        if not netrc and answer is None:
+        if not netrc_success and answer is None:
             try:
                 # pylint: disable=no-member, useless-suppression
                 sip.assign(authenticator, QAuthenticator())
@@ -783,8 +783,8 @@ class WebEngineTab(browsertab.AbstractTab):
             # https://bugreports.qt.io/browse/QTBUG-61506
             self.search.clear()
         super()._on_load_started()
-        if hasattr(self, 'netrc_used'):
-            delattr(self, 'netrc_used')
+        if self.data.netrc_used:
+            self.data.netrc_used = False
 
     @pyqtSlot(QWebEnginePage.RenderProcessTerminationStatus, int)
     def _on_render_process_terminated(self, status, exitcode):
diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py
index 90761d0fc..2f883b6be 100644
--- a/qutebrowser/browser/webkit/network/networkmanager.py
+++ b/qutebrowser/browser/webkit/network/networkmanager.py
@@ -129,6 +129,7 @@ class NetworkManager(QNetworkAccessManager):
         _rejected_ssl_errors: A {QUrl: [SslError]} dict of rejected errors.
         _accepted_ssl_errors: A {QUrl: [SslError]} dict of accepted errors.
         _private: Whether we're in private browsing mode.
+        netrc_used: Whether netrc authentication was performed.
 
     Signals:
         shutting_down: Emitted when the QNAM is shutting down.
@@ -159,6 +160,7 @@ class NetworkManager(QNetworkAccessManager):
         self.authenticationRequired.connect(self.on_authentication_required)
         self.proxyAuthenticationRequired.connect(
             self.on_proxy_authentication_required)
+        self.netrc_used = False
 
     def _set_cookiejar(self):
         """Set the cookie jar of the NetworkManager correctly."""
@@ -269,8 +271,8 @@ class NetworkManager(QNetworkAccessManager):
     def on_authentication_required(self, reply, authenticator):
         """Called when a website needs authentication."""
         netrc = False
-        if not hasattr(self, 'netrc_used'):
-            setattr(self, 'netrc_used', True)
+        if not self.netrc_used:
+            self.netrc_used = True
             netrc = shared.netrc_authentication(reply.url(), authenticator)
         if not netrc:
             abort_on = self._get_abort_signals(reply)
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 29df35e8f..49b24d251 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -707,9 +707,9 @@ class WebKitTab(browsertab.AbstractTab):
     @pyqtSlot()
     def _on_load_started(self):
         super()._on_load_started()
-        obj = self.networkaccessmanager()
-        if hasattr(obj, 'netrc_used'):
-            delattr(obj, 'netrc_used')
+        nam = self.networkaccessmanager()
+        if nam.netrc_used:
+            nam.netrc_used = False
 
     @pyqtSlot()
     def _on_frame_load_finished(self):

From 504e29c004004a96dd9687afbc21e619689d0828 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 9 Feb 2018 21:25:11 -0500
Subject: [PATCH 334/574] fix configfiles tests

- fix test_renamed_key()
- fix test_deleted_key()
- combine both test_merge_persist tests using @pytest.mark.parametrize
- fix _handle_migrations(): mark data dirty for renamed and deleted
---
 qutebrowser/config/configfiles.py     |  4 ++--
 tests/unit/config/test_configfiles.py | 32 +++++++++------------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index e19e15695..2220de93d 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -175,10 +175,10 @@ class YamlConfig(QObject):
                 new_name = configdata.MIGRATIONS.renamed[name]
                 log.config.debug("Renaming {} to {}".format(name, new_name))
                 self._values[new_name] = self._values[name]
-                del self._values[name]
+                self.unset(name)
             elif name in configdata.MIGRATIONS.deleted:
                 log.config.debug("Removing {}".format(name))
-                del self._values[name]
+                self.unset(name)
         persist = 'tabs.persist_mode_on_change'
         if persist in self._values:
             if self._values[persist]:
diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index 101b883cd..341fad689 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -152,7 +152,7 @@ class TestYaml:
         yaml._save()
 
         lines = autoconfig.read_text('utf-8').splitlines()
-        assert '  hello:' not in lines
+        assert '  hello: world' not in lines
 
     def test_renamed_key(self, monkeypatch, yaml, config_tmpdir):
         """A key marked as renamed should be renamed properly."""
@@ -166,34 +166,22 @@ class TestYaml:
         yaml._save()
 
         lines = autoconfig.read_text('utf-8').splitlines()
-        assert '  old:' not in lines
-        assert '  new:' not in lines
+        assert '  old: value' not in lines
+        assert '  tabs.show: value' in lines
 
-    def test_merge_persist_false(self, monkeypatch, yaml, config_tmpdir):
-        """Migration of tabs.persist_mode_on_change: False."""
+    @pytest.mark.parametrize('persist', [True, False])
+    def test_merge_persist(self, yaml, config_tmpdir, persist):
+        """Tests for migration of tabs.persist_mode_on_change."""
         autoconfig = config_tmpdir / 'autoconfig.yml'
-        autoconfig.write_text('global:\n  tabs.persist_mode_on_change: False',
-                              encoding='utf-8')
-
+        autoconfig.write_text('global:\n  tabs.persist_mode_on_change: {}'.
+                              format(persist), encoding='utf-8')
         yaml.load()
         yaml._save()
 
         lines = autoconfig.read_text('utf-8').splitlines()
+        mode = 'persist' if persist else 'normal'
         assert '  tabs.persist_mode_on_change:' not in lines
-        assert '  tabs.mode_on_change: normal' in lines
-
-    def test_merge_persist_true(self, monkeypatch, yaml, config_tmpdir):
-        """Migration of tabs.persist_mode_on_change: True."""
-        autoconfig = config_tmpdir / 'autoconfig.yml'
-        autoconfig.write_text('global:\n  tabs.persist_mode_on_change: True',
-                              encoding='utf-8')
-
-        yaml.load()
-        yaml._save()
-
-        lines = autoconfig.read_text('utf-8').splitlines()
-        assert '  tabs.persist_mode_on_change:' not in lines
-        assert '  tabs.mode_on_change: persist' in lines
+        assert '  tabs.mode_on_change: {}'.format(mode) in lines
 
     def test_renamed_key_unknown_target(self, monkeypatch, yaml,
                                         config_tmpdir):

From c6ad23f9215f361426b254734ec5c4168fc55a94 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 10 Feb 2018 00:38:27 -0500
Subject: [PATCH 335/574] address all mentionned issues except for file://

- re-encode url using QUrl.RemovePassword | QUrl.FullyEncoded
- improve readability for clipboard / primary selection code block
---
 qutebrowser/browser/downloads.py              |  2 +-
 qutebrowser/browser/shared.py                 | 12 ++++++------
 qutebrowser/browser/webengine/webenginetab.py |  2 +-
 qutebrowser/browser/webkit/webpage.py         |  2 +-
 qutebrowser/mainwindow/prompt.py              | 14 +++++++-------
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index d174ebdd2..b90571fa5 100644
--- a/qutebrowser/browser/downloads.py
+++ b/qutebrowser/browser/downloads.py
@@ -166,7 +166,7 @@ def get_filename_question(*, suggested_filename, url, parent=None):
     q.title = "Save file to:"
     q.text = "Please enter a location for <b>{}</b>".format(
         html.escape(url.toDisplayString()))
-    q.url = url.toString(QUrl.RemoveUserInfo)
+    q.url = url.toString(QUrl.RemovePassword | QUrl.FullyEncoded)
     q.mode = usertypes.PromptMode.download
     q.completed.connect(q.deleteLater)
     q.default = _path_suggestion(suggested_filename)
diff --git a/qutebrowser/browser/shared.py b/qutebrowser/browser/shared.py
index 43486b8f8..b2baabd36 100644
--- a/qutebrowser/browser/shared.py
+++ b/qutebrowser/browser/shared.py
@@ -62,7 +62,7 @@ def authentication_required(url, authenticator, abort_on):
     else:
         msg = '<b>{}</b> needs authentication'.format(
             html.escape(url.toDisplayString()))
-    urlstr = url.toString(QUrl.RemoveUserInfo)
+    urlstr = url.toString(QUrl.RemovePassword | QUrl.FullyEncoded)
     answer = message.ask(title="Authentication required", text=msg,
                          mode=usertypes.PromptMode.user_pwd,
                          abort_on=abort_on, url=urlstr)
@@ -80,7 +80,7 @@ def javascript_confirm(url, js_msg, abort_on):
 
     msg = 'From <b>{}</b>:<br/>{}'.format(html.escape(url.toDisplayString()),
                                           html.escape(js_msg))
-    urlstr = url.toString(QUrl.RemoveUserInfo)
+    urlstr = url.toString(QUrl.RemovePassword | QUrl.FullyEncoded)
     ans = message.ask('Javascript confirm', msg,
                       mode=usertypes.PromptMode.yesno,
                       abort_on=abort_on, url=urlstr)
@@ -97,7 +97,7 @@ def javascript_prompt(url, js_msg, default, abort_on):
 
     msg = '<b>{}</b> asks:<br/>{}'.format(html.escape(url.toDisplayString()),
                                           html.escape(js_msg))
-    urlstr = url.toString(QUrl.RemoveUserInfo)
+    urlstr = url.toString(QUrl.RemovePassword | QUrl.FullyEncoded)
     answer = message.ask('Javascript prompt', msg,
                          mode=usertypes.PromptMode.text,
                          default=default,
@@ -120,7 +120,7 @@ def javascript_alert(url, js_msg, abort_on):
 
     msg = 'From <b>{}</b>:<br/>{}'.format(html.escape(url.toDisplayString()),
                                           html.escape(js_msg))
-    urlstr = url.toString(QUrl.RemoveUserInfo)
+    urlstr = url.toString(QUrl.RemovePassword | QUrl.FullyEncoded)
     message.ask('Javascript alert', msg, mode=usertypes.PromptMode.alert,
                 abort_on=abort_on, url=urlstr)
 
@@ -169,7 +169,7 @@ def ignore_certificate_errors(url, errors, abort_on):
         """.strip())
         msg = err_template.render(url=url, errors=errors)
 
-        urlstr = url.toString(QUrl.RemoveUserInfo)
+        urlstr = url.toString(QUrl.RemovePassword | QUrl.FullyEncoded)
         ignore = message.ask(title="Certificate errors - continue?", text=msg,
                              mode=usertypes.PromptMode.yesno, default=False,
                              abort_on=abort_on, url=urlstr)
@@ -208,7 +208,7 @@ def feature_permission(url, option, msg, yes_action, no_action, abort_on):
     config_val = config.instance.get(option)
     if config_val == 'ask':
         if url.isValid():
-            urlstr = url.toString(QUrl.RemoveUserInfo)
+            urlstr = url.toString(QUrl.RemovePassword | QUrl.FullyEncoded)
             text = "Allow the website at <b>{}</b> to {}?".format(
                 html.escape(url.toDisplayString()), msg)
         else:
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index c7e6dfef3..1bf9ceb03 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -753,7 +753,7 @@ class WebEngineTab(browsertab.AbstractTab):
         """Called when a proxy needs authentication."""
         msg = "<b>{}</b> requires a username and password.".format(
             html_utils.escape(proxy_host))
-        urlstr = url.toString(QUrl.RemoveUserInfo)
+        urlstr = url.toString(QUrl.RemovePassword | QUrl.FullyEncoded)
         answer = message.ask(
             title="Proxy authentication required", text=msg,
             mode=usertypes.PromptMode.user_pwd,
diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index b1aaf3a45..abdca68dc 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -148,7 +148,7 @@ class BrowserPage(QWebPage):
                 text="URL: <b>{}</b>".format(
                     html.escape(url.toDisplayString())),
                 yes_action=functools.partial(QDesktopServices.openUrl, url),
-                url=urlstr)
+                url=info.url.toString(QUrl.FullyEncoded))
             return True
         elif (info.domain, info.error) in ignored_errors:
             log.webview.debug("Ignored error on {}: {} (error domain: {}, "
diff --git a/qutebrowser/mainwindow/prompt.py b/qutebrowser/mainwindow/prompt.py
index aff6701fc..b502f1f3d 100644
--- a/qutebrowser/mainwindow/prompt.py
+++ b/qutebrowser/mainwindow/prompt.py
@@ -432,16 +432,16 @@ class PromptContainer(QWidget):
             sel: Use the primary selection instead of the clipboard.
         """
         question = self._prompt.question
-        if not question.url:
+        if question.url is None:
             message.error('No URL found.')
             return
-        s = question.url
-        target = 'primary selection'
-        if not (sel and utils.supports_selection()):
-            target = 'clipboard'
+        if sel and utils.supports_selection():
+            target = 'primary selection'
+        else:
             sel = False
-        utils.set_clipboard(s, sel)
-        message.info("Yanked to {}: {}".format(target, s))
+            target = 'clipboard'
+        utils.set_clipboard(question.url, sel)
+        message.info("Yanked to {}: {}".format(target, question.url))
 
 
 class LineEdit(QLineEdit):

From 995e5633521d063bcdeb5d07148e5e0984e98012 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 10:36:58 +0100
Subject: [PATCH 336/574] Update docs

---
 doc/changelog.asciidoc          | 3 +++
 doc/help/commands.asciidoc      | 5 +++++
 qutebrowser/browser/commands.py | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 44c4ff39c..b757745a4 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -32,6 +32,7 @@ Added
   to cycle through inputs.
 - New `--no-last` flag for `:tab-focus` to not focus the last tab when focusing
   the currently focused one.
+- New `--edit` flag for `:view-source` to open the source in an external editor.
 
 Changed
 ~~~~~~~
@@ -76,6 +77,8 @@ Removed
 
 - `QUTE_SELECTED_HTML` is now not set for userscripts anymore except when called
   via hints.
+- The `qutebrowser_viewsource` userscript has been removed as `:view-source
+  --edit` can now be used.
 
 v1.1.1
 ------
diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 97ce1a41f..bd84417d7 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -1326,8 +1326,13 @@ Show version information.
 
 [[view-source]]
 === view-source
+Syntax: +:view-source [*--edit*]+
+
 Show the source of the current page in a new tab.
 
+==== optional arguments
+* +*-e*+, +*--edit*+: Edit the source in the editor instead of opening a tab.
+
 [[window-only]]
 === window-only
 Close all windows except for the current one.
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index a7f4e8c4d..a59cdac25 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1511,7 +1511,8 @@ class CommandDispatcher:
         """Show the source of the current page in a new tab.
 
         Args:
-            edit: Open source in editor instead of tab."""
+            edit: Edit the source in the editor instead of opening a tab.
+        """
         tab = self._current_widget()
         try:
             current_url = self._current_url()

From 4e4a1d01c4ed258c726fb1920c49d97ccd916eae Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 10:37:05 +0100
Subject: [PATCH 337/574] Remove qutebrowser_viewsource userscript

:view-source --edit can now be used instead.
---
 misc/userscripts/qutebrowser_viewsource | 33 -------------------------
 1 file changed, 33 deletions(-)
 delete mode 100755 misc/userscripts/qutebrowser_viewsource

diff --git a/misc/userscripts/qutebrowser_viewsource b/misc/userscripts/qutebrowser_viewsource
deleted file mode 100755
index a8ad71de3..000000000
--- a/misc/userscripts/qutebrowser_viewsource
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright 2015 Zach-Button <zachrey.button@gmail.com>
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
-#
-# This file is part of qutebrowser.
-#
-# qutebrowser is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# qutebrowser is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
-
-#
-# This script fetches the unprocessed HTML source for a page and opens it in vim.
-#	:bind gf spawn --userscript qutebrowser_viewsource
-#
-# Caveat: Does not use authentication of any kind. Add it in if you want it to.
-#
-
-path=$(mktemp --tmpdir qutebrowser_XXXXXXXX.html)
-
-curl "$QUTE_URL" > "$path"
-urxvt -e vim "$path"
-
-rm "$path"

From 11a0580e6431b07f50098f762e605c87e4d3eb30 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 10:41:57 +0100
Subject: [PATCH 338/574] Fix Qt spelling

---
 doc/faq.asciidoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/faq.asciidoc b/doc/faq.asciidoc
index 9c8c51f16..8bbc1e5d0 100644
--- a/doc/faq.asciidoc
+++ b/doc/faq.asciidoc
@@ -218,7 +218,7 @@ And then re-emerging qtwebengine with: +
 
 Unable to view DRM content (Netflix, Spotify, etc.).::
     You will need to install `widevine` and set `qt.args` to point to it.
-    QT5.9 currently only supports widevine up to Chrome version 61.
+    Qt 5.9 currently only supports widevine up to Chrome version 61.
 +
 On Arch, simply install `qt5-webengine-widevine` from the AUR and run:
 +
@@ -230,7 +230,7 @@ On Arch, simply install `qt5-webengine-widevine` from the AUR and run:
 For other distributions, download the chromium tarball and widevine-cdm zip from
 https://aur.archlinux.org/packages/qt5-webengine-widevine/[the AUR page],
 extract `libwidevinecdmadapter.so` and `libwidevinecdm.so` files, respectively,
-and move them to the `ppapi` plugin directory in your QT library directory (create it if it does not exist).
+and move them to the `ppapi` plugin directory in your Qt library directory (create it if it does not exist).
 +
 Lastly, set your `qt.args` to point to that directory and restart qutebrowser:
 +

From 4ac4833c9364b8192e65671d4b74d9b7c522e608 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 11:44:18 +0100
Subject: [PATCH 339/574] Clean up YamlConfig._handle_migrations

---
 qutebrowser/config/configfiles.py | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 2220de93d..692474075 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -169,23 +169,30 @@ class YamlConfig(QObject):
         self._validate()
 
     def _handle_migrations(self):
-        """Handle unknown/renamed keys."""
+        """Migrate older configs to the newest format."""
+        # Simple renamed/deleted options
         for name in list(self._values):
             if name in configdata.MIGRATIONS.renamed:
                 new_name = configdata.MIGRATIONS.renamed[name]
                 log.config.debug("Renaming {} to {}".format(name, new_name))
                 self._values[new_name] = self._values[name]
-                self.unset(name)
+                del self._values[name]
+                self._mark_changed()
             elif name in configdata.MIGRATIONS.deleted:
                 log.config.debug("Removing {}".format(name))
-                self.unset(name)
-        persist = 'tabs.persist_mode_on_change'
-        if persist in self._values:
-            if self._values[persist]:
-                self._values['tabs.mode_on_change'] = 'persist'
+                del self._values[name]
+                self._mark_changed()
+
+        # tabs.persist_mode_on_change got merged into tabs.mode_on_change
+        old = 'tabs.persist_mode_on_change'
+        new = 'tabs.mode_on_change'
+        if old in self._values:
+            if self._values[old]:
+                self._values[new] = 'persist'
             else:
-                self._values['tabs.mode_on_change'] = 'normal'
-            self.unset(persist)
+                self._values[new] = 'normal'
+            del self._values[old]
+            self._mark_changed()
 
     def _validate(self):
         """Make sure all settings exist."""

From 5662407e01f6654d94603596b3d21227bbbedfe2 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 11:51:51 +0100
Subject: [PATCH 340/574] Update docs

---
 doc/changelog.asciidoc     |  5 +++++
 doc/help/settings.asciidoc | 30 +++++++++++++++---------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index b757745a4..6fb47ae9d 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -54,6 +54,9 @@ Changed
   are now applied as soon as the file is saved in the editor.
 - When there are multiple unknown keys in a autoconfig.yml, they now all get
   reported in one error.
+- New `tabs.mode_on_change` setting which replaces
+  `tabs.persist_mode_on_change`. It can now be set to `restore` which remembers
+  input modes (input/passthrough) per tab.
 
 Fixed
 ~~~~~
@@ -79,6 +82,8 @@ Removed
   via hints.
 - The `qutebrowser_viewsource` userscript has been removed as `:view-source
   --edit` can now be used.
+- The `tabs.persist_mode_on_change` setting has been removed and replaced by
+  `tabs.mode_on_change`.
 
 v1.1.1
 ------
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 279e7889e..53dce9e8e 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -238,11 +238,11 @@
 |<<tabs.indicator.padding,tabs.indicator.padding>>|Padding (in pixels) for tab indicators.
 |<<tabs.indicator.width,tabs.indicator.width>>|Width (in pixels) of the progress indicator (0 to disable).
 |<<tabs.last_close,tabs.last_close>>|How to behave when the last tab is closed.
+|<<tabs.mode_on_change,tabs.mode_on_change>>|When switching tabs, what input mode is applied.
 |<<tabs.mousewheel_switching,tabs.mousewheel_switching>>|Switch between tabs using the mouse wheel.
 |<<tabs.new_position.related,tabs.new_position.related>>|Position of new tabs opened from another tab.
 |<<tabs.new_position.unrelated,tabs.new_position.unrelated>>|Position of new tabs which aren't opened from another tab.
 |<<tabs.padding,tabs.padding>>|Padding (in pixels) around text for tabs.
-|<<tabs.mode_on_change,tabs.mode_on_change>>|Set input mode behavior when switching tab.
 |<<tabs.pinned.shrink,tabs.pinned.shrink>>|Shrink pinned tabs down to their contents.
 |<<tabs.position,tabs.position>>|Position of the tab bar.
 |<<tabs.select_on_remove,tabs.select_on_remove>>|Which tab to select when the focused tab is removed.
@@ -2774,6 +2774,20 @@ Valid values:
 
 Default: +pass:[ignore]+
 
+[[tabs.mode_on_change]]
+=== tabs.mode_on_change
+When switching tabs, what input mode is applied.
+
+Type: <<types,String>>
+
+Valid values:
+
+ * +persist+: Retain the current mode.
+ * +restore+: Restore previously saved mode.
+ * +normal+: Always revert to normal mode.
+
+Default: +pass:[normal]+
+
 [[tabs.mousewheel_switching]]
 === tabs.mousewheel_switching
 Switch between tabs using the mouse wheel.
@@ -2825,20 +2839,6 @@ Default:
 - +pass:[right]+: +pass:[5]+
 - +pass:[top]+: +pass:[0]+
 
-[[tabs.mode_on_change]]
-=== tabs.mode_on_change
-When switching tabs, what input mode is applied.
-
-Type: <<types,String>>
-
-Valid values:
-
- * +persist+: Retain the current mode.
- * +restore+: Restore previously saved mode.
- * +normal+: Always revert to normal mode.
-
-Default: +pass:[normal]+
-
 [[tabs.pinned.shrink]]
 === tabs.pinned.shrink
 Shrink pinned tabs down to their contents.

From 715cc7b7ddb43f1ba2bac1e770d8bb3de624af6b Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 21 Dec 2017 20:42:21 +0100
Subject: [PATCH 341/574] Make statusbar widgets configurable

---
 qutebrowser/config/configdata.yml             | 17 ++++++
 .../mainwindow/statusbar/backforward.py       |  6 +-
 qutebrowser/mainwindow/statusbar/bar.py       | 59 ++++++++++++++-----
 .../mainwindow/statusbar/percentage.py        |  4 +-
 qutebrowser/mainwindow/statusbar/progress.py  |  5 +-
 5 files changed, 72 insertions(+), 19 deletions(-)

diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index e2daefe3b..3a8c698c8 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -1171,6 +1171,23 @@ statusbar.position:
   default: bottom
   desc: Position of the status bar.
 
+statusbar.widgets:
+  type:
+    name: List
+    valtype:
+      name: String
+      valid_values:
+        - url: "Current page URL."
+        - scroll: "Percentage of the current page position like `10%`."
+        - scroll_raw: "Raw percentage of the current page position like `10`."
+        - history: "Display an arrow when possible to go back/forward in history."
+        - tabs: "Current active tab, e.g. `2`."
+        - keypress: "Display pressed keys when composing a vi command."
+        - progress: "Progress bar for the current page loading."
+    none_ok: true
+  default: ['keypress', 'url', 'scroll', 'history', 'tabs', 'progress']
+  desc: List of widgets displayed in the statusbar.
+
 ## tabs
 
 tabs.background:
diff --git a/qutebrowser/mainwindow/statusbar/backforward.py b/qutebrowser/mainwindow/statusbar/backforward.py
index b214b894d..8ea60ee75 100644
--- a/qutebrowser/mainwindow/statusbar/backforward.py
+++ b/qutebrowser/mainwindow/statusbar/backforward.py
@@ -26,6 +26,10 @@ class Backforward(textbase.TextBase):
 
     """Shows navigation indicator (if you can go backward and/or forward)."""
 
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.enabled = False
+
     def on_tab_cur_url_changed(self, tabs):
         """Called on URL changes."""
         tab = tabs.currentWidget()
@@ -45,4 +49,4 @@ class Backforward(textbase.TextBase):
         if text:
             text = '[' + text + ']'
         self.setText(text)
-        self.setVisible(bool(text))
+        self.setVisible(bool(text) and self.enabled)
diff --git a/qutebrowser/mainwindow/statusbar/bar.py b/qutebrowser/mainwindow/statusbar/bar.py
index ae6832eb0..8057bfdb8 100644
--- a/qutebrowser/mainwindow/statusbar/bar.py
+++ b/qutebrowser/mainwindow/statusbar/bar.py
@@ -182,26 +182,13 @@ class StatusBar(QWidget):
         self.cmd.hide_cmd.connect(self._hide_cmd_widget)
         self._hide_cmd_widget()
 
-        self.keystring = keystring.KeyString()
-        self._hbox.addWidget(self.keystring)
-
         self.url = url.UrlText()
-        self._hbox.addWidget(self.url)
-
         self.percentage = percentage.Percentage()
-        self._hbox.addWidget(self.percentage)
-
         self.backforward = backforward.Backforward()
-        self._hbox.addWidget(self.backforward)
-
         self.tabindex = tabindex.TabIndex()
-        self._hbox.addWidget(self.tabindex)
-
-        # We add a parent to Progress here because it calls self.show() based
-        # on some signals, and if that happens before it's added to the layout,
-        # it will quickly blink up as independent window.
+        self.keystring = keystring.KeyString()
         self.prog = progress.Progress(self)
-        self._hbox.addWidget(self.prog)
+        self._draw_widgets()
 
         config.instance.changed.connect(self._on_config_changed)
         QTimer.singleShot(0, self.maybe_hide)
@@ -215,6 +202,48 @@ class StatusBar(QWidget):
             self.maybe_hide()
         elif option == 'statusbar.padding':
             self._set_hbox_padding()
+        elif option == 'statusbar.widgets':
+            self._draw_widgets()
+
+    def _draw_widgets(self):
+        """Draw statusbar widgets."""
+        # Start with widgets hidden and show them when needed
+        for widget in [self.url, self.percentage,
+                       self.backforward, self.tabindex,
+                       self.keystring, self.prog]:
+            widget.hide()
+            self._hbox.removeWidget(widget)
+
+        tab = self._current_tab()
+
+        # Read the list and set widgets accordingly
+        for segment in config.val.statusbar.widgets:
+            if segment == 'url':
+                self._hbox.addWidget(self.url)
+                self.url.show()
+            elif segment == 'scroll':
+                self._hbox.addWidget(self.percentage)
+                self.percentage.show()
+            elif segment == 'scroll_raw':
+                self._hbox.addWidget(self.percentage)
+                self.percentage.raw = True
+                self.percentage.show()
+            elif segment == 'history':
+                self._hbox.addWidget(self.backforward)
+                self.backforward.enabled = True
+                if tab:
+                    self.backforward.on_tab_changed(tab)
+            elif segment == 'tabs':
+                self._hbox.addWidget(self.tabindex)
+                self.tabindex.show()
+            elif segment == 'keypress':
+                self._hbox.addWidget(self.keystring)
+                self.keystring.show()
+            elif segment == 'progress':
+                self._hbox.addWidget(self.prog)
+                self.prog.enabled = True
+                if tab:
+                    self.prog.on_tab_changed(tab)
 
     @pyqtSlot()
     def maybe_hide(self):
diff --git a/qutebrowser/mainwindow/statusbar/percentage.py b/qutebrowser/mainwindow/statusbar/percentage.py
index a3f30e50d..a362fd9d6 100644
--- a/qutebrowser/mainwindow/statusbar/percentage.py
+++ b/qutebrowser/mainwindow/statusbar/percentage.py
@@ -32,6 +32,7 @@ class Percentage(textbase.TextBase):
         """Constructor. Set percentage to 0%."""
         super().__init__(parent)
         self.set_perc(0, 0)
+        self.raw = False
 
     @pyqtSlot(int, int)
     def set_perc(self, x, y):  # pylint: disable=unused-argument
@@ -48,7 +49,8 @@ class Percentage(textbase.TextBase):
         elif y is None:
             self.setText('[???]')
         else:
-            self.setText('[{:2}%]'.format(y))
+            text = '[{:02}]' if self.raw else '[{:02}%]'
+            self.setText(text.format(y))
 
     def on_tab_changed(self, tab):
         """Update scroll position when tab changed."""
diff --git a/qutebrowser/mainwindow/statusbar/progress.py b/qutebrowser/mainwindow/statusbar/progress.py
index 930282771..6c467150b 100644
--- a/qutebrowser/mainwindow/statusbar/progress.py
+++ b/qutebrowser/mainwindow/statusbar/progress.py
@@ -46,6 +46,7 @@ class Progress(QProgressBar):
     def __init__(self, parent=None):
         super().__init__(parent)
         config.set_register_stylesheet(self)
+        self.enabled = False
         self.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
         self.setTextVisible(False)
         self.hide()
@@ -57,12 +58,12 @@ class Progress(QProgressBar):
     def on_load_started(self):
         """Clear old error and show progress, used as slot to loadStarted."""
         self.setValue(0)
-        self.show()
+        self.setVisible(self.enabled)
 
     def on_tab_changed(self, tab):
         """Set the correct value when the current tab changed."""
         self.setValue(tab.progress())
-        if tab.load_status() == usertypes.LoadStatus.loading:
+        if self.enabled and tab.load_status() == usertypes.LoadStatus.loading:
             self.show()
         else:
             self.hide()

From 6f9be72c5b44f361ac5b35cf9ebcfe3936a6eb30 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 8 Feb 2018 16:22:26 +0100
Subject: [PATCH 342/574] Update tests for statusbar changes

---
 .../mainwindow/statusbar/test_backforward.py  |  9 ++++++++
 .../mainwindow/statusbar/test_percentage.py   | 23 ++++++++++++-------
 .../mainwindow/statusbar/test_progress.py     |  1 +
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/tests/unit/mainwindow/statusbar/test_backforward.py b/tests/unit/mainwindow/statusbar/test_backforward.py
index b355fcfdf..6e594c0d2 100644
--- a/tests/unit/mainwindow/statusbar/test_backforward.py
+++ b/tests/unit/mainwindow/statusbar/test_backforward.py
@@ -45,14 +45,22 @@ def test_backforward_widget(backforward_widget, tabbed_browser_stubs,
     tabbed_browser = tabbed_browser_stubs[0]
     tabbed_browser.current_index = 1
     tabbed_browser.tabs = [tab]
+    backforward_widget.enabled = True
     backforward_widget.on_tab_cur_url_changed(tabbed_browser)
     assert backforward_widget.text() == expected_text
     assert backforward_widget.isVisible() == bool(expected_text)
 
+    # Check that the widget stays hidden if not in the statusbar
+    backforward_widget.enabled = False
+    backforward_widget.hide()
+    backforward_widget.on_tab_cur_url_changed(tabbed_browser)
+    assert backforward_widget.isHidden()
+
     # Check that the widget gets reset if empty.
     if can_go_back and can_go_forward:
         tab = fake_web_tab(can_go_back=False, can_go_forward=False)
         tabbed_browser.tabs = [tab]
+        backforward_widget.enabled = True
         backforward_widget.on_tab_cur_url_changed(tabbed_browser)
         assert backforward_widget.text() == ''
         assert not backforward_widget.isVisible()
@@ -64,6 +72,7 @@ def test_none_tab(backforward_widget, tabbed_browser_stubs, fake_web_tab):
     tabbed_browser = tabbed_browser_stubs[0]
     tabbed_browser.current_index = 1
     tabbed_browser.tabs = [tab]
+    backforward_widget.enabled = True
     backforward_widget.on_tab_cur_url_changed(tabbed_browser)
 
     assert backforward_widget.text() == '[<>]'
diff --git a/tests/unit/mainwindow/statusbar/test_percentage.py b/tests/unit/mainwindow/statusbar/test_percentage.py
index 91de051d1..c7b5b9fe2 100644
--- a/tests/unit/mainwindow/statusbar/test_percentage.py
+++ b/tests/unit/mainwindow/statusbar/test_percentage.py
@@ -33,15 +33,21 @@ def percentage(qtbot):
     return widget
 
 
-@pytest.mark.parametrize('y, expected', [
-    (0, '[top]'),
-    (100, '[bot]'),
-    (75, '[75%]'),
-    (25, '[25%]'),
-    (5, '[ 5%]'),
-    (None, '[???]'),
+@pytest.mark.parametrize('y, raw, expected', [
+    (0, False, '[top]'),
+    (100, False, '[bot]'),
+    (75, False, '[75%]'),
+    (25, False, '[25%]'),
+    (5, False, '[05%]'),
+    (None, False, '[???]'),
+    (0, True, '[top]'),
+    (100, True, '[bot]'),
+    (75, True, '[75]'),
+    (25, True, '[25]'),
+    (5, True, '[05]'),
+    (None, True, '[???]'),
 ])
-def test_percentage_text(percentage, y, expected):
+def test_percentage_text(percentage, y, raw, expected):
     """Test text displayed by the widget based on the y position of a page.
 
     Args:
@@ -49,6 +55,7 @@ def test_percentage_text(percentage, y, expected):
            parametrized.
         expected: expected text given y position. parametrized.
     """
+    percentage.raw = raw
     percentage.set_perc(x=None, y=y)
     assert percentage.text() == expected
 
diff --git a/tests/unit/mainwindow/statusbar/test_progress.py b/tests/unit/mainwindow/statusbar/test_progress.py
index 763ea1059..6d054a5c9 100644
--- a/tests/unit/mainwindow/statusbar/test_progress.py
+++ b/tests/unit/mainwindow/statusbar/test_progress.py
@@ -30,6 +30,7 @@ from qutebrowser.utils import usertypes
 def progress_widget(qtbot, config_stub):
     """Create a Progress widget and checks its initial state."""
     widget = Progress()
+    widget.enabled = True
     qtbot.add_widget(widget)
     assert not widget.isVisible()
     assert not widget.isTextVisible()

From e6749dcf9f1e604315d5ec830cb380bd91166402 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 10 Feb 2018 09:57:08 -0500
Subject: [PATCH 343/574] [count] overrides win_id for tab-give cmd

- Resolves #3548
---
 qutebrowser/browser/commands.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index a59cdac25..8fd3426c0 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -533,14 +533,19 @@ class CommandDispatcher:
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     @cmdutils.argument('win_id', completion=miscmodels.window)
-    def tab_give(self, win_id: int = None):
+    @cmdutils.argument('count', count=True)
+    def tab_give(self, win_id: int = None, count=None):
         """Give the current tab to a new or existing window if win_id given.
 
         If no win_id is given, the tab will get detached into a new window.
 
         Args:
             win_id: The window ID of the window to give the current tab to.
+            count: [count] overrides win_id (index starts at 1 for win_id=0)
         """
+        if count is not None:
+            win_id = count - 1
+
         if win_id == self._win_id:
             raise cmdexc.CommandError("Can't give a tab to the same window")
 

From ffddf9a15fa8e964abc7d9150af1909323bb929b Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Sat, 10 Feb 2018 15:14:07 +0000
Subject: [PATCH 344/574] Code style review changes

---
 qutebrowser/html/version.html |  6 +++---
 qutebrowser/utils/utils.py    |  1 +
 qutebrowser/utils/version.py  | 10 +++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/html/version.html b/qutebrowser/html/version.html
index 9532c3d62..a69e6f9de 100644
--- a/qutebrowser/html/version.html
+++ b/qutebrowser/html/version.html
@@ -1,8 +1,8 @@
 {% extends "base.html" %}
 
 {% block script %}
-var paste_version = function(){
-  xhr = new XMLHttpRequest();
+function paste_version() {
+  const xhr = new XMLHttpRequest();
   xhr.open("GET", "qute://pastebin-version");
   xhr.send();
 }
@@ -36,5 +36,5 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <a href="http://www.gnu.org/licenses/">
 http://www.gnu.org/licenses/</a> or open <a href="qute://gpl">qute://gpl</a>.
 </p>
-<button id="paste" onclick="paste_version()">Pastebin Version Info</button>
+<button id="paste" onclick="paste_version()">Yank Pastebin URL for Version Info</button>
 {% endblock %}
diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index 2d96613ee..079866920 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -50,6 +50,7 @@ except ImportError:  # pragma: no cover
 import qutebrowser
 from qutebrowser.utils import qtutils, log, debug
 
+
 fake_clipboard = None
 log_clipboard = False
 
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index 67bf5f423..09a1a6efa 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -66,7 +66,7 @@ class DistributionInfo:
     pretty = attr.ib()
 
 
-PASTEBIN_URL = None
+pastebin_url = None
 Distribution = enum.Enum(
     'Distribution', ['unknown', 'ubuntu', 'debian', 'void', 'arch',
                      'gentoo', 'fedora', 'opensuse', 'linuxmint', 'manjaro'])
@@ -460,18 +460,18 @@ def pastebin_version():
         message.info("Version url {} yanked to clipboard.".format(url))
 
     def _on_paste_version_success(url):
-        global PASTEBIN_URL
+        global pastebin_url
         _yank_url(url)
         pbclient.deleteLater()
-        PASTEBIN_URL = url
+        pastebin_url = url
 
     def _on_paste_version_err(text):
         message.error("Failed to pastebin version"
                       " info: {}".format(text))
         pbclient.deleteLater()
 
-    if PASTEBIN_URL:
-        _yank_url(PASTEBIN_URL)
+    if pastebin_url:
+        _yank_url(pastebin_url)
         return
 
     app = QApplication.instance()

From 015889373efeecf0146fb9ee65ba61e34d91595d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 16:28:34 +0100
Subject: [PATCH 345/574] Update docs

---
 doc/changelog.asciidoc     |  2 ++
 doc/help/settings.asciidoc | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 6fb47ae9d..1f25fb8bf 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -33,6 +33,8 @@ Added
 - New `--no-last` flag for `:tab-focus` to not focus the last tab when focusing
   the currently focused one.
 - New `--edit` flag for `:view-source` to open the source in an external editor.
+- New `statusbar.widgets` setting to configure which widgets should be shown in
+  which order in the statusbar.
 
 Changed
 ~~~~~~~
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 53dce9e8e..241cdf1aa 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -230,6 +230,7 @@
 |<<statusbar.hide,statusbar.hide>>|Hide the statusbar unless a message is shown.
 |<<statusbar.padding,statusbar.padding>>|Padding (in pixels) for the statusbar.
 |<<statusbar.position,statusbar.position>>|Position of the status bar.
+|<<statusbar.widgets,statusbar.widgets>>|List of widgets displayed in the statusbar.
 |<<tabs.background,tabs.background>>|Open new tabs (middleclick/ctrl+click) in the background.
 |<<tabs.close_mouse_button,tabs.close_mouse_button>>|Mouse button with which to close tabs.
 |<<tabs.close_mouse_button_on_bar,tabs.close_mouse_button_on_bar>>|How to behave when the close mouse button is pressed on the tab bar.
@@ -2683,6 +2684,31 @@ Valid values:
 
 Default: +pass:[bottom]+
 
+[[statusbar.widgets]]
+=== statusbar.widgets
+List of widgets displayed in the statusbar.
+
+Type: <<types,List of String>>
+
+Valid values:
+
+ * +url+: Current page URL.
+ * +scroll+: Percentage of the current page position like `10%`.
+ * +scroll_raw+: Raw percentage of the current page position like `10`.
+ * +history+: Display an arrow when possible to go back/forward in history.
+ * +tabs+: Current active tab, e.g. `2`.
+ * +keypress+: Display pressed keys when composing a vi command.
+ * +progress+: Progress bar for the current page loading.
+
+Default: 
+
+- +pass:[keypress]+
+- +pass:[url]+
+- +pass:[scroll]+
+- +pass:[history]+
+- +pass:[tabs]+
+- +pass:[progress]+
+
 [[tabs.background]]
 === tabs.background
 Open new tabs (middleclick/ctrl+click) in the background.

From a6f09b1f73416b089987c38a49f33950c57283fc Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Sat, 10 Feb 2018 15:41:02 +0000
Subject: [PATCH 346/574] Add the modified keys with a loop

---
 qutebrowser/commands/runners.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/commands/runners.py b/qutebrowser/commands/runners.py
index 40c927379..a3d142434 100644
--- a/qutebrowser/commands/runners.py
+++ b/qutebrowser/commands/runners.py
@@ -65,11 +65,10 @@ def replace_variables(win_id, arglist):
             QUrl.DecodeReserved | QUrl.RemovePassword),
         'clipboard': utils.get_clipboard,
         'primary': lambda: utils.get_clipboard(selection=True),
-        '{url}': lambda: '{url}',
-        '{url:pretty}': lambda: '{url:pretty}',
-        '{clipboard}': lambda: '{clipboard}',
-        '{primary}': lambda: '{primary}',
     }
+    for key in list(variables):
+        modified_key = '{' + key + '}'
+        variables[modified_key] = lambda: modified_key
     values = {}
     args = []
     tabbed_browser = objreg.get('tabbed-browser', scope='window',

From c9bc72a539dd6f72827485575a67dbd3ead9286c Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 16:54:45 +0100
Subject: [PATCH 347/574] Fix docstring

---
 qutebrowser/commands/runners.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/commands/runners.py b/qutebrowser/commands/runners.py
index 9fe53f07a..16c790eca 100644
--- a/qutebrowser/commands/runners.py
+++ b/qutebrowser/commands/runners.py
@@ -162,7 +162,7 @@ class CommandParser:
             yield self.parse(sub, *args, **kwargs)
 
     def parse_all(self, *args, **kwargs):
-        """Wrapper over parse_all."""
+        """Wrapper over _parse_all_gen."""
         return list(self._parse_all_gen(*args, **kwargs))
 
     def parse(self, text, *, fallback=False, keep=False):

From 80ee43becacb2c81e4ccdc16438fd4e7e96c73f1 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 16:54:55 +0100
Subject: [PATCH 348/574] Add Python 3.7 to tox.ini

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index db020f4a4..f09f92165 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,6 +20,7 @@ passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_* QUTE_* DO
 basepython =
     py35: python3.5
     py36: python3.6
+    py37: python3.7
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/misc/requirements/requirements-tests.txt

From 63766c1711548ed119d197be22740b4cd4e3f61a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 17:22:21 +0100
Subject: [PATCH 349/574] Fix typing.Union checks with Python 3.7

---
 doc/changelog.asciidoc          | 1 +
 qutebrowser/commands/command.py | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 1f25fb8bf..d3755d4fc 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -76,6 +76,7 @@ Fixed
 - QtWebEngine: Qt download objects are now cleaned up properly when a download
   is removed.
 - Suspended pages now should always load the correct page when being un-suspended.
+- Compatibility with Python 3.7
 
 Removed
 ~~~~~~~
diff --git a/qutebrowser/commands/command.py b/qutebrowser/commands/command.py
index fd3fcf20a..02fb72128 100644
--- a/qutebrowser/commands/command.py
+++ b/qutebrowser/commands/command.py
@@ -394,10 +394,8 @@ class Command:
         if isinstance(typ, tuple):
             raise TypeError("{}: Legacy tuple type annotation!".format(
                 self.name))
-        elif type(typ) is type(typing.Union):  # noqa: E721
+        elif getattr(typ, '__origin__', None) is typing.Union:
             # this is... slightly evil, I know
-            # We also can't use isinstance here because typing.Union doesn't
-            # support that.
             # pylint: disable=no-member,useless-suppression
             try:
                 types = list(typ.__args__)

From 33d9d4fe90597d6c383b132ddb5e1bfaeaeebabe Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Sat, 10 Feb 2018 13:21:04 -0500
Subject: [PATCH 350/574] Improve performance of startup and shutdown

We call 'update_tab_titles' a lot of times which calls 'setTabText' on
every tab. 'setTabText' calls tabSizeHint and minTabSizeHint on every
tab as well, meaning this is an n^2 operation repeated many times.

First, this prevents setTabText from being called unless it's needed,
removing most of the work done.

Second, I remove tabs in reverse, to avoid recomputing the above for
every tab on shutdown (which is at least n^3)
---
 qutebrowser/mainwindow/tabbedbrowser.py | 5 ++++-
 qutebrowser/mainwindow/tabwidget.py     | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index cd9f52b37..8cee35524 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -253,7 +253,10 @@ class TabbedBrowser(tabwidget.TabWidget):
     def shutdown(self):
         """Try to shut down all tabs cleanly."""
         self.shutting_down = True
-        for tab in self.widgets():
+        # Reverse tabs so we don't have to recacluate tab titles over and over
+        # Removing first causes [2..-1] to be recomputed
+        # Removing the last causes nothing to be recomputed
+        for tab in reversed(self.widgets()):
             self._remove_tab(tab)
 
     def tab_close_prompt_if_pinned(
diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py
index da1f2624b..6cded2a71 100644
--- a/qutebrowser/mainwindow/tabwidget.py
+++ b/qutebrowser/mainwindow/tabwidget.py
@@ -150,8 +150,9 @@ class TabWidget(QTabWidget):
         title = '' if fmt is None else fmt.format(**fields)
         tabbar = self.tabBar()
 
-        tabbar.setTabText(idx, title)
-        tabbar.setTabToolTip(idx, title)
+        if tabbar.tabText(idx) != title:
+            tabbar.setTabText(idx, title)
+            tabbar.setTabToolTip(idx, title)
 
     def get_tab_fields(self, idx):
         """Get the tab field data."""

From aa5da1b3126491d35c71db47c561cddc8077bfec Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 19:35:03 +0100
Subject: [PATCH 351/574] Don't set up YAML constructors/resolvers for default
 loaders

After reading https://pyyaml.org/wiki/PyYAMLDocumentation again, turns out
Loader.add_constructor and .add_implicit_resolver are actually *class* methods.

In other words, we've been adding dozens of constructors/resolvers to the
default YAML loader object, causing it to slow down massively in other tests
which call configdata.init().

Instead, create our own loader class and only add them once there.

I'm still not sure why this caused the duration to increase with every YAML load
though - that might still be some kind of bug in PyYAML.

Fixes #2777
---
 tests/end2end/fixtures/quteprocess.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py
index c62de1dc9..0b5f683cc 100644
--- a/tests/end2end/fixtures/quteprocess.py
+++ b/tests/end2end/fixtures/quteprocess.py
@@ -784,13 +784,8 @@ class QuteProc(testprocess.Process):
         be compared.
         """
         __tracebackhide__ = lambda e: e.errisinstance(pytest.fail.Exception)
-        # Translate ... to ellipsis in YAML.
-        loader = yaml.SafeLoader(expected)
-        loader.add_constructor('!ellipsis', lambda loader, node: ...)
-        loader.add_implicit_resolver('!ellipsis', re.compile(r'\.\.\.'), None)
-
         data = self.get_session()
-        expected = loader.get_data()
+        expected = yaml.load(expected, Loader=YamlLoader)
         outcome = testutils.partial_compare(data, expected)
         if not outcome:
             msg = "Session comparison failed: {}".format(outcome.error)
@@ -798,6 +793,18 @@ class QuteProc(testprocess.Process):
             pytest.fail(msg)
 
 
+class YamlLoader(yaml.SafeLoader):
+
+    """Custom YAML loader used in compare_session."""
+
+    pass
+
+
+# Translate ... to ellipsis in YAML.
+YamlLoader.add_constructor('!ellipsis', lambda loader, node: ...)
+YamlLoader.add_implicit_resolver('!ellipsis', re.compile(r'\.\.\.'), None)
+
+
 def _xpath_escape(text):
     """Escape a string to be used in an XPath expression.
 

From 5b22209eefc7869f8eef2ba6dd8e5a7d849132b8 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 19:50:20 +0100
Subject: [PATCH 352/574] Run test_init_benchmark on CI again

See #2777
---
 tests/unit/config/test_configdata.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/unit/config/test_configdata.py b/tests/unit/config/test_configdata.py
index 595dbb90b..61fc66653 100644
--- a/tests/unit/config/test_configdata.py
+++ b/tests/unit/config/test_configdata.py
@@ -53,8 +53,6 @@ def test_data(config_stub):
             assert isinstance(option.default, list)
 
 
-# https://github.com/qutebrowser/qutebrowser/issues/2777
-@pytest.mark.no_ci
 def test_init_benchmark(benchmark):
     benchmark(configdata.init)
 

From cd1bd7d52afd5d30189f1b7ce8263b2aefc81e73 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 19:58:30 +0100
Subject: [PATCH 353/574] Skip ASCII locale tests with Python 3.7

---
 tests/end2end/test_invocations.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/end2end/test_invocations.py b/tests/end2end/test_invocations.py
index 4cc8f1b59..3b6d51e26 100644
--- a/tests/end2end/test_invocations.py
+++ b/tests/end2end/test_invocations.py
@@ -30,6 +30,11 @@ import pytest
 from PyQt5.QtCore import QProcess, qVersion
 
 
+ascii_locale = pytest.mark.skipif(sys.hexversion >= 0x03070000,
+                                  reason="Python >= 3.7 doesn't force ASCII "
+                                  "locale with LC_ALL=C")
+
+
 def _base_args(config):
     """Get the arguments to pass with every invocation."""
     args = ['--debug', '--json-logging', '--no-err-windows']
@@ -73,6 +78,7 @@ def temp_basedir_env(tmpdir, short_tmpdir):
 
 
 @pytest.mark.linux
+@ascii_locale
 def test_downloads_with_ascii_locale(request, server, tmpdir, quteproc_new):
     """Test downloads with LC_ALL=C set.
 
@@ -107,6 +113,7 @@ def test_downloads_with_ascii_locale(request, server, tmpdir, quteproc_new):
 
 @pytest.mark.linux
 @pytest.mark.parametrize('url', ['/föö.html', 'file:///föö.html'])
+@ascii_locale
 def test_open_with_ascii_locale(request, server, tmpdir, quteproc_new, url):
     """Test opening non-ascii URL with LC_ALL=C set.
 
@@ -130,6 +137,7 @@ def test_open_with_ascii_locale(request, server, tmpdir, quteproc_new, url):
 
 
 @pytest.mark.linux
+@ascii_locale
 def test_open_command_line_with_ascii_locale(request, server, tmpdir,
                                              quteproc_new):
     """Test opening file via command line with a non-ascii name with LC_ALL=C.

From 5f62c016cc4df349a05ebc483df3edac1ecab78e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 20:05:57 +0100
Subject: [PATCH 354/574] Fix test_standarddir.TestCreatingDir

What we actually want to test here is that the given type directory is created
and has the correct permission, we don't care much about the basedir itself.

Also, the download dir is not created automatically.

This test failed on Python 3.7 because intermediate directories now aren't
created with the given mode anymore:

https://bugs.python.org/issue19930
https://docs.python.org/3.7/whatsnew/3.7.html#changes-in-the-python-api
---
 tests/unit/utils/test_standarddir.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/unit/utils/test_standarddir.py b/tests/unit/utils/test_standarddir.py
index c95e83c41..8d110f05b 100644
--- a/tests/unit/utils/test_standarddir.py
+++ b/tests/unit/utils/test_standarddir.py
@@ -301,6 +301,7 @@ class TestCreatingDir:
         """Test --basedir."""
         basedir = tmpdir / 'basedir'
         assert not basedir.exists()
+
         args = types.SimpleNamespace(basedir=str(basedir))
         standarddir._init_dirs(args)
 
@@ -309,8 +310,13 @@ class TestCreatingDir:
 
         assert basedir.exists()
 
-        if utils.is_posix:
-            assert basedir.stat().mode & 0o777 == 0o700
+        if typ == 'download':
+            assert not (basedir / typ).exists()
+        else:
+            assert (basedir / typ).exists()
+
+            if utils.is_posix:
+                assert (basedir / typ).stat().mode & 0o777 == 0o700
 
     @pytest.mark.parametrize('typ', DIR_TYPES)
     def test_exists_race_condition(self, mocker, tmpdir, typ):

From f25e706e11a3ea56014ec8390937acb5f9998813 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 20:08:33 +0100
Subject: [PATCH 355/574] Add Python 3.7 compatibility to setup.py

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index d1bbd7f81..da44c1fd6 100755
--- a/setup.py
+++ b/setup.py
@@ -95,6 +95,7 @@ try:
             'Programming Language :: Python :: 3',
             'Programming Language :: Python :: 3.5',
             'Programming Language :: Python :: 3.6',
+            'Programming Language :: Python :: 3.7',
             'Topic :: Internet',
             'Topic :: Internet :: WWW/HTTP',
             'Topic :: Internet :: WWW/HTTP :: Browsers',

From 52d7ff79fc9af541419eaa47f4e23f2c94eb5c4e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 20:15:17 +0100
Subject: [PATCH 356/574] Skip another scroll test with Qt 5.10 and Travis

---
 tests/end2end/features/scroll.feature | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/end2end/features/scroll.feature b/tests/end2end/features/scroll.feature
index f73eb352b..83eef16ab 100644
--- a/tests/end2end/features/scroll.feature
+++ b/tests/end2end/features/scroll.feature
@@ -286,6 +286,7 @@ Feature: Scrolling
         And I run :scroll-page --bottom-navigate next 0 1
         Then data/hello2.txt should be loaded
 
+    @issue3572
     Scenario: :scroll-page with --bottom-navigate and zoom
         When I run :zoom 200
         And I run :scroll-to-perc 100

From 11e04c79f4aca245ed140146f69f6229034a600e Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Sat, 10 Feb 2018 15:10:33 -0500
Subject: [PATCH 357/574] Add add/remove tests to benchmarks

---
 tests/helpers/stubs.py                  |  3 +++
 tests/unit/mainwindow/test_tabwidget.py | 34 ++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/tests/helpers/stubs.py b/tests/helpers/stubs.py
index 711b1105f..64bc793cb 100644
--- a/tests/helpers/stubs.py
+++ b/tests/helpers/stubs.py
@@ -261,6 +261,9 @@ class FakeWebTab(browsertab.AbstractTab):
     def load_status(self):
         return self._load_status
 
+    def shutdown(self):
+        pass
+
 
 class FakeSignal:
 
diff --git a/tests/unit/mainwindow/test_tabwidget.py b/tests/unit/mainwindow/test_tabwidget.py
index 1f0ff55d5..7ad22fcc3 100644
--- a/tests/unit/mainwindow/test_tabwidget.py
+++ b/tests/unit/mainwindow/test_tabwidget.py
@@ -23,7 +23,7 @@ import pytest
 
 from PyQt5.QtGui import QIcon, QPixmap
 
-from qutebrowser.mainwindow import tabwidget
+from qutebrowser.mainwindow import tabwidget, tabbedbrowser
 from qutebrowser.utils import usertypes
 
 
@@ -39,6 +39,14 @@ class TestTabWidget:
                             usertypes.Backend.QtWebKit)
         return w
 
+    @pytest.fixture
+    def browser(self, qtbot, monkeypatch, config_stub):
+        w = tabbedbrowser.TabbedBrowser(win_id=0, private=False)
+        qtbot.addWidget(w)
+        monkeypatch.setattr(tabwidget.objects, 'backend',
+                            usertypes.Backend.QtWebKit)
+        return w
+
     def test_small_icon_doesnt_crash(self, widget, qtbot, fake_web_tab):
         """Test that setting a small icon doesn't produce a crash.
 
@@ -53,15 +61,29 @@ class TestTabWidget:
         with qtbot.waitExposed(widget):
             widget.show()
 
+    @pytest.mark.parametrize("num_tabs", [4, 10])
     def test_update_tab_titles_benchmark(self, benchmark, widget,
-                                         qtbot, fake_web_tab):
+                                         qtbot, fake_web_tab, num_tabs):
         """Benchmark for update_tab_titles."""
-        widget.addTab(fake_web_tab(), 'foobar')
-        widget.addTab(fake_web_tab(), 'foobar2')
-        widget.addTab(fake_web_tab(), 'foobar3')
-        widget.addTab(fake_web_tab(), 'foobar4')
+        for i in range(num_tabs):
+            widget.addTab(fake_web_tab(), 'foobar' + str(i))
 
         with qtbot.waitExposed(widget):
             widget.show()
 
         benchmark(widget._update_tab_titles)
+
+    @pytest.mark.parametrize("num_tabs", [4, 10])
+    def test_add_remove_tab_benchmark(self, benchmark, browser,
+                                      qtbot, fake_web_tab, num_tabs):
+        """Benchmark for addTab and removeTab."""
+        def _run_bench():
+            for i in range(num_tabs):
+                browser.addTab(fake_web_tab(), 'foobar' + str(i))
+
+            with qtbot.waitExposed(browser):
+                browser.show()
+
+            browser.shutdown()
+
+        benchmark(_run_bench)

From a472351423eba66abbfc0f850533ce0559885e67 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 21:27:40 +0100
Subject: [PATCH 358/574] Fix typing.Union check on Python 3.5.2

Apparently 3.5.4 has __origin__ for typing.Union, but 3.5.2 has not. Let's hope
this now works everywhere...
---
 qutebrowser/commands/command.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/commands/command.py b/qutebrowser/commands/command.py
index 02fb72128..6dee7db91 100644
--- a/qutebrowser/commands/command.py
+++ b/qutebrowser/commands/command.py
@@ -394,7 +394,9 @@ class Command:
         if isinstance(typ, tuple):
             raise TypeError("{}: Legacy tuple type annotation!".format(
                 self.name))
-        elif getattr(typ, '__origin__', None) is typing.Union:
+        elif getattr(typ, '__origin__', None) is typing.Union or (
+                hasattr(typing, 'UnionMeta') and
+                isinstance(typ, typing.UnionMeta)):
             # this is... slightly evil, I know
             # pylint: disable=no-member,useless-suppression
             try:

From 219b75524b11c535249c51a5e4d3c4374df2a2a7 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 23:08:47 +0100
Subject: [PATCH 359/574] Fix TestCreatingDir on non-Linux

---
 tests/unit/utils/test_standarddir.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/utils/test_standarddir.py b/tests/unit/utils/test_standarddir.py
index 8d110f05b..a483ede64 100644
--- a/tests/unit/utils/test_standarddir.py
+++ b/tests/unit/utils/test_standarddir.py
@@ -310,7 +310,7 @@ class TestCreatingDir:
 
         assert basedir.exists()
 
-        if typ == 'download':
+        if typ == 'download' or (typ == 'runtime' and not utils.is_linux):
             assert not (basedir / typ).exists()
         else:
             assert (basedir / typ).exists()

From 70868e1d99c19c38386842e22a8678f17e082faf Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 23:14:12 +0100
Subject: [PATCH 360/574] Make pylint shut up

---
 qutebrowser/commands/command.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/commands/command.py b/qutebrowser/commands/command.py
index 6dee7db91..8dd830495 100644
--- a/qutebrowser/commands/command.py
+++ b/qutebrowser/commands/command.py
@@ -395,10 +395,11 @@ class Command:
             raise TypeError("{}: Legacy tuple type annotation!".format(
                 self.name))
         elif getattr(typ, '__origin__', None) is typing.Union or (
+                # Older Python 3.5 patch versions
+                # pylint: disable=no-member,useless-suppression
                 hasattr(typing, 'UnionMeta') and
                 isinstance(typ, typing.UnionMeta)):
             # this is... slightly evil, I know
-            # pylint: disable=no-member,useless-suppression
             try:
                 types = list(typ.__args__)
             except AttributeError:

From f6eb8929c35c03f0db2217f8381fb25bb31cd6a4 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Sun, 11 Feb 2018 00:19:08 -0500
Subject: [PATCH 361/574] Fix incorrect scroll offset after tab pin

---
 qutebrowser/mainwindow/tabwidget.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py
index 6cded2a71..965e5b219 100644
--- a/qutebrowser/mainwindow/tabwidget.py
+++ b/qutebrowser/mainwindow/tabwidget.py
@@ -110,8 +110,6 @@ class TabWidget(QTabWidget):
         tab.data.pinned = pinned
         self._update_tab_title(idx)
 
-        bar.refresh()
-
     def tab_indicator_color(self, idx):
         """Get the tab indicator color for the given index."""
         return self.tabBar().tab_indicator_color(idx)

From 4e77aa41d8c7687cb6b3aedd547862d8dfd92cf5 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 11 Feb 2018 09:39:33 +0100
Subject: [PATCH 362/574] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index d3755d4fc..5c75a14e0 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -59,6 +59,7 @@ Changed
 - New `tabs.mode_on_change` setting which replaces
   `tabs.persist_mode_on_change`. It can now be set to `restore` which remembers
   input modes (input/passthrough) per tab.
+- More performance improvements when opening/closing many tabs.
 
 Fixed
 ~~~~~

From 772f0025f18f46eddaa0649ce826d168f563a9a7 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 11 Feb 2018 10:29:02 +0100
Subject: [PATCH 363/574] Clean up netrc support

---
 qutebrowser/browser/webengine/webenginetab.py        | 3 +--
 qutebrowser/browser/webkit/network/networkmanager.py | 7 ++++---
 qutebrowser/browser/webkit/webkittab.py              | 4 +---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 122c4e51e..f8ad7e2cc 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -824,8 +824,7 @@ class WebEngineTab(browsertab.AbstractTab):
             # https://bugreports.qt.io/browse/QTBUG-61506
             self.search.clear()
         super()._on_load_started()
-        if self.data.netrc_used:
-            self.data.netrc_used = False
+        self.data.netrc_used = False
 
     @pyqtSlot(QWebEnginePage.RenderProcessTerminationStatus, int)
     def _on_render_process_terminated(self, status, exitcode):
diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py
index 50fb53b35..8ad486d29 100644
--- a/qutebrowser/browser/webkit/network/networkmanager.py
+++ b/qutebrowser/browser/webkit/network/networkmanager.py
@@ -270,11 +270,12 @@ class NetworkManager(QNetworkAccessManager):
     @pyqtSlot('QNetworkReply*', 'QAuthenticator*')
     def on_authentication_required(self, reply, authenticator):
         """Called when a website needs authentication."""
-        netrc = False
+        netrc_success = False
         if not self.netrc_used:
             self.netrc_used = True
-            netrc = shared.netrc_authentication(reply.url(), authenticator)
-        if not netrc:
+            netrc_success = shared.netrc_authentication(reply.url(),
+                                                        authenticator)
+        if not netrc_success:
             abort_on = self._get_abort_signals(reply)
             shared.authentication_required(reply.url(), authenticator,
                                            abort_on=abort_on)
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 9c4d2bf66..9395630db 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -729,9 +729,7 @@ class WebKitTab(browsertab.AbstractTab):
     @pyqtSlot()
     def _on_load_started(self):
         super()._on_load_started()
-        nam = self.networkaccessmanager()
-        if nam.netrc_used:
-            nam.netrc_used = False
+        self.networkaccessmanager().netrc_used = False
 
     @pyqtSlot()
     def _on_frame_load_finished(self):

From e53cf08548122df6e835518071503c034541b3d1 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 11 Feb 2018 10:35:31 +0100
Subject: [PATCH 364/574] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 5c75a14e0..3fe8c2147 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -22,6 +22,7 @@ Added
 ~~~~~
 
 - QtWebEngine: Caret/visual mode is now supported.
+- QtWebEngine: Authentication via ~/.netrc is now supported.
 - A new `qute://bindings` page, opened by `:bind`, shows all keybindings.
 - `:session-load` has a new `--delete` flag which deletes the
   session after loading it.

From 007aa8ab8d7db4191cce53f5671b38cd5fa0a76b Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 11 Feb 2018 10:35:46 +0100
Subject: [PATCH 365/574] Add some newlines

---
 qutebrowser/browser/browsertab.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index ee4242f7a..6ed5afe52 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -757,10 +757,12 @@ class AbstractTab(QWidget):
             self._set_load_status(usertypes.LoadStatus.warn)
         else:
             self._set_load_status(usertypes.LoadStatus.error)
+
         self.load_finished.emit(ok)
 
         if not self.title():
             self.title_changed.emit(self.url().toDisplayString())
+
         self.zoom.set_current()
 
     @pyqtSlot()

From bba1eb0d76e3fea0a50cce043aad61da37ccb5dd Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 11 Feb 2018 10:45:08 +0100
Subject: [PATCH 366/574] Add missing QUrl.RemovePassword

---
 qutebrowser/browser/webkit/webpage.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index 7a13bb07e..52107a17b 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -148,7 +148,7 @@ class BrowserPage(QWebPage):
                 text="URL: <b>{}</b>".format(
                     html.escape(url.toDisplayString())),
                 yes_action=functools.partial(QDesktopServices.openUrl, url),
-                url=info.url.toString(QUrl.FullyEncoded))
+                url=info.url.toString(QUrl.RemovePassword | QUrl.FullyEncoded))
             return True
         elif (info.domain, info.error) in ignored_errors:
             log.webview.debug("Ignored error on {}: {} (error domain: {}, "

From b7f54a89dbaec41ee3d77731a77de845ac33151b Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 11 Feb 2018 10:46:45 +0100
Subject: [PATCH 367/574] Update changelog

---
 doc/changelog.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 3fe8c2147..05107e555 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -36,6 +36,8 @@ Added
 - New `--edit` flag for `:view-source` to open the source in an external editor.
 - New `statusbar.widgets` setting to configure which widgets should be shown in
   which order in the statusbar.
+- New `:prompt-yank` command (bound to `Alt-y` by default) to yank URLs
+  referenced in prompts.
 
 Changed
 ~~~~~~~

From 32ba5a5c957917dcc7ec27170059ad6f11096133 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 11 Feb 2018 11:11:55 +0100
Subject: [PATCH 368/574] Improve styling for qute://version and move button

---
 qutebrowser/html/version.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/html/version.html b/qutebrowser/html/version.html
index a69e6f9de..368fbaed6 100644
--- a/qutebrowser/html/version.html
+++ b/qutebrowser/html/version.html
@@ -9,13 +9,14 @@ function paste_version() {
 {% endblock %}
 
 {% block style %}
-#paste { margin: auto; display: block; }
+html { margin-left: 10px; }
 {% endblock %}
 
 {% block content %}
 {{ super() }}
 <h1>Version info</h1>
 <pre>{{ version }}</pre>
+<button onclick="paste_version()">Yank pastebin URL for version info</button>
 
 <h1>Copyright info</h1>
 <p>{{ copyright }}</p>
@@ -36,5 +37,4 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <a href="http://www.gnu.org/licenses/">
 http://www.gnu.org/licenses/</a> or open <a href="qute://gpl">qute://gpl</a>.
 </p>
-<button id="paste" onclick="paste_version()">Yank Pastebin URL for Version Info</button>
 {% endblock %}

From 0743094c2f86a4b95aee98eb0ace93b600cfc249 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 11 Feb 2018 11:12:39 +0100
Subject: [PATCH 369/574] Fix copyright year in __init__.py

---
 qutebrowser/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/__init__.py b/qutebrowser/__init__.py
index 72afa0d5d..3da270437 100644
--- a/qutebrowser/__init__.py
+++ b/qutebrowser/__init__.py
@@ -22,7 +22,7 @@
 import os.path
 
 __author__ = "Florian Bruhin"
-__copyright__ = "Copyright 2014-2017 Florian Bruhin (The Compiler)"
+__copyright__ = "Copyright 2014-2018 Florian Bruhin (The Compiler)"
 __license__ = "GPL"
 __maintainer__ = __author__
 __email__ = "mail@qutebrowser.org"

From 5510c5fda12a27c058264bf8eb3d1bcd767cd140 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 11 Feb 2018 11:14:50 +0100
Subject: [PATCH 370/574] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 05107e555..4ae8c28de 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -63,6 +63,7 @@ Changed
   `tabs.persist_mode_on_change`. It can now be set to `restore` which remembers
   input modes (input/passthrough) per tab.
 - More performance improvements when opening/closing many tabs.
+- The `:version` page now has a button to pastebin the information.
 
 Fixed
 ~~~~~

From e10940100d0e6e819f4d17cdf1bb46977d758da0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 11 Feb 2018 11:17:37 +0100
Subject: [PATCH 371/574] Improve/regenerate docs

---
 doc/help/commands.asciidoc      | 8 ++++++++
 qutebrowser/browser/commands.py | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 5fb2c9e6e..c5f013491 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -1241,6 +1241,9 @@ If no win_id is given, the tab will get detached into a new window.
 ==== positional arguments
 * +'win-id'+: The window ID of the window to give the current tab to.
 
+==== count
+Overrides win_id (index starts at 1 for win_id=0).
+
 [[tab-move]]
 === tab-move
 Syntax: +:tab-move ['index']+
@@ -1322,8 +1325,13 @@ Re-open the last closed tab or tabs.
 
 [[version]]
 === version
+Syntax: +:version [*--paste*]+
+
 Show version information.
 
+==== optional arguments
+* +*-p*+, +*--paste*+: Paste to pastebin.
+
 [[view-source]]
 === view-source
 Syntax: +:view-source [*--edit*]+
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 8fd3426c0..85f59bb00 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -541,7 +541,7 @@ class CommandDispatcher:
 
         Args:
             win_id: The window ID of the window to give the current tab to.
-            count: [count] overrides win_id (index starts at 1 for win_id=0)
+            count: Overrides win_id (index starts at 1 for win_id=0).
         """
         if count is not None:
             win_id = count - 1

From 2f4910f1f2553e0faacb0221ac65533508284917 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Sun, 11 Feb 2018 14:17:28 +0000
Subject: [PATCH 372/574] Add test for escaping {{url}}

---
 tests/end2end/features/misc.feature | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/end2end/features/misc.feature b/tests/end2end/features/misc.feature
index 8f21b7421..e15af8ad5 100644
--- a/tests/end2end/features/misc.feature
+++ b/tests/end2end/features/misc.feature
@@ -436,6 +436,11 @@ Feature: Various utility commands.
         And I run :message-info {clipboard}bar{url}
         Then the message "foobarhttp://localhost:*/hello.txt" should be shown
 
+    Scenario: escaping {{url}} variable
+        When I open data/hello.txt
+        And I run :message-info foo{{url}}bar
+        Then the message "foo{url}bar" should be shown
+
     @xfail_norun
     Scenario: {url} in clipboard should not be expanded
         When I open data/hello.txt

From c1122906648f0e39220930f028dbc254fa521a10 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 11 Feb 2018 16:15:29 +0100
Subject: [PATCH 373/574] Make QtNetwork download manager great^H^H^H^Hlobal
 again

We originally made it per-window in b502280c062acbc15a80966a9cabac7babecf0c1 for
issue #228, but that was back when we still needed window IDs for stuff like
message.info.

Nowadays, there's no reason for it to be per-window anymore. The rest of the
download code can deal with one global download manager (because QtWebEngine has
one), and apart from QNAM code which wasn't used here anyways (as tab_id=None)
there was nothing using the window ID anymore.

Also see #3456 which was the original motivation for this change.
---
 qutebrowser/app.py                                     |  6 +++++-
 qutebrowser/browser/adblock.py                         |  3 +--
 qutebrowser/browser/commands.py                        |  3 +--
 qutebrowser/browser/hints.py                           |  3 +--
 qutebrowser/browser/qtnetworkdownloads.py              |  4 ++--
 qutebrowser/browser/webkit/mhtml.py                    |  5 +----
 qutebrowser/browser/webkit/network/networkmanager.py   |  8 ++++++--
 qutebrowser/browser/webkit/network/schemehandler.py    | 10 +---------
 qutebrowser/browser/webkit/webpage.py                  |  9 +++------
 qutebrowser/mainwindow/mainwindow.py                   |  9 ++-------
 tests/unit/browser/test_adblock.py                     |  6 ++----
 tests/unit/browser/webkit/network/test_filescheme.py   |  6 +++---
 .../unit/browser/webkit/network/test_schemehandler.py  |  5 -----
 tests/unit/browser/webkit/test_downloads.py            |  2 +-
 14 files changed, 29 insertions(+), 50 deletions(-)

diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index c87201931..ec477ce8f 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -64,7 +64,7 @@ from qutebrowser.completion.models import miscmodels
 from qutebrowser.commands import cmdutils, runners, cmdexc
 from qutebrowser.config import config, websettings, configfiles, configinit
 from qutebrowser.browser import (urlmarks, adblock, history, browsertab,
-                                 downloads, greasemonkey)
+                                 qtnetworkdownloads, downloads, greasemonkey)
 from qutebrowser.browser.network import proxy
 from qutebrowser.browser.webkit import cookies, cache
 from qutebrowser.browser.webkit.network import networkmanager
@@ -491,6 +491,10 @@ def _init_modules(args, crash_handler):
     diskcache = cache.DiskCache(standarddir.cache(), parent=qApp)
     objreg.register('cache', diskcache)
 
+    log.init.debug("Initializing downloads...")
+    download_manager = qtnetworkdownloads.DownloadManager(parent=qApp)
+    objreg.register('qtnetwork-download-manager', download_manager)
+
     log.init.debug("Initializing Greasemonkey...")
     greasemonkey.init()
 
diff --git a/qutebrowser/browser/adblock.py b/qutebrowser/browser/adblock.py
index fa35684b9..f0462a778 100644
--- a/qutebrowser/browser/adblock.py
+++ b/qutebrowser/browser/adblock.py
@@ -176,8 +176,7 @@ class HostBlocker:
                               self._config_blocked_hosts)
         self._blocked_hosts = set()
         self._done_count = 0
-        download_manager = objreg.get('qtnetwork-download-manager',
-                                      scope='window', window='last-focused')
+        download_manager = objreg.get('qtnetwork-download-manager')
         for url in config.val.content.host_blocking.lists:
             if url.scheme() == 'file':
                 filename = url.toLocalFile()
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 85f59bb00..b56c3d6ae 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1466,8 +1466,7 @@ class CommandDispatcher:
             mhtml_: Download the current page and all assets as mhtml file.
         """
         # FIXME:qtwebengine do this with the QtWebEngine download manager?
-        download_manager = objreg.get('qtnetwork-download-manager',
-                                      scope='window', window=self._win_id)
+        download_manager = objreg.get('qtnetwork-download-manager')
         target = None
         if dest is not None:
             dest = downloads.transform_path(dest)
diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py
index 3e0eddbeb..0390d5d1f 100644
--- a/qutebrowser/browser/hints.py
+++ b/qutebrowser/browser/hints.py
@@ -291,8 +291,7 @@ class HintActions:
         user_agent = context.tab.user_agent()
 
         # FIXME:qtwebengine do this with QtWebEngine downloads?
-        download_manager = objreg.get('qtnetwork-download-manager',
-                                      scope='window', window=self._win_id)
+        download_manager = objreg.get('qtnetwork-download-manager')
         download_manager.get(url, qnam=qnam, user_agent=user_agent,
                              prompt_download_directory=prompt)
 
diff --git a/qutebrowser/browser/qtnetworkdownloads.py b/qutebrowser/browser/qtnetworkdownloads.py
index 746fd8522..82996a803 100644
--- a/qutebrowser/browser/qtnetworkdownloads.py
+++ b/qutebrowser/browser/qtnetworkdownloads.py
@@ -381,10 +381,10 @@ class DownloadManager(downloads.AbstractDownloadManager):
         _networkmanager: A NetworkManager for generic downloads.
     """
 
-    def __init__(self, win_id, parent=None):
+    def __init__(self, parent=None):
         super().__init__(parent)
         self._networkmanager = networkmanager.NetworkManager(
-            win_id=win_id, tab_id=None,
+            win_id=None, tab_id=None,
             private=config.val.content.private_browsing, parent=self)
 
     @pyqtSlot('QUrl')
diff --git a/qutebrowser/browser/webkit/mhtml.py b/qutebrowser/browser/webkit/mhtml.py
index ca807f705..5f495274a 100644
--- a/qutebrowser/browser/webkit/mhtml.py
+++ b/qutebrowser/browser/webkit/mhtml.py
@@ -254,7 +254,6 @@ class _Downloader:
         _finished_file: A flag indicating if the file has already been
                         written.
         _used: A flag indicating if the downloader has already been used.
-        _win_id: The window this downloader belongs to.
     """
 
     def __init__(self, tab, target):
@@ -265,7 +264,6 @@ class _Downloader:
         self.pending_downloads = set()
         self._finished_file = False
         self._used = False
-        self._win_id = tab.win_id
 
     def run(self):
         """Download and save the page.
@@ -365,8 +363,7 @@ class _Downloader:
             self.writer.add_file(urlutils.encoded_url(url), b'')
             return
 
-        download_manager = objreg.get('qtnetwork-download-manager',
-                                      scope='window', window=self._win_id)
+        download_manager = objreg.get('qtnetwork-download-manager')
         target = downloads.FileObjDownloadTarget(_NoCloseBytesIO())
         item = download_manager.get(url, target=target,
                                     auto_remove=True)
diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py
index 8ad486d29..49bf6ebab 100644
--- a/qutebrowser/browser/webkit/network/networkmanager.py
+++ b/qutebrowser/browser/webkit/network/networkmanager.py
@@ -125,7 +125,9 @@ class NetworkManager(QNetworkAccessManager):
         _scheme_handlers: A dictionary (scheme -> handler) of supported custom
                           schemes.
         _win_id: The window ID this NetworkManager is associated with.
+                 (or None for generic network managers)
         _tab_id: The tab ID this NetworkManager is associated with.
+                 (or None for generic network managers)
         _rejected_ssl_errors: A {QUrl: [SslError]} dict of rejected errors.
         _accepted_ssl_errors: A {QUrl: [SslError]} dict of accepted errors.
         _private: Whether we're in private browsing mode.
@@ -149,8 +151,8 @@ class NetworkManager(QNetworkAccessManager):
         self._tab_id = tab_id
         self._private = private
         self._scheme_handlers = {
-            'qute': webkitqutescheme.QuteSchemeHandler(win_id),
-            'file': filescheme.FileSchemeHandler(win_id),
+            'qute': webkitqutescheme.QuteSchemeHandler(),
+            'file': filescheme.FileSchemeHandler(),
         }
         self._set_cookiejar()
         self._set_cache()
@@ -194,6 +196,7 @@ class NetworkManager(QNetworkAccessManager):
         # This might be a generic network manager, e.g. one belonging to a
         # DownloadManager. In this case, just skip the webview thing.
         if self._tab_id is not None:
+            assert self._win_id is not None
             tab = objreg.get('tab', scope='tab', window=self._win_id,
                              tab=self._tab_id)
             abort_on.append(tab.load_started)
@@ -392,6 +395,7 @@ class NetworkManager(QNetworkAccessManager):
         current_url = QUrl()
 
         if self._tab_id is not None:
+            assert self._win_id is not None
             try:
                 tab = objreg.get('tab', scope='tab', window=self._win_id,
                                  tab=self._tab_id)
diff --git a/qutebrowser/browser/webkit/network/schemehandler.py b/qutebrowser/browser/webkit/network/schemehandler.py
index c50194172..278d7e3a3 100644
--- a/qutebrowser/browser/webkit/network/schemehandler.py
+++ b/qutebrowser/browser/webkit/network/schemehandler.py
@@ -27,15 +27,7 @@ from PyQt5.QtCore import QObject
 
 class SchemeHandler(QObject):
 
-    """Abstract base class for custom scheme handlers.
-
-    Attributes:
-        _win_id: The window ID this scheme handler is associated with.
-    """
-
-    def __init__(self, win_id, parent=None):
-        super().__init__(parent)
-        self._win_id = win_id
+    """Abstract base class for custom scheme handlers."""
 
     def createRequest(self, op, request, outgoing_data):
         """Create a new request.
diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index 52107a17b..679ec2d88 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -220,8 +220,7 @@ class BrowserPage(QWebPage):
         """Prepare the web page for being deleted."""
         self._is_shutting_down = True
         self.shutting_down.emit()
-        download_manager = objreg.get('qtnetwork-download-manager',
-                                      scope='window', window=self._win_id)
+        download_manager = objreg.get('qtnetwork-download-manager')
         nam = self.networkAccessManager()
         if download_manager.has_downloads_with_nam(nam):
             nam.setParent(download_manager)
@@ -249,8 +248,7 @@ class BrowserPage(QWebPage):
         after this slot returns.
         """
         req = QNetworkRequest(request)
-        download_manager = objreg.get('qtnetwork-download-manager',
-                                      scope='window', window=self._win_id)
+        download_manager = objreg.get('qtnetwork-download-manager')
         download_manager.get_request(req, qnam=self.networkAccessManager())
 
     @pyqtSlot('QNetworkReply*')
@@ -264,8 +262,7 @@ class BrowserPage(QWebPage):
         here: http://mimesniff.spec.whatwg.org/
         """
         inline, suggested_filename = http.parse_content_disposition(reply)
-        download_manager = objreg.get('qtnetwork-download-manager',
-                                      scope='window', window=self._win_id)
+        download_manager = objreg.get('qtnetwork-download-manager')
         if not inline:
             # Content-Disposition: attachment -> force download
             download_manager.fetch(reply,
diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index 235c15295..05482a1d5 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -34,8 +34,7 @@ from qutebrowser.utils import (message, log, usertypes, qtutils, objreg, utils,
 from qutebrowser.mainwindow import messageview, prompt
 from qutebrowser.completion import completionwidget, completer
 from qutebrowser.keyinput import modeman
-from qutebrowser.browser import (commands, downloadview, hints,
-                                 qtnetworkdownloads, downloads)
+from qutebrowser.browser import commands, downloadview, hints, downloads
 from qutebrowser.misc import crashsignal, keyhintwidget
 
 
@@ -299,11 +298,7 @@ class MainWindow(QWidget):
 
     def _init_downloadmanager(self):
         log.init.debug("Initializing downloads...")
-        qtnetwork_download_manager = qtnetworkdownloads.DownloadManager(
-            self.win_id, self)
-        objreg.register('qtnetwork-download-manager',
-                        qtnetwork_download_manager,
-                        scope='window', window=self.win_id)
+        qtnetwork_download_manager = objreg.get('qtnetwork-download-manager')
 
         try:
             webengine_download_manager = objreg.get(
diff --git a/tests/unit/browser/test_adblock.py b/tests/unit/browser/test_adblock.py
index cbb2a2a6d..09161e806 100644
--- a/tests/unit/browser/test_adblock.py
+++ b/tests/unit/browser/test_adblock.py
@@ -104,11 +104,9 @@ class FakeDownloadManager:
 def download_stub(win_registry, tmpdir):
     """Register a FakeDownloadManager."""
     stub = FakeDownloadManager(tmpdir)
-    objreg.register('qtnetwork-download-manager', stub,
-                    scope='window', window='last-focused')
+    objreg.register('qtnetwork-download-manager', stub)
     yield
-    objreg.delete('qtnetwork-download-manager', scope='window',
-                  window='last-focused')
+    objreg.delete('qtnetwork-download-manager')
 
 
 def create_zipfile(directory, files, zipname='test'):
diff --git a/tests/unit/browser/webkit/network/test_filescheme.py b/tests/unit/browser/webkit/network/test_filescheme.py
index 8b3287830..50b908dc0 100644
--- a/tests/unit/browser/webkit/network/test_filescheme.py
+++ b/tests/unit/browser/webkit/network/test_filescheme.py
@@ -248,7 +248,7 @@ class TestFileSchemeHandler:
     def test_dir(self, tmpdir):
         url = QUrl.fromLocalFile(str(tmpdir))
         req = QNetworkRequest(url)
-        handler = filescheme.FileSchemeHandler(win_id=0)
+        handler = filescheme.FileSchemeHandler()
         reply = handler.createRequest(None, req, None)
         # The URL will always use /, even on Windows - so we force this here
         # too.
@@ -260,14 +260,14 @@ class TestFileSchemeHandler:
         filename.ensure()
         url = QUrl.fromLocalFile(str(filename))
         req = QNetworkRequest(url)
-        handler = filescheme.FileSchemeHandler(win_id=0)
+        handler = filescheme.FileSchemeHandler()
         reply = handler.createRequest(None, req, None)
         assert reply is None
 
     def test_unicode_encode_error(self, mocker):
         url = QUrl('file:///tmp/foo')
         req = QNetworkRequest(url)
-        handler = filescheme.FileSchemeHandler(win_id=0)
+        handler = filescheme.FileSchemeHandler()
 
         err = UnicodeEncodeError('ascii', '', 0, 2, 'foo')
         mocker.patch('os.path.isdir', side_effect=err)
diff --git a/tests/unit/browser/webkit/network/test_schemehandler.py b/tests/unit/browser/webkit/network/test_schemehandler.py
index 24e54e0d9..cb1ac3dec 100644
--- a/tests/unit/browser/webkit/network/test_schemehandler.py
+++ b/tests/unit/browser/webkit/network/test_schemehandler.py
@@ -24,11 +24,6 @@ import pytest
 from qutebrowser.browser.webkit.network import schemehandler
 
 
-def test_init():
-    handler = schemehandler.SchemeHandler(0)
-    assert handler._win_id == 0
-
-
 def test_create_request():
     handler = schemehandler.SchemeHandler(0)
     with pytest.raises(NotImplementedError):
diff --git a/tests/unit/browser/webkit/test_downloads.py b/tests/unit/browser/webkit/test_downloads.py
index da1fcb424..87fff7244 100644
--- a/tests/unit/browser/webkit/test_downloads.py
+++ b/tests/unit/browser/webkit/test_downloads.py
@@ -24,7 +24,7 @@ from qutebrowser.browser import downloads, qtnetworkdownloads
 
 def test_download_model(qapp, qtmodeltester, config_stub, cookiejar_and_cache):
     """Simple check for download model internals."""
-    manager = qtnetworkdownloads.DownloadManager(win_id=0)
+    manager = qtnetworkdownloads.DownloadManager()
     model = downloads.DownloadModel(manager)
     qtmodeltester.check(model)
 

From 7c0832daf26638aeeacdff6933ba4c68620060fb Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Sun, 11 Feb 2018 15:51:48 +0000
Subject: [PATCH 374/574] Change lambda definition - avoid mutability error

---
 qutebrowser/commands/runners.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/commands/runners.py b/qutebrowser/commands/runners.py
index a3d142434..965f4a6b6 100644
--- a/qutebrowser/commands/runners.py
+++ b/qutebrowser/commands/runners.py
@@ -68,7 +68,11 @@ def replace_variables(win_id, arglist):
     }
     for key in list(variables):
         modified_key = '{' + key + '}'
-        variables[modified_key] = lambda: modified_key
+
+        def key_function(modified_key):
+            return lambda: modified_key
+
+        variables[modified_key] = key_function(modified_key)
     values = {}
     args = []
     tabbed_browser = objreg.get('tabbed-browser', scope='window',

From 3170e35b31a500a1729ee2ecafd231d55535ab57 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 11 Feb 2018 17:14:41 +0100
Subject: [PATCH 375/574] Simplify QtWebKit scheme handlers

---
 .../browser/webkit/network/filescheme.py      | 40 ++++++-------
 .../browser/webkit/network/networkmanager.py  |  8 +--
 .../browser/webkit/network/schemehandler.py   | 43 --------------
 .../webkit/network/webkitqutescheme.py        | 58 ++++++++-----------
 scripts/dev/check_coverage.py                 |  2 -
 .../browser/webkit/network/test_filescheme.py |  9 +--
 .../webkit/network/test_schemehandler.py      | 30 ----------
 7 files changed, 48 insertions(+), 142 deletions(-)
 delete mode 100644 qutebrowser/browser/webkit/network/schemehandler.py
 delete mode 100644 tests/unit/browser/webkit/network/test_schemehandler.py

diff --git a/qutebrowser/browser/webkit/network/filescheme.py b/qutebrowser/browser/webkit/network/filescheme.py
index d8c2c36b8..840ed6a4a 100644
--- a/qutebrowser/browser/webkit/network/filescheme.py
+++ b/qutebrowser/browser/webkit/network/filescheme.py
@@ -25,7 +25,7 @@
 
 import os
 
-from qutebrowser.browser.webkit.network import schemehandler, networkreply
+from qutebrowser.browser.webkit.network import networkreply
 from qutebrowser.utils import jinja
 
 
@@ -111,27 +111,21 @@ def dirbrowser_html(path):
     return html.encode('UTF-8', errors='xmlcharrefreplace')
 
 
-class FileSchemeHandler(schemehandler.SchemeHandler):
+def handler(request):
+    """Handler for a file:// URL.
 
-    """Scheme handler for file: URLs."""
+    Args:
+        request: QNetworkRequest to answer to.
 
-    def createRequest(self, _op, request, _outgoing_data):
-        """Create a new request.
-
-        Args:
-             request: const QNetworkRequest & req
-             _op: Operation op
-             _outgoing_data: QIODevice * outgoingData
-
-        Return:
-            A QNetworkReply for directories, None for files.
-        """
-        path = request.url().toLocalFile()
-        try:
-            if os.path.isdir(path):
-                data = dirbrowser_html(path)
-                return networkreply.FixedDataNetworkReply(
-                    request, data, 'text/html', self.parent())
-            return None
-        except UnicodeEncodeError:
-            return None
+    Return:
+        A QNetworkReply for directories, None for files.
+    """
+    path = request.url().toLocalFile()
+    try:
+        if os.path.isdir(path):
+            data = dirbrowser_html(path)
+            return networkreply.FixedDataNetworkReply(
+                request, data, 'text/html')
+        return None
+    except UnicodeEncodeError:
+        return None
diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py
index 49bf6ebab..53508aaa6 100644
--- a/qutebrowser/browser/webkit/network/networkmanager.py
+++ b/qutebrowser/browser/webkit/network/networkmanager.py
@@ -151,8 +151,8 @@ class NetworkManager(QNetworkAccessManager):
         self._tab_id = tab_id
         self._private = private
         self._scheme_handlers = {
-            'qute': webkitqutescheme.QuteSchemeHandler(),
-            'file': filescheme.FileSchemeHandler(),
+            'qute': webkitqutescheme.handler,
+            'file': filescheme.handler,
         }
         self._set_cookiejar()
         self._set_cache()
@@ -373,9 +373,9 @@ class NetworkManager(QNetworkAccessManager):
 
         scheme = req.url().scheme()
         if scheme in self._scheme_handlers:
-            result = self._scheme_handlers[scheme].createRequest(
-                op, req, outgoing_data)
+            result = self._scheme_handlers[scheme](req)
             if result is not None:
+                result.setParent(self)
                 return result
 
         for header, value in shared.custom_headers():
diff --git a/qutebrowser/browser/webkit/network/schemehandler.py b/qutebrowser/browser/webkit/network/schemehandler.py
deleted file mode 100644
index 278d7e3a3..000000000
--- a/qutebrowser/browser/webkit/network/schemehandler.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-
-# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
-#
-# Based on the Eric5 helpviewer,
-# Copyright (c) 2009 - 2014 Detlev Offenbach <detlev@die-offenbachs.de>
-#
-# This file is part of qutebrowser.
-#
-# qutebrowser is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# qutebrowser is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Base class for custom scheme handlers."""
-
-from PyQt5.QtCore import QObject
-
-
-class SchemeHandler(QObject):
-
-    """Abstract base class for custom scheme handlers."""
-
-    def createRequest(self, op, request, outgoing_data):
-        """Create a new request.
-
-        Args:
-             op: Operation op
-             req: const QNetworkRequest & req
-             outgoing_data: QIODevice * outgoingData
-
-        Return:
-            A QNetworkReply.
-        """
-        raise NotImplementedError
diff --git a/qutebrowser/browser/webkit/network/webkitqutescheme.py b/qutebrowser/browser/webkit/network/webkitqutescheme.py
index 2ed8d5aa1..d732b6ab0 100644
--- a/qutebrowser/browser/webkit/network/webkitqutescheme.py
+++ b/qutebrowser/browser/webkit/network/webkitqutescheme.py
@@ -24,46 +24,36 @@ import mimetypes
 from PyQt5.QtNetwork import QNetworkReply
 
 from qutebrowser.browser import pdfjs, qutescheme
-from qutebrowser.browser.webkit.network import schemehandler, networkreply
+from qutebrowser.browser.webkit.network import networkreply
 from qutebrowser.utils import log, usertypes, qtutils
 
 
-class QuteSchemeHandler(schemehandler.SchemeHandler):
+def handler(request):
+    """Scheme handler for qute:// URLs.
 
-    """Scheme handler for qute:// URLs."""
+    Args:
+        request: QNetworkRequest to answer to.
 
-    def createRequest(self, _op, request, _outgoing_data):
-        """Create a new request.
+    Return:
+        A QNetworkReply.
+    """
+    try:
+        mimetype, data = qutescheme.data_for_url(request.url())
+    except qutescheme.NoHandlerFound:
+        errorstr = "No handler found for {}!".format(
+            request.url().toDisplayString())
+        return networkreply.ErrorNetworkReply(
+            request, errorstr, QNetworkReply.ContentNotFoundError)
+    except qutescheme.QuteSchemeOSError as e:
+        return networkreply.ErrorNetworkReply(
+            request, str(e), QNetworkReply.ContentNotFoundError)
+    except qutescheme.QuteSchemeError as e:
+        return networkreply.ErrorNetworkReply(request, e.errorstring, e.error)
+    except qutescheme.Redirect as e:
+        qtutils.ensure_valid(e.url)
+        return networkreply.RedirectNetworkReply(e.url)
 
-        Args:
-             request: const QNetworkRequest & req
-             _op: Operation op
-             _outgoing_data: QIODevice * outgoingData
-
-        Return:
-            A QNetworkReply.
-        """
-        try:
-            mimetype, data = qutescheme.data_for_url(request.url())
-        except qutescheme.NoHandlerFound:
-            errorstr = "No handler found for {}!".format(
-                request.url().toDisplayString())
-            return networkreply.ErrorNetworkReply(
-                request, errorstr, QNetworkReply.ContentNotFoundError,
-                self.parent())
-        except qutescheme.QuteSchemeOSError as e:
-            return networkreply.ErrorNetworkReply(
-                request, str(e), QNetworkReply.ContentNotFoundError,
-                self.parent())
-        except qutescheme.QuteSchemeError as e:
-            return networkreply.ErrorNetworkReply(request, e.errorstring,
-                                                  e.error, self.parent())
-        except qutescheme.Redirect as e:
-            qtutils.ensure_valid(e.url)
-            return networkreply.RedirectNetworkReply(e.url, self.parent())
-
-        return networkreply.FixedDataNetworkReply(request, data, mimetype,
-                                                  self.parent())
+    return networkreply.FixedDataNetworkReply(request, data, mimetype)
 
 
 @qutescheme.add_handler('pdfjs', backend=usertypes.Backend.QtWebKit)
diff --git a/scripts/dev/check_coverage.py b/scripts/dev/check_coverage.py
index 45ad534e1..ea971c28c 100644
--- a/scripts/dev/check_coverage.py
+++ b/scripts/dev/check_coverage.py
@@ -72,8 +72,6 @@ PERFECT_FILES = [
     #  'browser/webkit/webkitelem.py'),
     # ('tests/unit/browser/webkit/test_webkitelem.py',
     #  'browser/webelem.py'),
-    ('tests/unit/browser/webkit/network/test_schemehandler.py',
-     'browser/webkit/network/schemehandler.py'),
     ('tests/unit/browser/webkit/network/test_filescheme.py',
      'browser/webkit/network/filescheme.py'),
     ('tests/unit/browser/webkit/network/test_networkreply.py',
diff --git a/tests/unit/browser/webkit/network/test_filescheme.py b/tests/unit/browser/webkit/network/test_filescheme.py
index 50b908dc0..5bdbb47cc 100644
--- a/tests/unit/browser/webkit/network/test_filescheme.py
+++ b/tests/unit/browser/webkit/network/test_filescheme.py
@@ -248,8 +248,7 @@ class TestFileSchemeHandler:
     def test_dir(self, tmpdir):
         url = QUrl.fromLocalFile(str(tmpdir))
         req = QNetworkRequest(url)
-        handler = filescheme.FileSchemeHandler()
-        reply = handler.createRequest(None, req, None)
+        reply = filescheme.handler(req)
         # The URL will always use /, even on Windows - so we force this here
         # too.
         tmpdir_path = str(tmpdir).replace(os.sep, '/')
@@ -260,17 +259,15 @@ class TestFileSchemeHandler:
         filename.ensure()
         url = QUrl.fromLocalFile(str(filename))
         req = QNetworkRequest(url)
-        handler = filescheme.FileSchemeHandler()
-        reply = handler.createRequest(None, req, None)
+        reply = filescheme.handler(req)
         assert reply is None
 
     def test_unicode_encode_error(self, mocker):
         url = QUrl('file:///tmp/foo')
         req = QNetworkRequest(url)
-        handler = filescheme.FileSchemeHandler()
 
         err = UnicodeEncodeError('ascii', '', 0, 2, 'foo')
         mocker.patch('os.path.isdir', side_effect=err)
 
-        reply = handler.createRequest(None, req, None)
+        reply = filescheme.handler(req)
         assert reply is None
diff --git a/tests/unit/browser/webkit/network/test_schemehandler.py b/tests/unit/browser/webkit/network/test_schemehandler.py
deleted file mode 100644
index cb1ac3dec..000000000
--- a/tests/unit/browser/webkit/network/test_schemehandler.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-
-# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
-#
-# This file is part of qutebrowser.
-#
-# qutebrowser is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# qutebrowser is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Tests for browser.network.schemehandler."""
-
-import pytest
-
-from qutebrowser.browser.webkit.network import schemehandler
-
-
-def test_create_request():
-    handler = schemehandler.SchemeHandler(0)
-    with pytest.raises(NotImplementedError):
-        handler.createRequest(None, None, None)

From b2e85a8b838b2e8b6b0396609828ecd40ae1447f Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Sun, 11 Feb 2018 16:33:26 +0000
Subject: [PATCH 376/574] Simplify to lambda with default argument

---
 qutebrowser/commands/runners.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/qutebrowser/commands/runners.py b/qutebrowser/commands/runners.py
index 965f4a6b6..0171f6c37 100644
--- a/qutebrowser/commands/runners.py
+++ b/qutebrowser/commands/runners.py
@@ -68,11 +68,7 @@ def replace_variables(win_id, arglist):
     }
     for key in list(variables):
         modified_key = '{' + key + '}'
-
-        def key_function(modified_key):
-            return lambda: modified_key
-
-        variables[modified_key] = key_function(modified_key)
+        variables[modified_key] = lambda x=modified_key: x
     values = {}
     args = []
     tabbed_browser = objreg.get('tabbed-browser', scope='window',

From 21a50cf9619423d8104c198b4636e1c548f7d248 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Sun, 11 Feb 2018 17:46:09 +0000
Subject: [PATCH 377/574] Use the repr() of the exception instead of str()

---
 qutebrowser/config/configexc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/config/configexc.py b/qutebrowser/config/configexc.py
index 0a4986efa..b7df1eceb 100644
--- a/qutebrowser/config/configexc.py
+++ b/qutebrowser/config/configexc.py
@@ -92,7 +92,7 @@ class ConfigErrorDesc:
     traceback = attr.ib(None)
 
     def __str__(self):
-        return '{}: {}'.format(self.text, self.exception)
+        return '{}: {} '.format(self.text, repr(self.exception))
 
     def with_text(self, text):
         """Get a new ConfigErrorDesc with the given text appended."""

From ddc41d2fa41f30bd6e8bb4c72206e89f098eff29 Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Sun, 11 Feb 2018 22:15:14 +0100
Subject: [PATCH 378/574] Remove raw list of open tabs

---
 qutebrowser/html/tabs.html | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/qutebrowser/html/tabs.html b/qutebrowser/html/tabs.html
index 80244ef51..d929272c5 100644
--- a/qutebrowser/html/tabs.html
+++ b/qutebrowser/html/tabs.html
@@ -43,14 +43,4 @@ th {
     </tbody>
 </table>
 {% endfor %}
-
-<h2>Raw list</h2>
-<code>
-{% for win_id, tabs in tab_list_by_window.items() %}
-    {% for name, url in tabs %}
-    {{url}}</br>
-    {% endfor %}
-{% endfor %}
-</code>
-
 {% endblock %}

From 4a8b23380ce38c532c9c5d6c9a2d8568ecead37b Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sun, 11 Feb 2018 16:19:28 -0500
Subject: [PATCH 379/574] Trigger save on bookmark-add --toggle.

The toggle option was failing to fire the changed signal when it removed
a bookmark. This means the bookmark file would not be marked as dirty,
and would not be saved on exit/autosave (unless another change was
made).
---
 qutebrowser/browser/urlmarks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/urlmarks.py b/qutebrowser/browser/urlmarks.py
index d2f563bb6..0a0dfb4f2 100644
--- a/qutebrowser/browser/urlmarks.py
+++ b/qutebrowser/browser/urlmarks.py
@@ -280,7 +280,7 @@ class BookmarkManager(UrlMarkManager):
 
         if urlstr in self.marks:
             if toggle:
-                del self.marks[urlstr]
+                self.delete(urlstr)
                 return False
             else:
                 raise AlreadyExistsError("Bookmark already exists!")

From d0ca54a0cfbaf98518ab156a22da14cf30296df9 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Tue, 6 Feb 2018 11:14:01 -0500
Subject: [PATCH 380/574] Add unit tests for urlmarks.

---
 tests/unit/browser/urlmarks.py | 127 +++++++++++++++++++++++++++++++++
 1 file changed, 127 insertions(+)
 create mode 100644 tests/unit/browser/urlmarks.py

diff --git a/tests/unit/browser/urlmarks.py b/tests/unit/browser/urlmarks.py
new file mode 100644
index 000000000..8e17bd326
--- /dev/null
+++ b/tests/unit/browser/urlmarks.py
@@ -0,0 +1,127 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests for the global page history."""
+
+from unittest import mock
+import pytest
+from PyQt5.QtCore import QUrl
+
+from qutebrowser.browser import urlmarks
+
+
+@pytest.fixture
+def bm_file(config_tmpdir):
+    bm_dir = config_tmpdir / 'bookmarks'
+    bm_dir.mkdir()
+    bm_file = bm_dir / 'urls'
+    return bm_file
+
+
+def test_init(bm_file, fake_save_manager):
+    bm_file.write('\n'.join([
+        'http://example.com Example Site',
+        'http://example.com/foo Foo',
+        'http://example.com/bar Bar',
+        'http://example.com/notitle',
+    ]))
+
+    bm = urlmarks.BookmarkManager()
+    fake_save_manager.add_saveable.assert_called_once_with(
+        'bookmark-manager',
+        bm.save,
+        mock.ANY,  # TODO: compare signal argument for equality
+        filename=str(bm_file),
+    )
+
+    assert list(bm.marks.items()) == [
+        ('http://example.com', 'Example Site'),
+        ('http://example.com/foo', 'Foo'),
+        ('http://example.com/bar', 'Bar'),
+        ('http://example.com/notitle', ''),
+    ]
+
+
+def test_add(bm_file, fake_save_manager, qtbot):
+    bm = urlmarks.BookmarkManager()
+
+    with qtbot.wait_signal(bm.changed):
+        bm.add(QUrl('http://example.com'), 'Example Site')
+    assert list(bm.marks.items()) == [
+        ('http://example.com', 'Example Site'),
+    ]
+
+    with qtbot.wait_signal(bm.changed):
+        bm.add(QUrl('http://example.com/notitle'), '')
+    assert list(bm.marks.items()) == [
+        ('http://example.com', 'Example Site'),
+        ('http://example.com/notitle', ''),
+    ]
+
+
+def test_add_toggle(bm_file, fake_save_manager, qtbot):
+    bm = urlmarks.BookmarkManager()
+
+    with qtbot.wait_signal(bm.changed):
+        bm.add(QUrl('http://example.com'), '', toggle=True)
+    assert 'http://example.com' in bm.marks
+
+    with qtbot.wait_signal(bm.changed):
+        bm.add(QUrl('http://example.com'), '', toggle=True)
+    assert 'http://example.com' not in bm.marks
+
+    with qtbot.wait_signal(bm.changed):
+        bm.add(QUrl('http://example.com'), '', toggle=True)
+    assert 'http://example.com' in bm.marks
+
+
+def test_add_dupe(bm_file, fake_save_manager, qtbot):
+    bm = urlmarks.BookmarkManager()
+
+    bm.add(QUrl('http://example.com'), '')
+    with pytest.raises(urlmarks.AlreadyExistsError):
+        bm.add(QUrl('http://example.com'), '')
+
+
+def test_delete(bm_file, fake_save_manager, qtbot):
+    bm = urlmarks.BookmarkManager()
+
+    bm.add(QUrl('http://example.com/foo'), 'Foo')
+    bm.add(QUrl('http://example.com/bar'), 'Bar')
+    bm.add(QUrl('http://example.com/baz'), 'Baz')
+    bm.save()
+
+    with qtbot.wait_signal(bm.changed):
+        bm.delete('http://example.com/bar')
+    assert list(bm.marks.items()) == [
+        ('http://example.com/foo', 'Foo'),
+        ('http://example.com/baz', 'Baz'),
+    ]
+
+
+def test_save(bm_file, fake_save_manager, qtbot):
+    bm = urlmarks.BookmarkManager()
+
+    bm.add(QUrl('http://example.com'), 'Example Site')
+    bm.add(QUrl('http://example.com/notitle'), '')
+    bm.save()
+    assert bm_file.read().splitlines() == [
+        'http://example.com Example Site',
+        'http://example.com/notitle ',
+    ]

From 72103ec73022b81b12923425a42e705f9f3ddadb Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Sun, 11 Feb 2018 23:16:04 +0000
Subject: [PATCH 381/574] Format error type in a different way

---
 qutebrowser/config/configexc.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/config/configexc.py b/qutebrowser/config/configexc.py
index b7df1eceb..1444f79ab 100644
--- a/qutebrowser/config/configexc.py
+++ b/qutebrowser/config/configexc.py
@@ -92,7 +92,8 @@ class ConfigErrorDesc:
     traceback = attr.ib(None)
 
     def __str__(self):
-        return '{}: {} '.format(self.text, repr(self.exception))
+        return '{} - {}: {} '.format(self.text,
+                                     self.exception.__class__.__name__, self.exception)
 
     def with_text(self, text):
         """Get a new ConfigErrorDesc with the given text appended."""

From 164b2a3eef9b06ccfd150eb3d29369d0bff30151 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Sun, 11 Feb 2018 23:20:24 +0000
Subject: [PATCH 382/574] Fix a lengthy line

---
 qutebrowser/config/configexc.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/config/configexc.py b/qutebrowser/config/configexc.py
index 1444f79ab..7be1ccf2a 100644
--- a/qutebrowser/config/configexc.py
+++ b/qutebrowser/config/configexc.py
@@ -93,7 +93,8 @@ class ConfigErrorDesc:
 
     def __str__(self):
         return '{} - {}: {} '.format(self.text,
-                                     self.exception.__class__.__name__, self.exception)
+                                     self.exception.__class__.__name__,
+                                     self.exception)
 
     def with_text(self, text):
         """Get a new ConfigErrorDesc with the given text appended."""

From a0e028a851b1e0f6fab146bb3fd97685473fa33b Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sun, 11 Feb 2018 22:32:03 -0500
Subject: [PATCH 383/574] Update tab scroll position when finished loading.

Resolves #3322
---
 qutebrowser/browser/webengine/webenginetab.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 280c55c39..c30925372 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -26,7 +26,7 @@ import html as html_utils
 
 import sip
 from PyQt5.QtCore import (pyqtSignal, pyqtSlot, Qt, QEvent, QPoint, QPointF,
-                          QUrl, QTimer)
+                          QUrl)
 from PyQt5.QtGui import QKeyEvent
 from PyQt5.QtNetwork import QAuthenticator
 from PyQt5.QtWidgets import QApplication
@@ -495,7 +495,7 @@ class WebEngineHistory(browsertab.AbstractHistory):
                 self._tab.zoom.set_factor(cur_data['zoom'])
             if ('scroll-pos' in cur_data and
                     self._tab.scroller.pos_px() == QPoint(0, 0)):
-                QTimer.singleShot(0, functools.partial(
+                self._tab.get_page().loadFinished.connect(functools.partial(
                     self._tab.scroller.to_point, cur_data['scroll-pos']))
 
 
@@ -643,6 +643,9 @@ class WebEngineTab(browsertab.AbstractTab):
         self.zoom.set_factor(self._saved_zoom)
         self._saved_zoom = None
 
+    def get_page(self):
+        return self._widget.page()
+
     def openurl(self, url):
         self._saved_zoom = self.zoom.factor()
         self._openurl_prepare(url)

From 0a9c0a1385f1491070b186372a1fd2a33c7952ff Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 12 Feb 2018 07:16:01 -0500
Subject: [PATCH 384/574] on_load_finished() signal handler for scroll-pos

remove get_page()
---
 qutebrowser/browser/webengine/webenginetab.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index c30925372..f642e7e57 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -490,13 +490,16 @@ class WebEngineHistory(browsertab.AbstractHistory):
     def load_items(self, items):
         stream, _data, cur_data = tabhistory.serialize(items)
         qtutils.deserialize_stream(stream, self._history)
+        @pyqtSlot()
+        def _on_load_finished():
+            self._tab.scroller.to_point(cur_data['scroll-pos'])
+            self._tab.load_finished.disconnect(_on_load_finished)
         if cur_data is not None:
             if 'zoom' in cur_data:
                 self._tab.zoom.set_factor(cur_data['zoom'])
             if ('scroll-pos' in cur_data and
                     self._tab.scroller.pos_px() == QPoint(0, 0)):
-                self._tab.get_page().loadFinished.connect(functools.partial(
-                    self._tab.scroller.to_point, cur_data['scroll-pos']))
+                self._tab.load_finished.connect(_on_load_finished)
 
 
 class WebEngineZoom(browsertab.AbstractZoom):
@@ -643,9 +646,6 @@ class WebEngineTab(browsertab.AbstractTab):
         self.zoom.set_factor(self._saved_zoom)
         self._saved_zoom = None
 
-    def get_page(self):
-        return self._widget.page()
-
     def openurl(self, url):
         self._saved_zoom = self.zoom.factor()
         self._openurl_prepare(url)

From 68b12e6e9fcf225a10f2d11672d65c04a17d5d8f Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 12 Feb 2018 07:31:02 -0500
Subject: [PATCH 385/574] add missing lines

---
 qutebrowser/browser/webengine/webenginetab.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index f642e7e57..ed6697f03 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -490,10 +490,12 @@ class WebEngineHistory(browsertab.AbstractHistory):
     def load_items(self, items):
         stream, _data, cur_data = tabhistory.serialize(items)
         qtutils.deserialize_stream(stream, self._history)
+
         @pyqtSlot()
         def _on_load_finished():
             self._tab.scroller.to_point(cur_data['scroll-pos'])
             self._tab.load_finished.disconnect(_on_load_finished)
+
         if cur_data is not None:
             if 'zoom' in cur_data:
                 self._tab.zoom.set_factor(cur_data['zoom'])

From ce8b457baca6a6bc92eceeecd17e1932c896ee98 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Mon, 12 Feb 2018 13:43:22 +0000
Subject: [PATCH 386/574] Only display exception type if no traceback

Update test to match
---
 qutebrowser/config/configexc.py     | 8 +++++---
 tests/unit/config/test_configexc.py | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/config/configexc.py b/qutebrowser/config/configexc.py
index 7be1ccf2a..c85aa2220 100644
--- a/qutebrowser/config/configexc.py
+++ b/qutebrowser/config/configexc.py
@@ -92,9 +92,11 @@ class ConfigErrorDesc:
     traceback = attr.ib(None)
 
     def __str__(self):
-        return '{} - {}: {} '.format(self.text,
-                                     self.exception.__class__.__name__,
-                                     self.exception)
+        if self.traceback:
+            return '{} - {}: {} '.format(self.text,
+                                         self.exception.__class__.__name__,
+                                         self.exception)
+        return '{}: {}'.format(self.text, self.exception)
 
     def with_text(self, text):
         """Get a new ConfigErrorDesc with the given text appended."""
diff --git a/tests/unit/config/test_configexc.py b/tests/unit/config/test_configexc.py
index f415ed2fb..2f2ce435f 100644
--- a/tests/unit/config/test_configexc.py
+++ b/tests/unit/config/test_configexc.py
@@ -74,7 +74,7 @@ def test_config_file_errors_str(errors):
     assert str(errors).splitlines() == [
         'Errors occurred while reading config.py:',
         '  Error text 1: Exception 1',
-        '  Error text 2: Exception 2',
+        '  Error text 2 - Exception: Exception 2 ',
     ]
 
 

From b59a7cdcc0e0b7f961867a0d705aaa1c9b22f4c2 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Mon, 12 Feb 2018 14:07:05 +0000
Subject: [PATCH 387/574] Report syntax errors as unhandled exceptions

Update tests accordingly
---
 qutebrowser/config/configfiles.py     | 2 +-
 tests/unit/config/test_configfiles.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 692474075..3dccc129f 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -419,7 +419,7 @@ def read_config_py(filename, raising=False):
         desc = configexc.ConfigErrorDesc("Error while compiling", e)
         raise configexc.ConfigFileErrors(basename, [desc])
     except SyntaxError as e:
-        desc = configexc.ConfigErrorDesc("Syntax Error", e,
+        desc = configexc.ConfigErrorDesc("Unhandled exception", e,
                                          traceback=traceback.format_exc())
         raise configexc.ConfigFileErrors(basename, [desc])
 
diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index 341fad689..06633ffc7 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -550,7 +550,7 @@ class TestConfigPy:
         assert len(excinfo.value.errors) == 1
         error = excinfo.value.errors[0]
         assert isinstance(error.exception, SyntaxError)
-        assert error.text == "Syntax Error"
+        assert error.text == "Unhandled exception"
         exception_text = 'invalid syntax (config.py, line 1)'
         assert str(error.exception) == exception_text
 

From 5b718446b615c18d9f9274cc0317ff609245adce Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Mon, 12 Feb 2018 14:19:18 +0000
Subject: [PATCH 388/574] Add test for sourcing config with invalid source

---
 tests/unit/config/test_configcommands.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/unit/config/test_configcommands.py b/tests/unit/config/test_configcommands.py
index c82195906..e1855349f 100644
--- a/tests/unit/config/test_configcommands.py
+++ b/tests/unit/config/test_configcommands.py
@@ -309,6 +309,18 @@ class TestSource:
                     "  While setting 'foo': No option 'foo'")
         assert str(excinfo.value) == expected
 
+    def test_invalid_source(self, commands, config_tmpdir):
+        pyfile = config_tmpdir / 'config.py'
+        pyfile.write_text('1/0', encoding='utf-8')
+
+        with pytest.raises(cmdexc.CommandError) as excinfo:
+            commands.config_source()
+
+        expected = ("Errors occurred while reading config.py:\n"
+                    "  Unhandled exception - ZeroDivisionError:"
+                    " division by zero ")
+        assert str(excinfo.value) == expected
+
 
 class TestEdit:
 

From ad50a7bfd284eb58d9edf2d4a8666157181c51b7 Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Mon, 12 Feb 2018 15:20:06 +0100
Subject: [PATCH 389/574] Move import to external ressources

---
 qutebrowser/browser/qutescheme.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 397e9f35e..e66cf637f 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -34,13 +34,13 @@ import collections
 
 import pkg_resources
 from PyQt5.QtCore import QUrlQuery, QUrl
+import sip
 
 import qutebrowser
 from qutebrowser.config import config, configdata, configexc, configdiff
 from qutebrowser.utils import (version, utils, jinja, log, message, docutils,
                                objreg, urlutils)
 from qutebrowser.misc import objects
-import sip
 
 
 pyeval_output = ":pyeval was never called"

From 71d33a47b383b2b0bb24bcd172d58e11a86e491c Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Mon, 12 Feb 2018 15:20:41 +0100
Subject: [PATCH 390/574] Remove useless intermediary variables

---
 qutebrowser/browser/qutescheme.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index e66cf637f..10790e8b5 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -210,13 +210,12 @@ def qute_tabs(_url):
     for win_id, window in objreg.window_registry.items():
         if sip.isdeleted(window):
             continue
-        win_id_str = str(win_id)
         tabbed_browser = objreg.get('tabbed-browser',
                                     scope='window',
                                     window=win_id)
         for tab_idx in range(tabbed_browser.count()):
             tab_fields = tabbed_browser.get_tab_fields(tab_idx)
-            tabs[win_id_str].append(
+            tabs[str(win_id)].append(
                 (tab_fields['title'], tab_fields['current_url']))
 
     html = jinja.render('tabs.html',

From 561e5d17b9450dec7a7b07de071f723f6d3610cc Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Mon, 12 Feb 2018 14:22:25 +0000
Subject: [PATCH 391/574] Remove extraneous space

---
 qutebrowser/config/configexc.py          | 2 +-
 tests/unit/config/test_configcommands.py | 2 +-
 tests/unit/config/test_configexc.py      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/config/configexc.py b/qutebrowser/config/configexc.py
index c85aa2220..2c0e5a58f 100644
--- a/qutebrowser/config/configexc.py
+++ b/qutebrowser/config/configexc.py
@@ -93,7 +93,7 @@ class ConfigErrorDesc:
 
     def __str__(self):
         if self.traceback:
-            return '{} - {}: {} '.format(self.text,
+            return '{} - {}: {}'.format(self.text,
                                          self.exception.__class__.__name__,
                                          self.exception)
         return '{}: {}'.format(self.text, self.exception)
diff --git a/tests/unit/config/test_configcommands.py b/tests/unit/config/test_configcommands.py
index e1855349f..13b2ae943 100644
--- a/tests/unit/config/test_configcommands.py
+++ b/tests/unit/config/test_configcommands.py
@@ -318,7 +318,7 @@ class TestSource:
 
         expected = ("Errors occurred while reading config.py:\n"
                     "  Unhandled exception - ZeroDivisionError:"
-                    " division by zero ")
+                    " division by zero")
         assert str(excinfo.value) == expected
 
 
diff --git a/tests/unit/config/test_configexc.py b/tests/unit/config/test_configexc.py
index 2f2ce435f..87f3abb6a 100644
--- a/tests/unit/config/test_configexc.py
+++ b/tests/unit/config/test_configexc.py
@@ -74,7 +74,7 @@ def test_config_file_errors_str(errors):
     assert str(errors).splitlines() == [
         'Errors occurred while reading config.py:',
         '  Error text 1: Exception 1',
-        '  Error text 2 - Exception: Exception 2 ',
+        '  Error text 2 - Exception: Exception 2',
     ]
 
 

From 9397cc74c1cd175d6a0ff08384290d8235fde050 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Mon, 12 Feb 2018 14:24:53 +0000
Subject: [PATCH 392/574] Pylint indentation fix

---
 qutebrowser/config/configexc.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/config/configexc.py b/qutebrowser/config/configexc.py
index 2c0e5a58f..2067878b9 100644
--- a/qutebrowser/config/configexc.py
+++ b/qutebrowser/config/configexc.py
@@ -94,8 +94,8 @@ class ConfigErrorDesc:
     def __str__(self):
         if self.traceback:
             return '{} - {}: {}'.format(self.text,
-                                         self.exception.__class__.__name__,
-                                         self.exception)
+                                        self.exception.__class__.__name__,
+                                        self.exception)
         return '{}: {}'.format(self.text, self.exception)
 
     def with_text(self, text):

From e66588f818d36bcf3c3b4a731a594ad18b682b1b Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 12 Feb 2018 15:30:47 +0100
Subject: [PATCH 393/574] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 4ae8c28de..3375fe6a0 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -71,6 +71,7 @@ Fixed
 - QtWebEngine: Improved fullscreen handling with Qt 5.10.
 - QtWebEngine: Hinting and scrolling now works properly on special
   `view-source:` pages.
+- QtWebEngine: Scroll positions are now restored correctly from sessions.
 - QtWebKit: `:view-source` now displays a valid URL.
 - URLs containing ampersands and other special chars are now shown
   correctly when filtering them in the completion.

From 0caa5d04d35efd3dba6b2f27679a0c73d7b6c78e Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Mon, 12 Feb 2018 15:50:56 +0100
Subject: [PATCH 394/574] Use tabs directly

also ignore tabs page url in list
---
 qutebrowser/browser/qutescheme.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 10790e8b5..6eb034836 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -213,10 +213,9 @@ def qute_tabs(_url):
         tabbed_browser = objreg.get('tabbed-browser',
                                     scope='window',
                                     window=win_id)
-        for tab_idx in range(tabbed_browser.count()):
-            tab_fields = tabbed_browser.get_tab_fields(tab_idx)
-            tabs[str(win_id)].append(
-                (tab_fields['title'], tab_fields['current_url']))
+        for tab in tabbed_browser.widgets():
+            if not tab.url().url().startswith("qute://tabs"):
+                tabs[str(win_id)].append((tab.title(), tab.url().url()))
 
     html = jinja.render('tabs.html',
                         title='Tabs',

From ee57c30c53cc809b92ed89cd62cde612ca9e44c3 Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Mon, 12 Feb 2018 16:02:06 +0100
Subject: [PATCH 395/574] Re-add the raw list (with fixed alignment)

---
 qutebrowser/html/tabs.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/qutebrowser/html/tabs.html b/qutebrowser/html/tabs.html
index d929272c5..af6659414 100644
--- a/qutebrowser/html/tabs.html
+++ b/qutebrowser/html/tabs.html
@@ -43,4 +43,12 @@ th {
     </tbody>
 </table>
 {% endfor %}
+<details>
+    <summary>Raw list</summary>
+<code>
+{% for win_id, tabs in tab_list_by_window.items() %}{% for name, url in tabs %}
+{{url}}</br>{% endfor %}
+{% endfor %}
+</code>
+</details>
 {% endblock %}

From d6912be2237962c69d155e7cafab2b98ec095053 Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Mon, 12 Feb 2018 16:04:48 +0100
Subject: [PATCH 396/574] Update import order

---
 qutebrowser/browser/qutescheme.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 6eb034836..e8b682d99 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -33,8 +33,8 @@ import urllib
 import collections
 
 import pkg_resources
-from PyQt5.QtCore import QUrlQuery, QUrl
 import sip
+from PyQt5.QtCore import QUrlQuery, QUrl
 
 import qutebrowser
 from qutebrowser.config import config, configdata, configexc, configdiff

From 417200fa709513bce8aba1c2d03fba2ed30640b4 Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Mon, 12 Feb 2018 16:06:17 +0100
Subject: [PATCH 397/574] Use QUrl instead of str to compare

---
 qutebrowser/browser/qutescheme.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index e8b682d99..15823dc87 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -214,7 +214,7 @@ def qute_tabs(_url):
                                     scope='window',
                                     window=win_id)
         for tab in tabbed_browser.widgets():
-            if not tab.url().url().startswith("qute://tabs"):
+            if tab.url() != QUrl("qute://tabs/"):
                 tabs[str(win_id)].append((tab.title(), tab.url().url()))
 
     html = jinja.render('tabs.html',

From 572257921d0dcaf875334b1d8f4ae86660c3a464 Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Mon, 12 Feb 2018 16:12:15 +0100
Subject: [PATCH 398/574] Use QUrl().toDisplayString() instead of url()

---
 qutebrowser/browser/qutescheme.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 15823dc87..aa887f349 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -215,7 +215,7 @@ def qute_tabs(_url):
                                     window=win_id)
         for tab in tabbed_browser.widgets():
             if tab.url() != QUrl("qute://tabs/"):
-                tabs[str(win_id)].append((tab.title(), tab.url().url()))
+                tabs[str(win_id)].append((tab.title(), tab.url().toDisplayString()))
 
     html = jinja.render('tabs.html',
                         title='Tabs',

From f64f873c11f0f1171f7324a6fc5c65d743948d4b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 12 Feb 2018 17:01:21 +0100
Subject: [PATCH 399/574] Update coverage from 4.5 to 4.5.1

---
 misc/requirements/requirements-codecov.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-codecov.txt b/misc/requirements/requirements-codecov.txt
index df27fc428..aa5de8b34 100644
--- a/misc/requirements/requirements-codecov.txt
+++ b/misc/requirements/requirements-codecov.txt
@@ -3,7 +3,7 @@
 certifi==2018.1.18
 chardet==3.0.4
 codecov==2.0.15
-coverage==4.5
+coverage==4.5.1
 idna==2.6
 requests==2.18.4
 urllib3==1.22

From a506788f4fa02ac541d2242407b304b5bd192f08 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 12 Feb 2018 17:01:22 +0100
Subject: [PATCH 400/574] Update coverage from 4.5 to 4.5.1

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index eebd2945b..f91c66bb9 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -5,7 +5,7 @@ beautifulsoup4==4.6.0
 cheroot==6.0.0
 click==6.7
 # colorama==0.3.9
-coverage==4.5
+coverage==4.5.1
 EasyProcess==0.2.3
 fields==5.0.0
 Flask==0.12.2

From a31f775d70c4f957b5de2f17e8e2bf6d87c9ee70 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 12 Feb 2018 17:01:24 +0100
Subject: [PATCH 401/574] Update flake8-debugger from 3.0.0 to 3.1.0

---
 misc/requirements/requirements-flake8.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index 5a43e66d1..eb81fc37b 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -6,7 +6,7 @@ flake8-bugbear==18.2.0
 flake8-builtins==1.0.post0
 flake8-comprehensions==1.4.1
 flake8-copyright==0.2.0
-flake8-debugger==3.0.0
+flake8-debugger==3.1.0
 flake8-deprecated==1.3
 flake8-docstrings==1.3.0
 flake8-future-import==0.4.4

From 75e65b9d4af97b4b6cecce4cfa7dfc7eb302a434 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 12 Feb 2018 17:01:25 +0100
Subject: [PATCH 402/574] Update setuptools from 38.5.0 to 38.5.1

---
 misc/requirements/requirements-pip.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pip.txt b/misc/requirements/requirements-pip.txt
index bd9654b1b..b5e76ce0f 100644
--- a/misc/requirements/requirements-pip.txt
+++ b/misc/requirements/requirements-pip.txt
@@ -3,6 +3,6 @@
 appdirs==1.4.3
 packaging==16.8
 pyparsing==2.2.0
-setuptools==38.5.0
+setuptools==38.5.1
 six==1.11.0
 wheel==0.30.0

From e74995e81afc601ce24b32936abaa0e524d536b0 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 12 Feb 2018 17:01:27 +0100
Subject: [PATCH 403/574] Update isort from 4.3.2 to 4.3.4

---
 misc/requirements/requirements-pylint-master.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pylint-master.txt b/misc/requirements/requirements-pylint-master.txt
index d23d2ea57..6364f0fcf 100644
--- a/misc/requirements/requirements-pylint-master.txt
+++ b/misc/requirements/requirements-pylint-master.txt
@@ -5,7 +5,7 @@ certifi==2018.1.18
 chardet==3.0.4
 github3.py==0.9.6
 idna==2.6
-isort==4.3.2
+isort==4.3.4
 lazy-object-proxy==1.3.1
 mccabe==0.6.1
 -e git+https://github.com/PyCQA/pylint.git#egg=pylint

From bd83ff2c64d9728618cc9586deed45272ca85766 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 12 Feb 2018 17:01:28 +0100
Subject: [PATCH 404/574] Update isort from 4.3.2 to 4.3.4

---
 misc/requirements/requirements-pylint.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index e86be34e2..de27257e1 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -5,7 +5,7 @@ certifi==2018.1.18
 chardet==3.0.4
 github3.py==0.9.6
 idna==2.6
-isort==4.3.2
+isort==4.3.4
 lazy-object-proxy==1.3.1
 mccabe==0.6.1
 pylint==1.8.2

From 3aa59ea2400eb827fc494eb1747073c266cca363 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 12 Feb 2018 17:01:30 +0100
Subject: [PATCH 405/574] Update hypothesis from 3.44.25 to 3.44.26

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index f91c66bb9..fb666a188 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -11,7 +11,7 @@ fields==5.0.0
 Flask==0.12.2
 glob2==0.6
 hunter==2.0.2
-hypothesis==3.44.25
+hypothesis==3.44.26
 itsdangerous==0.24
 # Jinja2==2.10
 Mako==1.0.7

From 301aaf57832f72a2fd43cac80ce2ccf23e3f7226 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 12 Feb 2018 17:01:32 +0100
Subject: [PATCH 406/574] Update pytest-faulthandler from 1.3.1 to 1.4.1

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index fb666a188..7aecdced2 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -26,7 +26,7 @@ pytest==3.4.0
 pytest-bdd==2.20.0
 pytest-benchmark==3.1.1
 pytest-cov==2.5.1
-pytest-faulthandler==1.3.1
+pytest-faulthandler==1.4.1
 pytest-instafail==0.3.0
 pytest-mock==1.6.3
 pytest-qt==2.3.1

From 7fe9f53c9738a6812f03ef47f9d29358c5b69b0b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 12 Feb 2018 17:01:33 +0100
Subject: [PATCH 407/574] Update pytest-xvfb from 1.0.0 to 1.1.0

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 7aecdced2..6c3d69497 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -33,7 +33,7 @@ pytest-qt==2.3.1
 pytest-repeat==0.4.1
 pytest-rerunfailures==4.0
 pytest-travis-fold==1.3.0
-pytest-xvfb==1.0.0
+pytest-xvfb==1.1.0
 PyVirtualDisplay==0.2.1
 six==1.11.0
 vulture==0.26

From 80a72604c6ed8ae5f4128e627465035a30833c5e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 12 Feb 2018 17:49:20 +0100
Subject: [PATCH 408/574] Revive hostblock_blame.py

---
 scripts/hostblock_blame.py | 64 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 scripts/hostblock_blame.py

diff --git a/scripts/hostblock_blame.py b/scripts/hostblock_blame.py
new file mode 100644
index 000000000..dde83d91f
--- /dev/null
+++ b/scripts/hostblock_blame.py
@@ -0,0 +1,64 @@
+#!/usr/bin/env python3
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Check by which hostblock list a host was blocked."""
+
+import sys
+import io
+import os
+import os.path
+import configparser
+import urllib.request
+
+from PyQt5.QtCore import QStandardPaths
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir))
+from qutebrowser.browser import adblock
+
+
+def main():
+    """Check by which hostblock list a host was blocked."""
+    if len(sys.argv) != 2:
+        print("Usage: {} <host>".format(sys.argv[0]), file=sys.stderr)
+        sys.exit(1)
+    confdir = QStandardPaths.writableLocation(QStandardPaths.ConfigLocation)
+    confdir = confdir.replace('/', os.sep)
+    if confdir.split(os.sep)[-1] != 'qutebrowser':
+        confdir = os.path.join(confdir, 'qutebrowser')
+    confpath = os.path.join(confdir, 'qutebrowser.conf')
+    parser = configparser.ConfigParser()
+    print("config path: {}".format(confpath))
+    successful = parser.read(confpath, encoding='utf-8')
+    if not successful:
+        raise OSError("configparser did not read files successfully!")
+    lists = parser['content']['host-block-lists']
+    for url in lists.split(','):
+        print("checking {}...".format(url))
+        raw_file = urllib.request.urlopen(url)
+        byte_io = io.BytesIO(raw_file.read())
+        f = adblock.get_fileobj(byte_io)
+        for line in f:
+            if sys.argv[1] in line:
+                print("FOUND {} in {}:".format(sys.argv[1], url))
+                print("    " + line.rstrip())
+
+
+if __name__ == '__main__':
+    main()

From eca1fb7d3bfdb1844abcd6c97b978ad623118443 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 12 Feb 2018 17:54:34 +0100
Subject: [PATCH 409/574] Update hostblock_blame.py for new config

---
 scripts/hostblock_blame.py | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/scripts/hostblock_blame.py b/scripts/hostblock_blame.py
index dde83d91f..f8c266b53 100644
--- a/scripts/hostblock_blame.py
+++ b/scripts/hostblock_blame.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -27,10 +27,9 @@ import os.path
 import configparser
 import urllib.request
 
-from PyQt5.QtCore import QStandardPaths
-
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir))
 from qutebrowser.browser import adblock
+from qutebrowser.config import configdata
 
 
 def main():
@@ -38,18 +37,10 @@ def main():
     if len(sys.argv) != 2:
         print("Usage: {} <host>".format(sys.argv[0]), file=sys.stderr)
         sys.exit(1)
-    confdir = QStandardPaths.writableLocation(QStandardPaths.ConfigLocation)
-    confdir = confdir.replace('/', os.sep)
-    if confdir.split(os.sep)[-1] != 'qutebrowser':
-        confdir = os.path.join(confdir, 'qutebrowser')
-    confpath = os.path.join(confdir, 'qutebrowser.conf')
-    parser = configparser.ConfigParser()
-    print("config path: {}".format(confpath))
-    successful = parser.read(confpath, encoding='utf-8')
-    if not successful:
-        raise OSError("configparser did not read files successfully!")
-    lists = parser['content']['host-block-lists']
-    for url in lists.split(','):
+
+    configdata.init()
+
+    for url in configdata.DATA['content.host_blocking.lists'].default:
         print("checking {}...".format(url))
         raw_file = urllib.request.urlopen(url)
         byte_io = io.BytesIO(raw_file.read())

From deb9ccb564cefe183bdd4a01a9cbc7e8c2ace282 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 12 Feb 2018 22:16:30 +0100
Subject: [PATCH 410/574] hostblock_blame: Remove unused import

---
 scripts/hostblock_blame.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/hostblock_blame.py b/scripts/hostblock_blame.py
index f8c266b53..ed672eec9 100644
--- a/scripts/hostblock_blame.py
+++ b/scripts/hostblock_blame.py
@@ -24,7 +24,6 @@ import sys
 import io
 import os
 import os.path
-import configparser
 import urllib.request
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir))

From 54bc22dfd4b770bf8621d33a4bf362dc173665fa Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 12 Feb 2018 22:16:41 +0100
Subject: [PATCH 411/574] hostblock_blame: Decode lines properly

---
 scripts/hostblock_blame.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/hostblock_blame.py b/scripts/hostblock_blame.py
index ed672eec9..2f68d2961 100644
--- a/scripts/hostblock_blame.py
+++ b/scripts/hostblock_blame.py
@@ -45,6 +45,7 @@ def main():
         byte_io = io.BytesIO(raw_file.read())
         f = adblock.get_fileobj(byte_io)
         for line in f:
+            line = line.decode('utf-8')
             if sys.argv[1] in line:
                 print("FOUND {} in {}:".format(sys.argv[1], url))
                 print("    " + line.rstrip())

From 9a0c113f8a448767a5d73bf0205bb2281e28d842 Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Mon, 12 Feb 2018 21:35:33 +0100
Subject: [PATCH 412/574] Fix pylint line-too-long error

---
 qutebrowser/browser/qutescheme.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index aa887f349..5335a97c8 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -215,7 +215,8 @@ def qute_tabs(_url):
                                     window=win_id)
         for tab in tabbed_browser.widgets():
             if tab.url() != QUrl("qute://tabs/"):
-                tabs[str(win_id)].append((tab.title(), tab.url().toDisplayString()))
+                tabs[str(win_id)].append(
+                    (tab.title(), tab.url().toDisplayString()))
 
     html = jinja.render('tabs.html',
                         title='Tabs',

From 15fd5526164cf64b3b6163f2152c8cd7e329071f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 12 Feb 2018 22:32:11 +0100
Subject: [PATCH 413/574] Update changelog

---
 doc/changelog.asciidoc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 3375fe6a0..2d7a054c2 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -38,6 +38,8 @@ Added
   which order in the statusbar.
 - New `:prompt-yank` command (bound to `Alt-y` by default) to yank URLs
   referenced in prompts.
+- The `hostblock_blame` script which was removed in v1.0 was updated for the new
+  config and re-added.
 
 Changed
 ~~~~~~~
@@ -83,6 +85,7 @@ Fixed
   is removed.
 - Suspended pages now should always load the correct page when being un-suspended.
 - Compatibility with Python 3.7
+- Exception types are now shown properly with `:config-source` and `:config-edit`.
 
 Removed
 ~~~~~~~

From 0b047e3e1057b0f19cf885605a09dfc17bee9aaa Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Mon, 12 Feb 2018 22:48:41 +0100
Subject: [PATCH 414/574] Handle url with trailing slash and without

---
 qutebrowser/browser/qutescheme.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 5335a97c8..a93cd88a8 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -214,7 +214,7 @@ def qute_tabs(_url):
                                     scope='window',
                                     window=win_id)
         for tab in tabbed_browser.widgets():
-            if tab.url() != QUrl("qute://tabs/"):
+            if tab.url() not in [QUrl("qute://tabs/"), QUrl("qute://tabs")]:
                 tabs[str(win_id)].append(
                     (tab.title(), tab.url().toDisplayString()))
 

From 7ae0d584e67956960014af0e1606042ae02fb158 Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Mon, 12 Feb 2018 22:49:02 +0100
Subject: [PATCH 415/574] Add 20px margin above the raw list

---
 qutebrowser/html/tabs.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/qutebrowser/html/tabs.html b/qutebrowser/html/tabs.html
index af6659414..fff8bdca3 100644
--- a/qutebrowser/html/tabs.html
+++ b/qutebrowser/html/tabs.html
@@ -25,6 +25,10 @@ th {
     text-align: center;
     width: 100%;
 }
+
+details {
+    margin-top: 20px;
+}
 {% endblock %}
 
 {% block content %}

From ca199b0d3dc1fd6c7aab41e0832a90203ced396f Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Mon, 12 Feb 2018 22:51:36 +0100
Subject: [PATCH 416/574] Use separate variable to make pylint happy

---
 qutebrowser/browser/qutescheme.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index a93cd88a8..37b57f933 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -215,8 +215,8 @@ def qute_tabs(_url):
                                     window=win_id)
         for tab in tabbed_browser.widgets():
             if tab.url() not in [QUrl("qute://tabs/"), QUrl("qute://tabs")]:
-                tabs[str(win_id)].append(
-                    (tab.title(), tab.url().toDisplayString()))
+                urlstr = tab.url().toDisplayString()
+                tabs[str(win_id)].append((tab.title(), urlstr))
 
     html = jinja.render('tabs.html',
                         title='Tabs',

From 47451aa495172f8faf34408b0fdd49424d9999c3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 12 Feb 2018 23:00:26 +0100
Subject: [PATCH 417/574] Open qute://tabs with :buffer

---
 doc/help/commands.asciidoc          | 2 +-
 qutebrowser/browser/commands.py     | 9 ++++++---
 tests/end2end/features/tabs.feature | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index c5f013491..9580fe578 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -221,7 +221,7 @@ Syntax: +:buffer ['index']+
 
 Select tab by index or url/title best match.
 
-Focuses window if necessary when index is given. If both index and count are given, use count.
+Focuses window if necessary when index is given. If both index and count are given, use count. With neither index nor count given, open the qute://tabs page.
 
 ==== positional arguments
 * +'index'+: The [win_id/]index of the tab to focus. Or a substring in which case the closest match will be focused.
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index b56c3d6ae..3e2eeaecb 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1086,20 +1086,23 @@ class CommandDispatcher:
                        maxsplit=0)
     @cmdutils.argument('index', completion=miscmodels.buffer)
     @cmdutils.argument('count', count=True)
-    def buffer(self, index=None, count=None):
+    @cmdutils.argument('win_id', win_id=True)
+    def buffer(self, win_id, index=None, count=None):
         """Select tab by index or url/title best match.
 
         Focuses window if necessary when index is given. If both index and
         count are given, use count.
 
+        With neither index nor count given, open the qute://tabs page.
+
         Args:
             index: The [win_id/]index of the tab to focus. Or a substring
                    in which case the closest match will be focused.
             count: The tab index to focus, starting with 1.
         """
         if count is None and index is None:
-            raise cmdexc.CommandError("buffer: Either a count or the argument "
-                                      "index must be specified.")
+            self.openurl('qute://tabs/', tab=True)
+            return
 
         if count is not None:
             index = str(count)
diff --git a/tests/end2end/features/tabs.feature b/tests/end2end/features/tabs.feature
index 065b92096..037e1cdd0 100644
--- a/tests/end2end/features/tabs.feature
+++ b/tests/end2end/features/tabs.feature
@@ -904,7 +904,7 @@ Feature: Tab management
 
     Scenario: :buffer without args or count
         When I run :buffer
-        Then the error "buffer: Either a count or the argument index must be specified." should be shown
+        Then qute://tabs should be loaded
 
     Scenario: :buffer with a matching title
         When I open data/title.html

From 0fae611021b7876404b17fd8cda8f630a9b1e9df Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 12 Feb 2018 23:00:55 +0100
Subject: [PATCH 418/574] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 2d7a054c2..4a23ec48c 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -40,6 +40,7 @@ Added
   referenced in prompts.
 - The `hostblock_blame` script which was removed in v1.0 was updated for the new
   config and re-added.
+- New `qute://tabs` page (opened via `:buffer`) which lists all tabs.
 
 Changed
 ~~~~~~~

From 22d7490126a67fb6df5641cecd36799b3a70d140 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Mon, 12 Feb 2018 19:25:24 -0500
Subject: [PATCH 419/574] Remove unused import and TODO from urlmarks test.

---
 tests/unit/browser/urlmarks.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/unit/browser/urlmarks.py b/tests/unit/browser/urlmarks.py
index 8e17bd326..df7b3286d 100644
--- a/tests/unit/browser/urlmarks.py
+++ b/tests/unit/browser/urlmarks.py
@@ -19,7 +19,6 @@
 
 """Tests for the global page history."""
 
-from unittest import mock
 import pytest
 from PyQt5.QtCore import QUrl
 
@@ -46,7 +45,7 @@ def test_init(bm_file, fake_save_manager):
     fake_save_manager.add_saveable.assert_called_once_with(
         'bookmark-manager',
         bm.save,
-        mock.ANY,  # TODO: compare signal argument for equality
+        bm.changed,
         filename=str(bm_file),
     )
 

From 0e87c4684903d3a6aed940febb3ca2dffb9aa690 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 13 Feb 2018 09:43:21 +0100
Subject: [PATCH 420/574] Remove unused win_id argument

---
 qutebrowser/browser/commands.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 3e2eeaecb..69cb3142f 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1086,8 +1086,7 @@ class CommandDispatcher:
                        maxsplit=0)
     @cmdutils.argument('index', completion=miscmodels.buffer)
     @cmdutils.argument('count', count=True)
-    @cmdutils.argument('win_id', win_id=True)
-    def buffer(self, win_id, index=None, count=None):
+    def buffer(self, index=None, count=None):
         """Select tab by index or url/title best match.
 
         Focuses window if necessary when index is given. If both index and

From 171392b582e30ba5f17344e618cd3d0c68429150 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 13 Feb 2018 09:44:10 +0100
Subject: [PATCH 421/574] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 4a23ec48c..66d22ddca 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -87,6 +87,7 @@ Fixed
 - Suspended pages now should always load the correct page when being un-suspended.
 - Compatibility with Python 3.7
 - Exception types are now shown properly with `:config-source` and `:config-edit`.
+- When using `:bookmark-add --toggle`, bookmarks are now saved properly.
 
 Removed
 ~~~~~~~

From 942dca3444a3fe978074fa180ca9e1106ad7ae88 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Tue, 13 Feb 2018 13:31:27 +0000
Subject: [PATCH 422/574] Add test for pastebin_version()

---
 qutebrowser/utils/version.py     |  6 +--
 tests/unit/utils/test_version.py | 67 ++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index 09a1a6efa..71e33886f 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -453,7 +453,7 @@ def opengl_vendor():  # pragma: no cover
             old_context.makeCurrent(old_surface)
 
 
-def pastebin_version():
+def pastebin_version(pbclient=None):
     """Pastebin the version and log the url to messages."""
     def _yank_url(url):
         utils.set_clipboard(url)
@@ -478,8 +478,8 @@ def pastebin_version():
     http_client = httpclient.HTTPClient()
 
     misc_api = pastebin.PastebinClient.MISC_API_URL
-    pbclient = pastebin.PastebinClient(http_client, parent=app,
-                                       api_url=misc_api)
+    pbclient = pbclient or pastebin.PastebinClient(http_client, parent=app,
+                                                   api_url=misc_api)
 
     pbclient.success.connect(_on_paste_version_success)
     pbclient.error.connect(_on_paste_version_err)
diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py
index da65422a7..84d89680c 100644
--- a/tests/unit/utils/test_version.py
+++ b/tests/unit/utils/test_version.py
@@ -35,9 +35,11 @@ import datetime
 import attr
 import pkg_resources
 import pytest
+from PyQt5.QtCore import pyqtSignal, QUrl, QObject
 
 import qutebrowser
 from qutebrowser.utils import version, usertypes, utils
+from qutebrowser.misc import pastebin
 from qutebrowser.browser import pdfjs
 
 
@@ -950,3 +952,68 @@ def test_opengl_vendor():
     """Simply call version.opengl_vendor() and see if it doesn't crash."""
     pytest.importorskip("PyQt5.QtOpenGL")
     return version.opengl_vendor()
+
+
+class HTTPPostStub(QObject):
+
+    """A stub class for HTTPClient.
+
+    Attributes:
+        url: the last url send by post()
+        data: the last data send by post()
+    """
+
+    success = pyqtSignal(str)
+    error = pyqtSignal(str)
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.url = None
+        self.data = None
+
+    def post(self, url, data=None):
+        self.url = url
+        self.data = data
+
+
+@pytest.fixture
+def pbclient():
+    http_stub = HTTPPostStub()
+    client = pastebin.PastebinClient(http_stub)
+    return client
+
+
+def test_pastebin_version(pbclient, monkeypatch):
+    """Test version.pastebin_version() twice."""
+    patches = {
+        '_path_info': lambda: {'PATH DESC': 'PATH NAME'},
+        '_uptime': lambda: datetime.timedelta(hours=1, minutes=23, seconds=45),
+    }
+
+    for name, val in patches.items():
+        monkeypatch.setattr('qutebrowser.utils.version.' + name, val)
+
+    version.pastebin_version(pbclient)
+    pbclient.success.emit("test")
+    assert version.pastebin_url == "test"
+
+    version.pastebin_version(pbclient)
+    assert version.pastebin_url == "test"
+
+
+def test_pastebin_version_error(pbclient, monkeypatch):
+    """Test version.pastebin_version() with errors."""
+    patches = {
+        '_path_info': lambda: {'PATH DESC': 'PATH NAME'},
+        '_uptime': lambda: datetime.timedelta(hours=1, minutes=23, seconds=45),
+    }
+
+    for name, val in patches.items():
+        monkeypatch.setattr('qutebrowser.utils.version.' + name, val)
+
+    version.pastebin_url = None
+    version.pastebin_version(pbclient)
+    try:
+        pbclient.error.emit("test")
+    except:
+        assert version.pastebin_url is None

From 6eeacfe82b8ec8fa1ed071ffb5107577e817c39e Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Mon, 12 Feb 2018 22:51:04 -0500
Subject: [PATCH 423/574] Fix caret being cleared when leaving any mode

---
 qutebrowser/browser/browsertab.py             | 2 +-
 qutebrowser/browser/webengine/webenginetab.py | 5 ++++-
 qutebrowser/browser/webkit/webkittab.py       | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 6ed5afe52..84e4838a7 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -342,7 +342,7 @@ class AbstractCaret(QObject):
     def _on_mode_entered(self, mode):
         raise NotImplementedError
 
-    def _on_mode_left(self):
+    def _on_mode_left(self, mode):
         raise NotImplementedError
 
     def move_to_next_line(self, count=1):
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index ed6697f03..4595f7a6e 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -223,7 +223,10 @@ class WebEngineCaret(browsertab.AbstractCaret):
         self._js_call('setInitialCursor')
 
     @pyqtSlot(usertypes.KeyMode)
-    def _on_mode_left(self):
+    def _on_mode_left(self, mode):
+        if mode != usertypes.KeyMode.caret:
+            return
+
         self.drop_selection()
         self._js_call('disableCaret')
 
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 9395630db..aa3f5363e 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -205,8 +205,8 @@ class WebKitCaret(browsertab.AbstractCaret):
                 self._widget.page().currentFrame().evaluateJavaScript(
                     utils.read_file('javascript/position_caret.js'))
 
-    @pyqtSlot()
-    def _on_mode_left(self):
+    @pyqtSlot(usertypes.KeyMode)
+    def _on_mode_left(self, _mode):
         settings = self._widget.settings()
         if settings.testAttribute(QWebSettings.CaretBrowsingEnabled):
             if self.selection_enabled and self._widget.hasSelection():

From e349af7524819cd6982b7721f3b987ddfd7f8206 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Tue, 13 Feb 2018 14:49:15 +0000
Subject: [PATCH 424/574] Fix testing with error pastebin_version()

---
 tests/unit/utils/test_version.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py
index 84d89680c..cbe174b38 100644
--- a/tests/unit/utils/test_version.py
+++ b/tests/unit/utils/test_version.py
@@ -1001,7 +1001,7 @@ def test_pastebin_version(pbclient, monkeypatch):
     assert version.pastebin_url == "test"
 
 
-def test_pastebin_version_error(pbclient, monkeypatch):
+def test_pastebin_version_error(pbclient, caplog, monkeypatch):
     """Test version.pastebin_version() with errors."""
     patches = {
         '_path_info': lambda: {'PATH DESC': 'PATH NAME'},
@@ -1012,8 +1012,8 @@ def test_pastebin_version_error(pbclient, monkeypatch):
         monkeypatch.setattr('qutebrowser.utils.version.' + name, val)
 
     version.pastebin_url = None
-    version.pastebin_version(pbclient)
-    try:
-        pbclient.error.emit("test")
-    except:
-        assert version.pastebin_url is None
+    with caplog.at_level(logging.ERROR):
+        version.pastebin_version(pbclient)
+        pbclient._client.error.emit("test")
+    assert version.pastebin_url is None
+    assert caplog.records[0].message == "Failed to pastebin version info: test"

From b959e885fc8dd512bba52aee7c989bc915d36578 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Tue, 13 Feb 2018 15:25:40 +0000
Subject: [PATCH 425/574] Pylint fix

---
 tests/unit/utils/test_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py
index cbe174b38..007171afc 100644
--- a/tests/unit/utils/test_version.py
+++ b/tests/unit/utils/test_version.py
@@ -35,7 +35,7 @@ import datetime
 import attr
 import pkg_resources
 import pytest
-from PyQt5.QtCore import pyqtSignal, QUrl, QObject
+from PyQt5.QtCore import pyqtSignal, QObject
 
 import qutebrowser
 from qutebrowser.utils import version, usertypes, utils

From cfa779ecb7b417191f8596209a7f461a0d1f7317 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Tue, 13 Feb 2018 16:02:20 +0000
Subject: [PATCH 426/574] Add trivial test for _uptime

---
 tests/unit/utils/test_version.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py
index 007171afc..96d0a5f4b 100644
--- a/tests/unit/utils/test_version.py
+++ b/tests/unit/utils/test_version.py
@@ -36,6 +36,7 @@ import attr
 import pkg_resources
 import pytest
 from PyQt5.QtCore import pyqtSignal, QObject
+from PyQt5.QtWidgets import QApplication
 
 import qutebrowser
 from qutebrowser.utils import version, usertypes, utils
@@ -1017,3 +1018,9 @@ def test_pastebin_version_error(pbclient, caplog, monkeypatch):
         pbclient._client.error.emit("test")
     assert version.pastebin_url is None
     assert caplog.records[0].message == "Failed to pastebin version info: test"
+
+
+def test_uptime(monkeypatch):
+    """Test _uptime runs without failing. Its effects are tested elsewhere."""
+    QApplication.instance().launch_time = datetime.datetime(1, 1, 1)
+    version._uptime()

From ca8d935cf4ca581fdc16a705e0c4ea4e7d65aaaf Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Tue, 13 Feb 2018 18:38:27 +0000
Subject: [PATCH 427/574] Update tests as per code review

---
 tests/helpers/stubs.py           | 32 ++++++++++++++
 tests/unit/misc/test_pastebin.py | 26 +-----------
 tests/unit/utils/test_version.py | 73 ++++++++++++++------------------
 3 files changed, 66 insertions(+), 65 deletions(-)

diff --git a/tests/helpers/stubs.py b/tests/helpers/stubs.py
index 64bc793cb..ede322b74 100644
--- a/tests/helpers/stubs.py
+++ b/tests/helpers/stubs.py
@@ -563,3 +563,35 @@ class ApplicationStub(QObject):
     """Stub to insert as the app object in objreg."""
 
     new_window = pyqtSignal(mainwindow.MainWindow)
+
+
+class HTTPPostStub(QObject):
+
+    """A stub class for HTTPClient.
+
+    Attributes:
+        url: the last url send by post()
+        data: the last data send by post()
+    """
+
+    success = pyqtSignal(str)
+    error = pyqtSignal(str)
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.url = None
+        self.data = None
+
+    def post(self, url, data=None):
+        self.url = url
+        self.data = data
+
+
+@pytest.fixture
+def pbclient(stubs):
+    http_stub = stubs.HTTPPostStub()
+    client = pastebin.PastebinClient(http_stub)
+    return client
+
+
+
diff --git a/tests/unit/misc/test_pastebin.py b/tests/unit/misc/test_pastebin.py
index b352f52c8..9546bcf36 100644
--- a/tests/unit/misc/test_pastebin.py
+++ b/tests/unit/misc/test_pastebin.py
@@ -23,31 +23,9 @@ from PyQt5.QtCore import pyqtSignal, QUrl, QObject
 from qutebrowser.misc import httpclient, pastebin
 
 
-class HTTPPostStub(QObject):
-
-    """A stub class for HTTPClient.
-
-    Attributes:
-        url: the last url send by post()
-        data: the last data send by post()
-    """
-
-    success = pyqtSignal(str)
-    error = pyqtSignal(str)
-
-    def __init__(self, parent=None):
-        super().__init__(parent)
-        self.url = None
-        self.data = None
-
-    def post(self, url, data=None):
-        self.url = url
-        self.data = data
-
-
 @pytest.fixture
-def pbclient():
-    http_stub = HTTPPostStub()
+def pbclient(stubs):
+    http_stub = stubs.HTTPPostStub()
     client = pastebin.PastebinClient(http_stub)
     return client
 
diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py
index 96d0a5f4b..f4f7270ba 100644
--- a/tests/unit/utils/test_version.py
+++ b/tests/unit/utils/test_version.py
@@ -955,62 +955,53 @@ def test_opengl_vendor():
     return version.opengl_vendor()
 
 
-class HTTPPostStub(QObject):
-
-    """A stub class for HTTPClient.
-
-    Attributes:
-        url: the last url send by post()
-        data: the last data send by post()
-    """
-
-    success = pyqtSignal(str)
-    error = pyqtSignal(str)
-
-    def __init__(self, parent=None):
-        super().__init__(parent)
-        self.url = None
-        self.data = None
-
-    def post(self, url, data=None):
-        self.url = url
-        self.data = data
-
-
 @pytest.fixture
-def pbclient():
-    http_stub = HTTPPostStub()
+def pbclient(stubs):
+    http_stub = stubs.HTTPPostStub()
     client = pastebin.PastebinClient(http_stub)
     return client
 
 
-def test_pastebin_version(pbclient, monkeypatch):
-    """Test version.pastebin_version() twice."""
-    patches = {
-        '_path_info': lambda: {'PATH DESC': 'PATH NAME'},
-        '_uptime': lambda: datetime.timedelta(hours=1, minutes=23, seconds=45),
-    }
-
-    for name, val in patches.items():
-        monkeypatch.setattr('qutebrowser.utils.version.' + name, val)
+def test_pastebin_version(pbclient, message_mock, monkeypatch, qtbot):
+    """Test version.pastebin_version() sets the url."""
+    monkeypatch.setattr('qutebrowser.utils.version.version',
+                        lambda: "dummy")
+    monkeypatch.setattr('qutebrowser.utils.utils.log_clipboard', True)
 
     version.pastebin_version(pbclient)
     pbclient.success.emit("test")
+
+    msg = message_mock.getmsg(usertypes.MessageLevel.info)
+    assert msg.text == "Version url test yanked to clipboard."
     assert version.pastebin_url == "test"
 
+    version.pastebin_url = None
+
+
+def test_pastebin_version_twice(pbclient, monkeypatch):
+    """Test whether calling pastebin_version twice sends no data."""
+    monkeypatch.setattr('qutebrowser.utils.version.version',
+                        lambda: "dummy")
+
     version.pastebin_version(pbclient)
-    assert version.pastebin_url == "test"
+    pbclient.success.emit("test")
+
+    pbclient.url = None
+    pbclient.data = None
+    version.pastebin_url = "test2"
+
+    version.pastebin_version(pbclient)
+    assert pbclient.url is None
+    assert pbclient.data is None
+    assert version.pastebin_url == "test2"
+
+    version.pastebin_url = None
 
 
 def test_pastebin_version_error(pbclient, caplog, monkeypatch):
     """Test version.pastebin_version() with errors."""
-    patches = {
-        '_path_info': lambda: {'PATH DESC': 'PATH NAME'},
-        '_uptime': lambda: datetime.timedelta(hours=1, minutes=23, seconds=45),
-    }
-
-    for name, val in patches.items():
-        monkeypatch.setattr('qutebrowser.utils.version.' + name, val)
+    monkeypatch.setattr('qutebrowser.utils.version.version',
+                        lambda: "dummy")
 
     version.pastebin_url = None
     with caplog.at_level(logging.ERROR):

From 81acba47003a3c0c1182ad15498685f398c21a8e Mon Sep 17 00:00:00 2001
From: Jonathan Berglind <jonathan.berglind@gmail.com>
Date: Tue, 13 Feb 2018 15:01:45 +0100
Subject: [PATCH 428/574] Use HTTPStatus for existing tests, add more ones Add
 tests for endpoints being refactored

---
 tests/end2end/fixtures/test_webserver.py | 36 +++++++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/tests/end2end/fixtures/test_webserver.py b/tests/end2end/fixtures/test_webserver.py
index a59d425e2..8187e32cd 100644
--- a/tests/end2end/fixtures/test_webserver.py
+++ b/tests/end2end/fixtures/test_webserver.py
@@ -22,6 +22,7 @@
 import json
 import urllib.request
 import urllib.error
+from http import HTTPStatus
 
 import pytest
 
@@ -52,11 +53,38 @@ def test_server(server, qtbot, path, content, expected):
 
 
 @pytest.mark.parametrize('line, verb, path, equal', [
-    ({'verb': 'GET', 'path': '/', 'status': 200}, 'GET', '/', True),
-    ({'verb': 'GET', 'path': '/foo/', 'status': 200}, 'GET', '/foo', True),
+    ({'verb': 'GET', 'path': '/', 'status': HTTPStatus.OK}, 'GET', '/', True),
+    ({'verb': 'GET', 'path': '/foo/', 'status': HTTPStatus.OK},
+     'GET', '/foo', True),
+    ({'verb': 'GET', 'path': '/relative-redirect', 'status': HTTPStatus.FOUND},
+     'GET', '/relative-redirect', True),
+    ({'verb': 'GET', 'path': '/absolute-redirect', 'status': HTTPStatus.FOUND},
+     'GET', '/absolute-redirect', True),
+    ({'verb': 'GET', 'path': '/redirect-to', 'status': HTTPStatus.FOUND},
+     'GET', '/redirect-to', True),
+    ({'verb': 'GET', 'path': '/redirect-self', 'status': HTTPStatus.FOUND},
+     'GET', '/redirect-self', True),
+    ({'verb': 'GET', 'path': '/content-size', 'status': HTTPStatus.OK},
+     'GET', '/content-size', True),
+    ({'verb': 'GET', 'path': '/twenty-mb', 'status': HTTPStatus.OK},
+     'GET', '/twenty-mb', True),
+    ({'verb': 'GET', 'path': '/500-inline',
+      'status': HTTPStatus.INTERNAL_SERVER_ERROR}, 'GET', '/500-inline', True),
+    ({'verb': 'GET', 'path': '/basic-auth/user1/password1',
+      'status': HTTPStatus.UNAUTHORIZED},
+     'GET', '/basic-auth/user1/password1', True),
+    ({'verb': 'GET', 'path': '/drip', 'status': HTTPStatus.OK},
+     'GET', '/drip', True),
+    ({'verb': 'GET', 'path': '/404', 'status': HTTPStatus.NOT_FOUND},
+     'GET', '/404', True),
 
-    ({'verb': 'GET', 'path': '/', 'status': 200}, 'GET', '/foo', False),
-    ({'verb': 'POST', 'path': '/', 'status': 200}, 'GET', '/', False),
+    ({'verb': 'GET', 'path': '/', 'status': HTTPStatus.OK},
+     'GET', '/foo', False),
+    ({'verb': 'POST', 'path': '/', 'status': HTTPStatus.OK},
+     'GET', '/', False),
+    ({'verb': 'GET', 'path': '/basic-auth/user/password',
+      'status': HTTPStatus.UNAUTHORIZED},
+     'GET', '/basic-auth/user/passwd', False),
 ])
 def test_expected_request(server, line, verb, path, equal):
     expected = server.ExpectedRequest(verb, path)

From 3d5bba9cff7d60f3803f595ad709e3881c85b830 Mon Sep 17 00:00:00 2001
From: Jonathan Berglind <jonathan.berglind@gmail.com>
Date: Tue, 13 Feb 2018 15:05:15 +0100
Subject: [PATCH 429/574] Use HTTPStatus in flask test server

---
 tests/end2end/fixtures/webserver_sub.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/tests/end2end/fixtures/webserver_sub.py b/tests/end2end/fixtures/webserver_sub.py
index 4ec4619f7..f0720bab6 100644
--- a/tests/end2end/fixtures/webserver_sub.py
+++ b/tests/end2end/fixtures/webserver_sub.py
@@ -32,6 +32,7 @@ import time
 import signal
 import os
 import threading
+from http import HTTPStatus
 
 import cheroot.wsgi
 import flask
@@ -112,7 +113,7 @@ def redirect_n_times(n):
 def relative_redirect():
     """302 Redirect once."""
     response = app.make_response('')
-    response.status_code = 302
+    response.status_code = HTTPStatus.FOUND
     response.headers['Location'] = flask.url_for('root')
     return response
 
@@ -121,7 +122,7 @@ def relative_redirect():
 def absolute_redirect():
     """302 Redirect once."""
     response = app.make_response('')
-    response.status_code = 302
+    response.status_code = HTTPStatus.FOUND
     response.headers['Location'] = flask.url_for('root', _external=True)
     return response
 
@@ -133,7 +134,7 @@ def redirect_to():
     # werkzeug from "fixing" the URL. This endpoint should set the Location
     # header to the exact string supplied.
     response = app.make_response('')
-    response.status_code = 302
+    response.status_code = HTTPStatus.FOUND
     response.headers['Location'] = flask.request.args['url'].encode('utf-8')
     return response
 
@@ -149,7 +150,7 @@ def content_size():
     response = flask.Response(generate_bytes(), headers={
         "Content-Type": "application/octet-stream",
     })
-    response.status_code = 200
+    response.status_code = HTTPStatus.OK
     return response
 
 
@@ -163,7 +164,7 @@ def twenty_mb():
         "Content-Type": "application/octet-stream",
         "Content-Length": str(20 * 1024 * 1024),
     })
-    response.status_code = 200
+    response.status_code = HTTPStatus.OK
     return response
 
 
@@ -174,7 +175,7 @@ def internal_error_attachment():
         "Content-Type": "application/octet-stream",
         "Content-Disposition": 'inline; filename="attachment.jpg"',
     })
-    response.status_code = 500
+    response.status_code = HTTPStatus.INTERNAL_SERVER_ERROR
     return response
 
 
@@ -199,7 +200,7 @@ def basic_auth(user='user', passwd='passwd'):
     auth = flask.request.authorization
     if not auth or auth.username != user or auth.password != passwd:
         r = flask.make_response()
-        r.status_code = 401
+        r.status_code = HTTPStatus.UNAUTHORIZED
         r.headers = {'WWW-Authenticate': 'Basic realm="Fake Realm"'}
         return r
 
@@ -222,14 +223,14 @@ def drip():
         "Content-Type": "application/octet-stream",
         "Content-Length": str(numbytes),
     })
-    response.status_code = 200
+    response.status_code = HTTPStatus.OK
     return response
 
 
 @app.route('/404')
 def status_404():
     r = flask.make_response()
-    r.status_code = 404
+    r.status_code = HTTPStatus.NOT_FOUND
     return r
 
 

From 681bb058fa3ca862a0ba4184a23dfcef1990f9eb Mon Sep 17 00:00:00 2001
From: Jonathan Berglind <jonathan.berglind@gmail.com>
Date: Tue, 13 Feb 2018 17:58:11 +0100
Subject: [PATCH 430/574] Use HTTPStatus enum instead of http.client in
 webserver fixture

---
 tests/end2end/fixtures/webserver.py | 30 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/tests/end2end/fixtures/webserver.py b/tests/end2end/fixtures/webserver.py
index 2beb6fb95..9ba665d0c 100644
--- a/tests/end2end/fixtures/webserver.py
+++ b/tests/end2end/fixtures/webserver.py
@@ -23,7 +23,7 @@ import re
 import sys
 import json
 import os.path
-import http.client
+from http import HTTPStatus
 
 import attr
 import pytest
@@ -65,28 +65,28 @@ class Request(testprocess.Line):
         # WORKAROUND for https://github.com/PyCQA/pylint/issues/399 (?)
         # pylint: disable=no-member
         path_to_statuses = {
-            '/favicon.ico': [http.client.NOT_FOUND],
-            '/does-not-exist': [http.client.NOT_FOUND],
-            '/does-not-exist-2': [http.client.NOT_FOUND],
-            '/404': [http.client.NOT_FOUND],
+            '/favicon.ico': [HTTPStatus.NOT_FOUND],
+            '/does-not-exist': [HTTPStatus.NOT_FOUND],
+            '/does-not-exist-2': [HTTPStatus.NOT_FOUND],
+            '/404': [HTTPStatus.NOT_FOUND],
 
-            '/redirect-later': [http.client.FOUND],
-            '/redirect-self': [http.client.FOUND],
-            '/redirect-to': [http.client.FOUND],
-            '/relative-redirect': [http.client.FOUND],
-            '/absolute-redirect': [http.client.FOUND],
+            '/redirect-later': [HTTPStatus.FOUND],
+            '/redirect-self': [HTTPStatus.FOUND],
+            '/redirect-to': [HTTPStatus.FOUND],
+            '/relative-redirect': [HTTPStatus.FOUND],
+            '/absolute-redirect': [HTTPStatus.FOUND],
 
-            '/cookies/set': [http.client.FOUND],
+            '/cookies/set': [HTTPStatus.FOUND],
 
-            '/500-inline': [http.client.INTERNAL_SERVER_ERROR],
+            '/500-inline': [HTTPStatus.INTERNAL_SERVER_ERROR],
         }
         for i in range(15):
-            path_to_statuses['/redirect/{}'.format(i)] = [http.client.FOUND]
+            path_to_statuses['/redirect/{}'.format(i)] = [HTTPStatus.FOUND]
         for suffix in ['', '1', '2', '3', '4', '5', '6']:
             key = '/basic-auth/user{}/password{}'.format(suffix, suffix)
-            path_to_statuses[key] = [http.client.UNAUTHORIZED, http.client.OK]
+            path_to_statuses[key] = [HTTPStatus.UNAUTHORIZED, HTTPStatus.OK]
 
-        default_statuses = [http.client.OK, http.client.NOT_MODIFIED]
+        default_statuses = [HTTPStatus.OK, HTTPStatus.NOT_MODIFIED]
         # pylint: enable=no-member
 
         sanitized = QUrl('http://localhost' + self.path).path()  # Remove ?foo

From 29ff4259d69f3e3c994c3e66e93350d78a5d972f Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Tue, 13 Feb 2018 20:09:19 +0000
Subject: [PATCH 431/574] Add test for _uptime()

---
 tests/helpers/stubs.py           | 10 ----------
 tests/unit/misc/test_pastebin.py |  2 +-
 tests/unit/utils/test_version.py | 17 +++++++++++------
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/tests/helpers/stubs.py b/tests/helpers/stubs.py
index ede322b74..27a23650d 100644
--- a/tests/helpers/stubs.py
+++ b/tests/helpers/stubs.py
@@ -585,13 +585,3 @@ class HTTPPostStub(QObject):
     def post(self, url, data=None):
         self.url = url
         self.data = data
-
-
-@pytest.fixture
-def pbclient(stubs):
-    http_stub = stubs.HTTPPostStub()
-    client = pastebin.PastebinClient(http_stub)
-    return client
-
-
-
diff --git a/tests/unit/misc/test_pastebin.py b/tests/unit/misc/test_pastebin.py
index 9546bcf36..1d684dc4e 100644
--- a/tests/unit/misc/test_pastebin.py
+++ b/tests/unit/misc/test_pastebin.py
@@ -18,7 +18,7 @@
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
 import pytest
-from PyQt5.QtCore import pyqtSignal, QUrl, QObject
+from PyQt5.QtCore import QUrl
 
 from qutebrowser.misc import httpclient, pastebin
 
diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py
index f4f7270ba..f6e7efb16 100644
--- a/tests/unit/utils/test_version.py
+++ b/tests/unit/utils/test_version.py
@@ -35,8 +35,6 @@ import datetime
 import attr
 import pkg_resources
 import pytest
-from PyQt5.QtCore import pyqtSignal, QObject
-from PyQt5.QtWidgets import QApplication
 
 import qutebrowser
 from qutebrowser.utils import version, usertypes, utils
@@ -1011,7 +1009,14 @@ def test_pastebin_version_error(pbclient, caplog, monkeypatch):
     assert caplog.records[0].message == "Failed to pastebin version info: test"
 
 
-def test_uptime(monkeypatch):
-    """Test _uptime runs without failing. Its effects are tested elsewhere."""
-    QApplication.instance().launch_time = datetime.datetime(1, 1, 1)
-    version._uptime()
+def test_uptime(monkeypatch, qapp):
+    """Test _uptime runs and check if microseconds are dropped."""
+    launch_time = datetime.datetime(1, 1, 1, 1, 1, 1, 1)
+    qapp.launch_time = launch_time
+
+    class FakeDateTime(datetime.datetime):
+        now = lambda x=datetime.datetime(1, 1, 1, 1, 1, 1, 2): x
+    monkeypatch.setattr('datetime.datetime', FakeDateTime)
+
+    uptime_delta = version._uptime()
+    assert uptime_delta == datetime.timedelta(0)

From 1893a33708152fb0c30bc273e5f41a5a705f4543 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Tue, 13 Feb 2018 20:51:18 +0000
Subject: [PATCH 432/574] Monkeypatch qapp.launch_time too

---
 tests/unit/utils/test_version.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py
index f6e7efb16..eff67dcd8 100644
--- a/tests/unit/utils/test_version.py
+++ b/tests/unit/utils/test_version.py
@@ -996,7 +996,7 @@ def test_pastebin_version_twice(pbclient, monkeypatch):
     version.pastebin_url = None
 
 
-def test_pastebin_version_error(pbclient, caplog, monkeypatch):
+def test_pastebin_version_error(pbclient, caplog, message_mock, monkeypatch):
     """Test version.pastebin_version() with errors."""
     monkeypatch.setattr('qutebrowser.utils.version.version',
                         lambda: "dummy")
@@ -1005,14 +1005,17 @@ def test_pastebin_version_error(pbclient, caplog, monkeypatch):
     with caplog.at_level(logging.ERROR):
         version.pastebin_version(pbclient)
         pbclient._client.error.emit("test")
+
     assert version.pastebin_url is None
-    assert caplog.records[0].message == "Failed to pastebin version info: test"
+
+    msg = message_mock.getmsg(usertypes.MessageLevel.error)
+    assert msg.text == "Failed to pastebin version info: test"
 
 
 def test_uptime(monkeypatch, qapp):
     """Test _uptime runs and check if microseconds are dropped."""
     launch_time = datetime.datetime(1, 1, 1, 1, 1, 1, 1)
-    qapp.launch_time = launch_time
+    monkeypatch.setattr(qapp, "launch_time", launch_time, raising=False)
 
     class FakeDateTime(datetime.datetime):
         now = lambda x=datetime.datetime(1, 1, 1, 1, 1, 1, 2): x

From 12d74c5b52b860409bf96ecea738ab8290e3745c Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Wed, 14 Feb 2018 11:40:51 -0500
Subject: [PATCH 433/574] Fix broken language links in contributing

---
 doc/contributing.asciidoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/contributing.asciidoc b/doc/contributing.asciidoc
index a75034b95..9937434b9 100644
--- a/doc/contributing.asciidoc
+++ b/doc/contributing.asciidoc
@@ -44,8 +44,8 @@ be easy to solve]
 If you prefer C++ or Javascript to Python, see the relevant issues which involve
 work in those languages:
 
-* https://github.com/qutebrowser/qutebrowser/issues?utf8=%E2%9C%93&q=is%3Aopen%20is%3Aissue%20label%3Ac%2B%2B[C++] (mostly work on Qt, the library behind qutebrowser)
-* https://github.com/qutebrowser/qutebrowser/issues?q=is%3Aopen+is%3Aissue+label%3Ajavascript[JavaScript]
+* https://github.com/qutebrowser/qutebrowser/issues?q=is%3Aopen+is%3Aissue+label%3A%22language%3A+c%2B%2B%22[C++] (mostly work on Qt, the library behind qutebrowser)
+* https://github.com/qutebrowser/qutebrowser/issues?q=is%3Aopen+is%3Aissue+label%3A%22language%3A+javascript%22[JavaScript]
 
 There are also some things to do if you don't want to write code:
 

From b93c0dad5ae08525d1998f5076a325eb0b4bf92f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 14 Feb 2018 20:03:01 +0100
Subject: [PATCH 434/574] urlmatch: Start UrlPattern

---
 qutebrowser/utils/urlmatch.py     | 99 +++++++++++++++++++++++++++++++
 tests/unit/utils/test_urlmatch.py | 58 ++++++++++++++++++
 2 files changed, 157 insertions(+)
 create mode 100644 qutebrowser/utils/urlmatch.py
 create mode 100644 tests/unit/utils/test_urlmatch.py

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
new file mode 100644
index 000000000..f4385ee4d
--- /dev/null
+++ b/qutebrowser/utils/urlmatch.py
@@ -0,0 +1,99 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""A Chromium-like URL matching pattern.
+
+See:
+https://developer.chrome.com/apps/match_patterns
+https://cs.chromium.org/chromium/src/extensions/common/url_pattern.cc
+https://cs.chromium.org/chromium/src/extensions/common/url_pattern.h
+"""
+
+import contextlib
+import urllib.parse
+
+from qutebrowser.utils import utils
+
+
+class UrlPattern:
+
+    """A Chromium-like URL matching pattern."""
+
+    SCHEMES = ['https', 'http', 'ftp', 'file', 'chrome', 'qute', 'about']
+
+    def __init__(self, pattern):
+        # Make sure all attributes are initialized if we exit early.
+        self._pattern = pattern
+        self._match_all = False
+        self._match_subdomains = False
+        self._scheme = None
+        self._host = None
+
+        # > The special pattern <all_urls> matches any URL that starts with a
+        # > permitted scheme.
+        if pattern == '<all_urls>':
+            self._match_all = True
+            return
+
+        # > If the scheme is *, then it matches either http or https, and not
+        # > file, or ftp.
+        # Note we deviate from that, as per-URL settings aren't security
+        # relevant.
+        if pattern.startswith('*:'):  # Any scheme
+            self._scheme = '*'
+            pattern = 'any:' + pattern[2:]  # Make it parseable again
+
+        # We use urllib.parse instead of QUrl here because it can handle
+        # hosts with * in them.
+        parsed = urllib.parse.urlparse(pattern)
+        # "Changed in version 3.6: Out-of-range port numbers now raise
+        # ValueError, instead of returning None."
+        if parsed is None:
+            raise ValueError("Failed to parse {}".format(pattern))
+
+        self._init_scheme(parsed)
+        self._init_host(parsed)
+        self._init_path(parsed)
+
+    def _init_scheme(self, parsed):
+        if not parsed.scheme:
+            raise ValueError("No scheme given")
+        if parsed.scheme not in self.SCHEMES:
+            raise ValueError("Unknown scheme {}".format(parsed.scheme))
+        self._scheme = parsed.scheme
+
+    def _init_path(self, parsed):
+        # FIXME store somewhere
+        if self._scheme == 'about' and not parsed.path.strip():
+            raise ValueError("Pattern without path")
+
+    def _init_host(self, parsed):
+        if self._scheme != 'about' and not parsed.netloc.strip():
+            raise ValueError("Pattern without host")
+        host_parts = parsed.netloc.split('.')
+        if host_parts[0] == '*':
+            host_parts = host_parts[1:]
+            self._match_subdomains = True
+        self._host = '.'.join(host_parts)
+        if '*' in self._host:
+            # Only * or *.foo is allowed as host.
+            raise ValueError("Invalid host wildcard")
+
+    def __repr__(self):
+        return utils.get_repr(self, pattern=self._pattern, constructor=True)
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
new file mode 100644
index 000000000..fe7b9e9ed
--- /dev/null
+++ b/tests/unit/utils/test_urlmatch.py
@@ -0,0 +1,58 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests for qutebrowser.utils.urlmatch.
+
+Some data is inspired by Chromium's tests:
+https://cs.chromium.org/chromium/src/extensions/common/url_pattern_unittest.cc
+"""
+
+import pytest
+
+from qutebrowser.utils import urlmatch
+
+
+@pytest.mark.parametrize('pattern, error', [
+    # Chromium: PARSE_ERROR_MISSING_SCHEME_SEPARATOR
+    ("http", "No scheme given"),
+    ("http:", "Pattern without host"),
+    ("http:/", "Pattern without host"),
+    ("about://", "Pattern without path"),
+    ("http:/bar", "Pattern without host"),
+
+    # Chromium: PARSE_ERROR_EMPTY_HOST
+    ("http://", "Pattern without host"),
+    ("http:///", "Pattern without host"),
+    ("http:// /", "Pattern without host"),
+
+    # Chromium: PARSE_ERROR_EMPTY_PATH
+    # FIXME: should we allow this or not?
+    # ("http://bar", "URLPattern::"),
+
+    # Chromium: PARSE_ERROR_INVALID_HOST_WILDCARD
+    ("http://*foo/bar", "Invalid host wildcard"),
+    ("http://foo.*.bar/baz", "Invalid host wildcard"),
+    ("http://fo.*.ba:123/baz", "Invalid host wildcard"),
+    ("http://foo.*/bar", "Invalid host wildcard"),
+
+    # Some more tests
+])
+def test_invalid_patterns(pattern, error):
+    with pytest.raises(ValueError, match=error):
+        urlmatch.UrlPattern(pattern)

From 76efba296f63f5da7c093d603f61e01015d98ddf Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 14 Feb 2018 20:08:14 +0100
Subject: [PATCH 435/574] urlmatch: Store path/port

---
 qutebrowser/utils/urlmatch.py     | 9 ++++++++-
 tests/unit/utils/test_urlmatch.py | 2 --
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index f4385ee4d..43c7fa8c8 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -44,6 +44,8 @@ class UrlPattern:
         self._match_subdomains = False
         self._scheme = None
         self._host = None
+        self._path = None
+        self._port = None
 
         # > The special pattern <all_urls> matches any URL that starts with a
         # > permitted scheme.
@@ -70,6 +72,7 @@ class UrlPattern:
         self._init_scheme(parsed)
         self._init_host(parsed)
         self._init_path(parsed)
+        self._init_port(parsed)
 
     def _init_scheme(self, parsed):
         if not parsed.scheme:
@@ -79,9 +82,9 @@ class UrlPattern:
         self._scheme = parsed.scheme
 
     def _init_path(self, parsed):
-        # FIXME store somewhere
         if self._scheme == 'about' and not parsed.path.strip():
             raise ValueError("Pattern without path")
+        self._path = parsed.path
 
     def _init_host(self, parsed):
         if self._scheme != 'about' and not parsed.netloc.strip():
@@ -95,5 +98,9 @@ class UrlPattern:
             # Only * or *.foo is allowed as host.
             raise ValueError("Invalid host wildcard")
 
+    def _init_port(self, parsed):
+        # FIXME validation?
+        self._port = parsed.port
+
     def __repr__(self):
         return utils.get_repr(self, pattern=self._pattern, constructor=True)
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index fe7b9e9ed..de499aa87 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -50,8 +50,6 @@ from qutebrowser.utils import urlmatch
     ("http://foo.*.bar/baz", "Invalid host wildcard"),
     ("http://fo.*.ba:123/baz", "Invalid host wildcard"),
     ("http://foo.*/bar", "Invalid host wildcard"),
-
-    # Some more tests
 ])
 def test_invalid_patterns(pattern, error):
     with pytest.raises(ValueError, match=error):

From 1b8dfb6c3638af9ee56b190b24b06f5cc7cd70d7 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 14 Feb 2018 22:20:51 +0100
Subject: [PATCH 436/574] urlmatch: Disallow NUL byte

See https://bugs.chromium.org/p/chromium/issues/detail?id=390624
With Qt, we might run into the same issue as well at some point, and it sure
can't hurt to disallow it.
---
 qutebrowser/utils/urlmatch.py     | 3 +++
 tests/unit/utils/test_urlmatch.py | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index 43c7fa8c8..211ac0475 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -53,6 +53,9 @@ class UrlPattern:
             self._match_all = True
             return
 
+        if '\0' in pattern:
+            raise ValueError("May not contain NUL byte")
+
         # > If the scheme is *, then it matches either http or https, and not
         # > file, or ftp.
         # Note we deviate from that, as per-URL settings aren't security
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index de499aa87..26b4b6a59 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -45,6 +45,9 @@ from qutebrowser.utils import urlmatch
     # FIXME: should we allow this or not?
     # ("http://bar", "URLPattern::"),
 
+    # Chromium: PARSE_ERROR_INVALID_HOST
+    ("http://\0www/", "May not contain NUL byte"),
+
     # Chromium: PARSE_ERROR_INVALID_HOST_WILDCARD
     ("http://*foo/bar", "Invalid host wildcard"),
     ("http://foo.*.bar/baz", "Invalid host wildcard"),

From 3c17bb97c0cea3628620579d6e0818e2fac880ab Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 14 Feb 2018 22:30:35 +0100
Subject: [PATCH 437/574] urlmatch: Start with port parsing

---
 qutebrowser/utils/urlmatch.py     |  4 ++--
 tests/unit/utils/test_urlmatch.py | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index 211ac0475..665536959 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -90,9 +90,9 @@ class UrlPattern:
         self._path = parsed.path
 
     def _init_host(self, parsed):
-        if self._scheme != 'about' and not parsed.netloc.strip():
+        if self._scheme != 'about' and not parsed.hostname.strip():
             raise ValueError("Pattern without host")
-        host_parts = parsed.netloc.split('.')
+        host_parts = parsed.hostname.split('.')
         if host_parts[0] == '*':
             host_parts = host_parts[1:]
             self._match_subdomains = True
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index 26b4b6a59..03b7f947b 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -57,3 +57,30 @@ from qutebrowser.utils import urlmatch
 def test_invalid_patterns(pattern, error):
     with pytest.raises(ValueError, match=error):
         urlmatch.UrlPattern(pattern)
+
+
+@pytest.mark.parametrize('pattern, port', [
+    ("http://foo:1234/", 1234),
+    ("http://foo:1234/bar", 1234),
+    ("http://*.foo:1234/", 1234),
+    ("http://*.foo:1234/bar", 1234),
+    ("http://:1234/", 1234),
+    ("http://foo:*/", "*"),
+    ("file://foo:1234/bar", "*"),
+])
+def test_port_valid(pattern, port):
+    up = urlmatch.UrlPattern(pattern)
+    assert up._port == port
+
+
+@pytest.mark.parametrize('pattern', [
+    "http://foo:/",
+    "http://*.foo:/",
+    "http://foo:com/",
+    "http://foo:123456/",
+    "http://foo:80:80/monkey",
+    "chrome://foo:1234/bar",
+])
+def test_port_invalid(pattern):
+    with pytest.raises(ValueError, match='Invalid Port'):
+        urlmatch.UrlPattern(pattern)

From 32abb67d1f07a5ddfd485fdbdffaa4e9e59f1bfe Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 14 Feb 2018 23:28:14 +0100
Subject: [PATCH 438/574] urlmatch: Use dedicated ParseError exception

---
 qutebrowser/utils/urlmatch.py     | 24 ++++++++++++++++--------
 tests/unit/utils/test_urlmatch.py |  4 ++--
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index 665536959..5bf9aaba0 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -31,6 +31,11 @@ import urllib.parse
 from qutebrowser.utils import utils
 
 
+class ParseError(Exception):
+
+    """Raised when a pattern could not be parsed."""
+
+
 class UrlPattern:
 
     """A Chromium-like URL matching pattern."""
@@ -54,7 +59,7 @@ class UrlPattern:
             return
 
         if '\0' in pattern:
-            raise ValueError("May not contain NUL byte")
+            raise ParseError("May not contain NUL byte")
 
         # > If the scheme is *, then it matches either http or https, and not
         # > file, or ftp.
@@ -66,11 +71,14 @@ class UrlPattern:
 
         # We use urllib.parse instead of QUrl here because it can handle
         # hosts with * in them.
-        parsed = urllib.parse.urlparse(pattern)
+        try:
+            parsed = urllib.parse.urlparse(pattern)
+        except ValueError as e:
+            raise ParseError(str(e))
         # "Changed in version 3.6: Out-of-range port numbers now raise
         # ValueError, instead of returning None."
         if parsed is None:
-            raise ValueError("Failed to parse {}".format(pattern))
+            raise ParseError("Failed to parse {}".format(pattern))
 
         self._init_scheme(parsed)
         self._init_host(parsed)
@@ -79,19 +87,19 @@ class UrlPattern:
 
     def _init_scheme(self, parsed):
         if not parsed.scheme:
-            raise ValueError("No scheme given")
+            raise ParseError("No scheme given")
         if parsed.scheme not in self.SCHEMES:
-            raise ValueError("Unknown scheme {}".format(parsed.scheme))
+            raise ParseError("Unknown scheme {}".format(parsed.scheme))
         self._scheme = parsed.scheme
 
     def _init_path(self, parsed):
         if self._scheme == 'about' and not parsed.path.strip():
-            raise ValueError("Pattern without path")
+            raise ParseError("Pattern without path")
         self._path = parsed.path
 
     def _init_host(self, parsed):
         if self._scheme != 'about' and not parsed.hostname.strip():
-            raise ValueError("Pattern without host")
+            raise ParseError("Pattern without host")
         host_parts = parsed.hostname.split('.')
         if host_parts[0] == '*':
             host_parts = host_parts[1:]
@@ -99,7 +107,7 @@ class UrlPattern:
         self._host = '.'.join(host_parts)
         if '*' in self._host:
             # Only * or *.foo is allowed as host.
-            raise ValueError("Invalid host wildcard")
+            raise ParseError("Invalid host wildcard")
 
     def _init_port(self, parsed):
         # FIXME validation?
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index 03b7f947b..6845631ad 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -55,7 +55,7 @@ from qutebrowser.utils import urlmatch
     ("http://foo.*/bar", "Invalid host wildcard"),
 ])
 def test_invalid_patterns(pattern, error):
-    with pytest.raises(ValueError, match=error):
+    with pytest.raises(urlmatch.ParseError, match=error):
         urlmatch.UrlPattern(pattern)
 
 
@@ -82,5 +82,5 @@ def test_port_valid(pattern, port):
     "chrome://foo:1234/bar",
 ])
 def test_port_invalid(pattern):
-    with pytest.raises(ValueError, match='Invalid Port'):
+    with pytest.raises(urlmatch.ParseError):
         urlmatch.UrlPattern(pattern)

From c728d78beaefafb41e0764e40cab3dc8c9287585 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 14 Feb 2018 23:29:02 +0100
Subject: [PATCH 439/574] urlmatch: Host/port parsing

---
 qutebrowser/utils/urlmatch.py     | 37 +++++++++++++++++++++++++++----
 tests/unit/utils/test_urlmatch.py |  6 +++--
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index 5bf9aaba0..07355e885 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -98,8 +98,17 @@ class UrlPattern:
         self._path = parsed.path
 
     def _init_host(self, parsed):
-        if self._scheme != 'about' and not parsed.hostname.strip():
-            raise ParseError("Pattern without host")
+        """Parse the host from the given URL.
+
+        Deviation from Chromium:
+        - http://:1234/ is not a valid URL because it has no host.
+        """
+        if parsed.hostname is None or not parsed.hostname.strip():
+            if self._scheme != 'about':
+                raise ParseError("Pattern without host")
+            assert self._host is None
+            return
+
         host_parts = parsed.hostname.split('.')
         if host_parts[0] == '*':
             host_parts = host_parts[1:]
@@ -110,8 +119,28 @@ class UrlPattern:
             raise ParseError("Invalid host wildcard")
 
     def _init_port(self, parsed):
-        # FIXME validation?
-        self._port = parsed.port
+        """Parse the port from the given URL.
+
+        Deviation from Chromium:
+        - file://foo:1234/bar is invalid instead of falling back to *
+        """
+        if parsed.netloc.endswith(':*'):
+            # We can't access parsed.port as it tries to run int()
+            self._port = '*'
+        elif parsed.netloc.endswith(':'):
+            raise ParseError("Empty port")
+        else:
+            try:
+                self._port = parsed.port
+            except ValueError:
+                raise ParseError("Invalid port")
+
+        allows_ports = {'https': True, 'http': True, 'ftp': True,
+                        'file': False, 'chrome': False, 'qute': False,
+                        'about': False}
+        if not allows_ports[self._scheme] and self._port is not None:
+            raise ParseError("Ports unsupported with {} scheme".format(
+                self._scheme))
 
     def __repr__(self):
         return utils.get_repr(self, pattern=self._pattern, constructor=True)
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index 6845631ad..eb630f99b 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -64,9 +64,11 @@ def test_invalid_patterns(pattern, error):
     ("http://foo:1234/bar", 1234),
     ("http://*.foo:1234/", 1234),
     ("http://*.foo:1234/bar", 1234),
-    ("http://:1234/", 1234),
+    # FIXME Why is this valid in Chromium?
+    # ("http://:1234/", 1234),
     ("http://foo:*/", "*"),
-    ("file://foo:1234/bar", "*"),
+    # FIXME Why is this valid in Chromium?
+    # ("file://foo:1234/bar", "*"),
 ])
 def test_port_valid(pattern, port):
     up = urlmatch.UrlPattern(pattern)

From d266190518d35221fb44a39b72d41761880db672 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 14 Feb 2018 23:32:40 +0100
Subject: [PATCH 440/574] urlmatch: Improve port tests

---
 qutebrowser/utils/urlmatch.py     |  2 +-
 tests/unit/utils/test_urlmatch.py | 23 +++++++++--------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index 07355e885..f171d77be 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -139,7 +139,7 @@ class UrlPattern:
                         'file': False, 'chrome': False, 'qute': False,
                         'about': False}
         if not allows_ports[self._scheme] and self._port is not None:
-            raise ParseError("Ports unsupported with {} scheme".format(
+            raise ParseError("Ports are unsupported with {} scheme".format(
                 self._scheme))
 
     def __repr__(self):
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index eb630f99b..47fc8b82b 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -53,6 +53,14 @@ from qutebrowser.utils import urlmatch
     ("http://foo.*.bar/baz", "Invalid host wildcard"),
     ("http://fo.*.ba:123/baz", "Invalid host wildcard"),
     ("http://foo.*/bar", "Invalid host wildcard"),
+
+    # Chromium: PARSE_ERROR_INVALID_PORT
+    ("http://foo:/", "Empty port"),
+    ("http://*.foo:/", "Empty port"),
+    ("http://foo:com/", "Invalid port"),
+    ("http://foo:123456/", "Invalid port"),
+    ("http://foo:80:80/monkey", "Invalid port"),
+    ("chrome://foo:1234/bar", "Ports are unsupported with chrome scheme"),
 ])
 def test_invalid_patterns(pattern, error):
     with pytest.raises(urlmatch.ParseError, match=error):
@@ -70,19 +78,6 @@ def test_invalid_patterns(pattern, error):
     # FIXME Why is this valid in Chromium?
     # ("file://foo:1234/bar", "*"),
 ])
-def test_port_valid(pattern, port):
+def test_port(pattern, port):
     up = urlmatch.UrlPattern(pattern)
     assert up._port == port
-
-
-@pytest.mark.parametrize('pattern', [
-    "http://foo:/",
-    "http://*.foo:/",
-    "http://foo:com/",
-    "http://foo:123456/",
-    "http://foo:80:80/monkey",
-    "chrome://foo:1234/bar",
-])
-def test_port_invalid(pattern):
-    with pytest.raises(urlmatch.ParseError):
-        urlmatch.UrlPattern(pattern)

From a2a95f5feef7ec1e304b7929fae91de7b15970ff Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 14:24:07 +0100
Subject: [PATCH 441/574] urlmatch: Improve port handling

---
 qutebrowser/utils/urlmatch.py     | 11 ++++++++++-
 tests/unit/utils/test_urlmatch.py |  3 +--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index f171d77be..5338a24b5 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -69,6 +69,11 @@ class UrlPattern:
             self._scheme = '*'
             pattern = 'any:' + pattern[2:]  # Make it parseable again
 
+        # Chromium handles file://foo like file:///foo
+        if (pattern.startswith('file://') and
+                not pattern.startswith('file:///')):
+            pattern = 'file:///' + pattern[len("file://"):]
+
         # We use urllib.parse instead of QUrl here because it can handle
         # hosts with * in them.
         try:
@@ -104,7 +109,7 @@ class UrlPattern:
         - http://:1234/ is not a valid URL because it has no host.
         """
         if parsed.hostname is None or not parsed.hostname.strip():
-            if self._scheme != 'about':
+            if self._scheme not in ['about', 'file']:
                 raise ParseError("Pattern without host")
             assert self._host is None
             return
@@ -142,5 +147,9 @@ class UrlPattern:
             raise ParseError("Ports are unsupported with {} scheme".format(
                 self._scheme))
 
+        if self._port is None and self._scheme == 'file':
+            # FIXME compatibility with Chromium, but is this needed?
+            self._port = '*'
+
     def __repr__(self):
         return utils.get_repr(self, pattern=self._pattern, constructor=True)
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index 47fc8b82b..8fecb6766 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -75,8 +75,7 @@ def test_invalid_patterns(pattern, error):
     # FIXME Why is this valid in Chromium?
     # ("http://:1234/", 1234),
     ("http://foo:*/", "*"),
-    # FIXME Why is this valid in Chromium?
-    # ("file://foo:1234/bar", "*"),
+    ("file://foo:1234/bar", "*"),
 ])
 def test_port(pattern, port):
     up = urlmatch.UrlPattern(pattern)

From fa329c698ea4403dfca6c76b9d0f88832754e662 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 14:29:39 +0100
Subject: [PATCH 442/574] urlmatch: Finish port parsing

---
 qutebrowser/utils/urlmatch.py     |  8 ++------
 tests/unit/utils/test_urlmatch.py | 11 +++++++++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index 5338a24b5..49551cba2 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -127,11 +127,11 @@ class UrlPattern:
         """Parse the port from the given URL.
 
         Deviation from Chromium:
-        - file://foo:1234/bar is invalid instead of falling back to *
+        - We use None instead of "*" if there's no port filter.
         """
         if parsed.netloc.endswith(':*'):
             # We can't access parsed.port as it tries to run int()
-            self._port = '*'
+            self._port = None
         elif parsed.netloc.endswith(':'):
             raise ParseError("Empty port")
         else:
@@ -147,9 +147,5 @@ class UrlPattern:
             raise ParseError("Ports are unsupported with {} scheme".format(
                 self._scheme))
 
-        if self._port is None and self._scheme == 'file':
-            # FIXME compatibility with Chromium, but is this needed?
-            self._port = '*'
-
     def __repr__(self):
         return utils.get_repr(self, pattern=self._pattern, constructor=True)
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index 8fecb6766..ff24053db 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -74,8 +74,15 @@ def test_invalid_patterns(pattern, error):
     ("http://*.foo:1234/bar", 1234),
     # FIXME Why is this valid in Chromium?
     # ("http://:1234/", 1234),
-    ("http://foo:*/", "*"),
-    ("file://foo:1234/bar", "*"),
+    ("http://foo:*/", None),
+    ("file://foo:1234/bar", None),
+
+    # Port-like strings in the path should not trigger a warning.
+    ("http://*/:1234", None),
+    ("http://*.foo/bar:1234", None),
+    ("http://foo/bar:1234/path", None),
+    # We don't implement ALLOW_WILDCARD_FOR_EFFECTIVE_TLD yet.
+    # ("http://*.foo.*/:1234", None),
 ])
 def test_port(pattern, port):
     up = urlmatch.UrlPattern(pattern)

From 3d6cbcf3969d6779201364bc20fadeefbda767e2 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 14:31:08 +0100
Subject: [PATCH 443/574] urlmatch: Improve matching error for TLD wildcards

---
 qutebrowser/utils/urlmatch.py     | 6 +++++-
 tests/unit/utils/test_urlmatch.py | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index 49551cba2..cf6a5d4da 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -119,7 +119,11 @@ class UrlPattern:
             host_parts = host_parts[1:]
             self._match_subdomains = True
         self._host = '.'.join(host_parts)
-        if '*' in self._host:
+
+        if self._host.endswith('.*'):
+            # Special case to have a nicer error
+            raise ParseError("TLD wildcards are not implemented yet")
+        elif '*' in self._host:
             # Only * or *.foo is allowed as host.
             raise ParseError("Invalid host wildcard")
 
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index ff24053db..496a14c7f 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -52,7 +52,7 @@ from qutebrowser.utils import urlmatch
     ("http://*foo/bar", "Invalid host wildcard"),
     ("http://foo.*.bar/baz", "Invalid host wildcard"),
     ("http://fo.*.ba:123/baz", "Invalid host wildcard"),
-    ("http://foo.*/bar", "Invalid host wildcard"),
+    ("http://foo.*/bar", "TLD wildcards are not implemented yet"),
 
     # Chromium: PARSE_ERROR_INVALID_PORT
     ("http://foo:/", "Empty port"),

From 2b274f8e0baf1a492d93599fd58aff6952f77d53 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 15:39:03 +0100
Subject: [PATCH 444/574] urlmatch: Implement initial matching

---
 qutebrowser/utils/urlmatch.py     | 73 ++++++++++++++++++++++++++++++-
 tests/unit/utils/test_urlmatch.py | 23 ++++++++++
 2 files changed, 95 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index cf6a5d4da..a093c6c63 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -25,6 +25,7 @@ https://cs.chromium.org/chromium/src/extensions/common/url_pattern.cc
 https://cs.chromium.org/chromium/src/extensions/common/url_pattern.h
 """
 
+import fnmatch
 import contextlib
 import urllib.parse
 
@@ -114,10 +115,12 @@ class UrlPattern:
             assert self._host is None
             return
 
-        host_parts = parsed.hostname.split('.')
+        # FIXME what about multiple dots?
+        host_parts = parsed.hostname.rstrip('.').split('.')
         if host_parts[0] == '*':
             host_parts = host_parts[1:]
             self._match_subdomains = True
+
         self._host = '.'.join(host_parts)
 
         if self._host.endswith('.*'):
@@ -153,3 +156,71 @@ class UrlPattern:
 
     def __repr__(self):
         return utils.get_repr(self, pattern=self._pattern, constructor=True)
+
+    def _matches_scheme(self, scheme):
+        if scheme not in self.SCHEMES:
+            return False
+        return self._scheme == '*' or self._scheme == scheme
+
+    def _matches_host(self, host):
+        # FIXME what about multiple dots?
+        host = host.rstrip('.')
+
+        # If the hosts are exactly equal, we have a match.
+        if host == self._host:
+            return True
+
+        # If we're matching subdomains, and we have no host in the match pattern,
+        # that means that we're matching all hosts, which means we have a match no
+        # matter what the test host is.
+        if self._match_subdomains and not self._host:
+            return True
+
+        # Otherwise, we can only match if our match pattern matches subdomains.
+        if not self._match_subdomains:
+            return False
+
+        # FIXME
+        # We don't do subdomain matching against IP addresses, so we can give up now
+        # if the test host is an IP address.
+        # if (test.HostIsIPAddress())
+        #   return false;
+
+        # Check if the test host is a subdomain of our host.
+        if len(host) <= (len(self._host) + 1):
+            return False
+
+        if not host.endswith(self._host):
+            return False
+
+        return host[len(host) - len(self._host) - 1] == '.'
+
+    def _matches_port(self, port):
+        if port == '-1':  # QUrl
+            port = None
+        return self._port == '*' or self._port == port
+
+    def _matches_path(self, path):
+        # Match 'google.com' with 'google.com/'
+        # FIXME use the no-copy approach Chromium has in URLPattern::MatchesPath
+        # for performance?
+        if path + '/*' == self._path:
+            return True
+
+        # FIXME Chromium seems to have a more optimized glob matching which
+        # doesn't rely on regexes. Do we need that too?
+        return fnmatch.fnmatchcase(path, self._path)
+
+    def matches(self, qurl):
+        """Check if the pattern matches the given QUrl."""
+        # FIXME do we need to check this early?
+        if not self._matches_scheme(qurl.scheme()):
+            return False
+
+        if self._match_all:
+            return True
+
+        # FIXME ignore host for file:// like Chromium?
+        return (self._matches_host(qurl.host()) and
+                self._matches_port(qurl.port()) and
+                self._matches_path(qurl.path()))
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index 496a14c7f..1fc53a41f 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -25,6 +25,8 @@ https://cs.chromium.org/chromium/src/extensions/common/url_pattern_unittest.cc
 
 import pytest
 
+from PyQt5.QtCore import QUrl
+
 from qutebrowser.utils import urlmatch
 
 
@@ -87,3 +89,24 @@ def test_invalid_patterns(pattern, error):
 def test_port(pattern, port):
     up = urlmatch.UrlPattern(pattern)
     assert up._port == port
+
+
+def test_match_all_pages_for_given_scheme_attrs():
+    up = urlmatch.UrlPattern("http://*/*")
+    assert up._scheme == 'http'
+    assert up._host == ''  # FIXME '' or None?
+    assert up._match_subdomains
+    assert not up._match_all
+    assert up._path == '/*'
+
+
+@pytest.mark.parametrize('url, expected', [
+    ("http://google.com", True),
+    ("http://yahoo.com", True),
+    ("http://google.com/foo", True),
+    ("https://google.com", False),
+    ("http://74.125.127.100/search", True),
+])
+def test_match_all_pages_for_given_scheme_urls(url, expected):
+    up = urlmatch.UrlPattern("http://*/*")
+    assert up.matches(QUrl(url)) == expected

From a8a976b32423c6ffee699f35ae1f5797e18562b3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 15:49:29 +0100
Subject: [PATCH 445/574] urlmatch: Simplify/fix matching by using None as
 sentinel

---
 qutebrowser/utils/urlmatch.py | 50 +++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index a093c6c63..0410090f2 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -39,7 +39,24 @@ class ParseError(Exception):
 
 class UrlPattern:
 
-    """A Chromium-like URL matching pattern."""
+    """A Chromium-like URL matching pattern.
+
+    Class attributes:
+        SCHEMES: Schemes which are allowed in patterns.
+
+    Attributes:
+        _pattern: The given pattern as string.
+        _match_all: Whether the pattern should match all URLs.
+        _match_subdomains: Whether the pattern should match subdomains of the
+                           given host.
+        _scheme: The scheme to match to, or None to match any scheme.
+                 Note that with Chromium, '*'/None only matches http/https and
+                 not file/ftp. We deviate from that as per-URL settings aren't
+                 security relevant.
+        _host: The host to match to, or None for any host. (FIXME true?)
+        _path: The path to match to, or None for any path. (FIXME true?)
+        _port: The port to match to as integer, or None for any port.
+    """
 
     SCHEMES = ['https', 'http', 'ftp', 'file', 'chrome', 'qute', 'about']
 
@@ -62,18 +79,7 @@ class UrlPattern:
         if '\0' in pattern:
             raise ParseError("May not contain NUL byte")
 
-        # > If the scheme is *, then it matches either http or https, and not
-        # > file, or ftp.
-        # Note we deviate from that, as per-URL settings aren't security
-        # relevant.
-        if pattern.startswith('*:'):  # Any scheme
-            self._scheme = '*'
-            pattern = 'any:' + pattern[2:]  # Make it parseable again
-
-        # Chromium handles file://foo like file:///foo
-        if (pattern.startswith('file://') and
-                not pattern.startswith('file:///')):
-            pattern = 'file:///' + pattern[len("file://"):]
+        pattern = self._fixup_pattern(pattern)
 
         # We use urllib.parse instead of QUrl here because it can handle
         # hosts with * in them.
@@ -91,6 +97,18 @@ class UrlPattern:
         self._init_path(parsed)
         self._init_port(parsed)
 
+    def _fixup_pattern(self, pattern):
+        """Make sure the given pattern is parseable by urllib.parse."""
+        if pattern.startswith('*:'):  # Any scheme, but *:// is unparseable
+            pattern = 'any:' + pattern[2:]
+
+        # Chromium handles file://foo like file:///foo
+        if (pattern.startswith('file://') and
+                not pattern.startswith('file:///')):
+            pattern = 'file:///' + pattern[len("file://"):]
+
+        return pattern
+
     def _init_scheme(self, parsed):
         if not parsed.scheme:
             raise ParseError("No scheme given")
@@ -160,7 +178,7 @@ class UrlPattern:
     def _matches_scheme(self, scheme):
         if scheme not in self.SCHEMES:
             return False
-        return self._scheme == '*' or self._scheme == scheme
+        return self._scheme is None or self._scheme == scheme
 
     def _matches_host(self, host):
         # FIXME what about multiple dots?
@@ -196,9 +214,7 @@ class UrlPattern:
         return host[len(host) - len(self._host) - 1] == '.'
 
     def _matches_port(self, port):
-        if port == '-1':  # QUrl
-            port = None
-        return self._port == '*' or self._port == port
+        return self._port is None or self._port == port
 
     def _matches_path(self, path):
         # Match 'google.com' with 'google.com/'

From b7c3c10b87345e9d3b2c43c20ee1f965ef541c56 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 15:51:26 +0100
Subject: [PATCH 446/574] urlmatch: Use class in test

---
 tests/unit/utils/test_urlmatch.py | 37 +++++++++++++++++--------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index 1fc53a41f..5c25ce457 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -91,22 +91,25 @@ def test_port(pattern, port):
     assert up._port == port
 
 
-def test_match_all_pages_for_given_scheme_attrs():
-    up = urlmatch.UrlPattern("http://*/*")
-    assert up._scheme == 'http'
-    assert up._host == ''  # FIXME '' or None?
-    assert up._match_subdomains
-    assert not up._match_all
-    assert up._path == '/*'
+class TestMatchAllPagesForGivenScheme:
 
+    @pytest.fixture
+    def up(self):
+        return urlmatch.UrlPattern("http://*/*")
 
-@pytest.mark.parametrize('url, expected', [
-    ("http://google.com", True),
-    ("http://yahoo.com", True),
-    ("http://google.com/foo", True),
-    ("https://google.com", False),
-    ("http://74.125.127.100/search", True),
-])
-def test_match_all_pages_for_given_scheme_urls(url, expected):
-    up = urlmatch.UrlPattern("http://*/*")
-    assert up.matches(QUrl(url)) == expected
+    def test_attrs(self, up):
+        assert up._scheme == 'http'
+        assert up._host == ''  # FIXME '' or None?
+        assert up._match_subdomains
+        assert not up._match_all
+        assert up._path == '/*'
+
+    @pytest.mark.parametrize('url, expected', [
+        ("http://google.com", True),
+        ("http://yahoo.com", True),
+        ("http://google.com/foo", True),
+        ("https://google.com", False),
+        ("http://74.125.127.100/search", True),
+    ])
+    def test_urls(self, up, url, expected):
+        assert up.matches(QUrl(url)) == expected

From faeca30dfa77c9eacc2d45ceeb74f53a1fc1f516 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 16:19:22 +0100
Subject: [PATCH 447/574] urlmatch: Add more tests

---
 tests/unit/utils/test_urlmatch.py | 54 ++++++++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index 5c25ce457..aadea5a1d 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -19,8 +19,12 @@
 
 """Tests for qutebrowser.utils.urlmatch.
 
-Some data is inspired by Chromium's tests:
+The tests are mostly inspired by Chromium's:
 https://cs.chromium.org/chromium/src/extensions/common/url_pattern_unittest.cc
+
+Currently not tested:
+- The match_effective_tld attribute as it doesn't exist yet.
+- Nested filesystem:// URLs as we don't have those.
 """
 
 import pytest
@@ -113,3 +117,51 @@ class TestMatchAllPagesForGivenScheme:
     ])
     def test_urls(self, up, url, expected):
         assert up.matches(QUrl(url)) == expected
+
+
+class TestMatchAllDomains:
+
+    @pytest.fixture
+    def up(self):
+        return urlmatch.UrlPattern("https://*/foo*")
+
+    def test_attrs(self, up):
+        assert up._scheme == 'https'
+        assert up._host == ''  # FIXME '' or None?
+        assert up._match_subdomains
+        assert not up._match_all
+        assert up._path == '/foo*'
+
+    @pytest.mark.parametrize('url, expected', [
+        ("https://google.com/foo", True),
+        ("https://google.com/foobar", True),
+        ("http://google.com/foo", False),
+        ("https://google.com/", False),
+    ])
+    def test_urls(self, up, url, expected):
+        assert up.matches(QUrl(url)) == expected
+
+
+class TestMatchSubdomains:
+
+    @pytest.fixture
+    def up(self):
+        return urlmatch.UrlPattern("http://*.google.com/foo*bar")
+
+    def test_attrs(self, up):
+        assert up._scheme == 'http'
+        assert up._host == 'google.com'
+        assert up._match_subdomains
+        assert not up._match_all
+        assert up._path == '/foo*bar'
+
+    @pytest.mark.parametrize('url, expected', [
+        ("http://google.com/foobar", True),
+        # FIXME The ?bar seems to be treated as path by GURL but as query by
+        # QUrl.
+        # ("http://www.google.com/foo?bar", True),
+        ("http://monkey.images.google.com/foooobar", True),
+        ("http://yahoo.com/foobar", False),
+    ])
+    def test_urls(self, up, url, expected):
+        assert up.matches(QUrl(url)) == expected

From 9092c3a87f0b949598d73ca9d545b91cefa15fb0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 16:22:29 +0100
Subject: [PATCH 448/574] urlmatch: Increase debuggability

---
 qutebrowser/utils/urlmatch.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index 0410090f2..bd5f17fa5 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -236,7 +236,12 @@ class UrlPattern:
         if self._match_all:
             return True
 
-        # FIXME ignore host for file:// like Chromium?
-        return (self._matches_host(qurl.host()) and
-                self._matches_port(qurl.port()) and
-                self._matches_path(qurl.path()))
+        # FIXME ignore for file:// like Chromium?
+        if not self._matches_host(qurl.host()):
+            return False
+        if not self._matches_port(qurl.port()):
+            return False
+        if not self._matches_path(qurl.path()):
+            return False
+
+        return True

From 5419d1caa11da9e6dd398667936c5e66f15b1c2a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 16:39:07 +0100
Subject: [PATCH 449/574] urlmatch: Add glob escaping tests

---
 tests/unit/utils/test_urlmatch.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index aadea5a1d..accbb691f 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -165,3 +165,25 @@ class TestMatchSubdomains:
     ])
     def test_urls(self, up, url, expected):
         assert up.matches(QUrl(url)) == expected
+
+
+class TestMatchGlobEscaping:
+
+    @pytest.fixture
+    def up(self):
+        return urlmatch.UrlPattern(r"file:///foo-bar\*baz")
+
+    def test_attrs(self, up):
+        assert up._scheme == 'file'
+        assert up._host == ''  # FIXME '' or None?
+        assert not up._match_subdomains
+        assert not up._match_all
+        assert up._path == r'/foo-bar\*baz'
+
+    @pytest.mark.parametrize('url, expected', [
+        # We use - instead of ? so it doesn't get treated as query
+        (r"file:///foo-bar\hellobaz", True),
+        (r"file:///fooXbar\hellobaz", False),
+    ])
+    def test_urls(self, up, url, expected):
+        assert up.matches(QUrl(url)) == expected

From 2d43a1d2e7b62429fc4bd4bf45aabd51f9115592 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 16:42:41 +0100
Subject: [PATCH 450/574] urlmatch: Use None as default for host

---
 qutebrowser/utils/urlmatch.py     | 9 ++++++++-
 tests/unit/utils/test_urlmatch.py | 6 +++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index bd5f17fa5..76a72c32e 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -53,7 +53,7 @@ class UrlPattern:
                  Note that with Chromium, '*'/None only matches http/https and
                  not file/ftp. We deviate from that as per-URL settings aren't
                  security relevant.
-        _host: The host to match to, or None for any host. (FIXME true?)
+        _host: The host to match to, or None for any host.
         _path: The path to match to, or None for any path. (FIXME true?)
         _port: The port to match to as integer, or None for any port.
     """
@@ -139,6 +139,10 @@ class UrlPattern:
             host_parts = host_parts[1:]
             self._match_subdomains = True
 
+        if not host_parts:
+            self._host = None
+            return
+
         self._host = '.'.join(host_parts)
 
         if self._host.endswith('.*'):
@@ -184,6 +188,9 @@ class UrlPattern:
         # FIXME what about multiple dots?
         host = host.rstrip('.')
 
+        if self._host is None:
+            return True
+
         # If the hosts are exactly equal, we have a match.
         if host == self._host:
             return True
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index accbb691f..cc5f4006a 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -103,7 +103,7 @@ class TestMatchAllPagesForGivenScheme:
 
     def test_attrs(self, up):
         assert up._scheme == 'http'
-        assert up._host == ''  # FIXME '' or None?
+        assert up._host is None
         assert up._match_subdomains
         assert not up._match_all
         assert up._path == '/*'
@@ -127,7 +127,7 @@ class TestMatchAllDomains:
 
     def test_attrs(self, up):
         assert up._scheme == 'https'
-        assert up._host == ''  # FIXME '' or None?
+        assert up._host is None
         assert up._match_subdomains
         assert not up._match_all
         assert up._path == '/foo*'
@@ -175,7 +175,7 @@ class TestMatchGlobEscaping:
 
     def test_attrs(self, up):
         assert up._scheme == 'file'
-        assert up._host == ''  # FIXME '' or None?
+        assert up._host is None
         assert not up._match_subdomains
         assert not up._match_all
         assert up._path == r'/foo-bar\*baz'

From 978b90b5b15cb57da5c4581260548b7f238d4f4b Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 16:52:35 +0100
Subject: [PATCH 451/574] urlmatch: Implement correct IP matching

---
 qutebrowser/utils/urlmatch.py     |  6 +++---
 tests/unit/utils/test_urlmatch.py | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index 76a72c32e..5efa5cfb8 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -25,6 +25,7 @@ https://cs.chromium.org/chromium/src/extensions/common/url_pattern.cc
 https://cs.chromium.org/chromium/src/extensions/common/url_pattern.h
 """
 
+import ipaddress
 import fnmatch
 import contextlib
 import urllib.parse
@@ -205,11 +206,10 @@ class UrlPattern:
         if not self._match_subdomains:
             return False
 
-        # FIXME
         # We don't do subdomain matching against IP addresses, so we can give up now
         # if the test host is an IP address.
-        # if (test.HostIsIPAddress())
-        #   return false;
+        if not utils.raises(ValueError, ipaddress.ip_address, host):
+            return False
 
         # Check if the test host is a subdomain of our host.
         if len(host) <= (len(self._host) + 1):
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index cc5f4006a..624736a22 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -187,3 +187,27 @@ class TestMatchGlobEscaping:
     ])
     def test_urls(self, up, url, expected):
         assert up.matches(QUrl(url)) == expected
+
+
+class TestMatchIpAddresses:
+
+    @pytest.mark.parametrize('pattern, host, match_subdomains', [
+        ("http://127.0.0.1/*", "127.0.0.1", False),
+        ("http://*.0.0.1/*", "0.0.1", True),
+    ])
+    def test_attrs(self, pattern, host, match_subdomains):
+        up = urlmatch.UrlPattern(pattern)
+        assert up._scheme == 'http'
+        assert up._host == host
+        assert up._match_subdomains == match_subdomains
+        assert not up._match_all
+        assert up._path == '/*'
+
+    @pytest.mark.parametrize('pattern, expected', [
+        ("http://127.0.0.1/*", True),
+        # No subdomain matching is done with IPs
+        ("http://*.0.0.1/*", False),
+    ])
+    def test_urls(self, pattern, expected):
+        up = urlmatch.UrlPattern(pattern)
+        assert up.matches(QUrl("http://127.0.0.1")) == expected

From a8a9cdd81ee46f40689b96c9a804f729b01d9c20 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 17:03:47 +0100
Subject: [PATCH 452/574] urlmatch: Add more tests from Chromium

---
 tests/unit/utils/test_urlmatch.py | 47 +++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index 624736a22..4220876e9 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -25,6 +25,7 @@ https://cs.chromium.org/chromium/src/extensions/common/url_pattern_unittest.cc
 Currently not tested:
 - The match_effective_tld attribute as it doesn't exist yet.
 - Nested filesystem:// URLs as we don't have those.
+- Unicode matching because QUrl doesn't like those URLs.
 """
 
 import pytest
@@ -211,3 +212,49 @@ class TestMatchIpAddresses:
     def test_urls(self, pattern, expected):
         up = urlmatch.UrlPattern(pattern)
         assert up.matches(QUrl("http://127.0.0.1")) == expected
+
+
+class TestMatchChromeUrls:
+
+    @pytest.fixture
+    def up(self):
+        return urlmatch.UrlPattern("chrome://favicon/*")
+
+    def test_attrs(self, up):
+        assert up._scheme == 'chrome'
+        assert up._host == 'favicon'
+        assert not up._match_subdomains
+        assert not up._match_all
+        assert up._path == '/*'
+
+    @pytest.mark.parametrize('url, expected', [
+        ("chrome://favicon/http://google.com", True),
+        ("chrome://favicon/https://google.com", True),
+        ("chrome://history", False),
+    ])
+    def test_urls(self, up, url, expected):
+        assert up.matches(QUrl(url)) == expected
+
+
+class TestMatchAnything:
+
+    @pytest.fixture
+    def up(self):
+        return urlmatch.UrlPattern("*://*/*")
+
+    def test_attrs(self, up):
+        assert up._scheme is None
+        assert up._host is None
+        assert up._match_subdomains
+        assert not up._match_all
+        assert up._path == '/*'
+
+    @pytest.mark.parametrize('url, expected', [
+        ("http://127.0.0.1", True),
+        # We deviate from Chromium as we allow other schemes as well
+        ("chrome://favicon/http://google.com", True),
+        ("file:///foo/bar", True),
+        ("file://localhost/foo/bar", True),
+    ])
+    def test_urls(self, up, url, expected):
+        assert up.matches(QUrl(url)) == expected

From 8fd0690959652bbf0df972790f1de426f462f064 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 17:03:59 +0100
Subject: [PATCH 453/574] urlmatch: Fix handling of *:// as scheme

---
 qutebrowser/utils/urlmatch.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index 5efa5cfb8..c3fb5b599 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -113,8 +113,12 @@ class UrlPattern:
     def _init_scheme(self, parsed):
         if not parsed.scheme:
             raise ParseError("No scheme given")
-        if parsed.scheme not in self.SCHEMES:
+        elif parsed.scheme == 'any':
+            self._scheme = None
+            return
+        elif parsed.scheme not in self.SCHEMES:
             raise ParseError("Unknown scheme {}".format(parsed.scheme))
+
         self._scheme = parsed.scheme
 
     def _init_path(self, parsed):
@@ -172,7 +176,7 @@ class UrlPattern:
 
         allows_ports = {'https': True, 'http': True, 'ftp': True,
                         'file': False, 'chrome': False, 'qute': False,
-                        'about': False}
+                        'about': False, None: True}
         if not allows_ports[self._scheme] and self._port is not None:
             raise ParseError("Ports are unsupported with {} scheme".format(
                 self._scheme))

From 867f2a8e2b1f4a3e8151e84648899b76c9712fe6 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 17:10:53 +0100
Subject: [PATCH 454/574] urlmatch: Use None for match-all path

---
 qutebrowser/utils/urlmatch.py     | 8 ++++++--
 tests/unit/utils/test_urlmatch.py | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index c3fb5b599..b42e4249d 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -55,7 +55,7 @@ class UrlPattern:
                  not file/ftp. We deviate from that as per-URL settings aren't
                  security relevant.
         _host: The host to match to, or None for any host.
-        _path: The path to match to, or None for any path. (FIXME true?)
+        _path: The path to match to, or None for any path.
         _port: The port to match to as integer, or None for any port.
     """
 
@@ -124,7 +124,8 @@ class UrlPattern:
     def _init_path(self, parsed):
         if self._scheme == 'about' and not parsed.path.strip():
             raise ParseError("Pattern without path")
-        self._path = parsed.path
+
+        self._path = None if parsed.path == '/*' else parsed.path
 
     def _init_host(self, parsed):
         """Parse the host from the given URL.
@@ -228,6 +229,9 @@ class UrlPattern:
         return self._port is None or self._port == port
 
     def _matches_path(self, path):
+        if self._path is None:
+            return True
+
         # Match 'google.com' with 'google.com/'
         # FIXME use the no-copy approach Chromium has in URLPattern::MatchesPath
         # for performance?
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index 4220876e9..23ca58acc 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -107,7 +107,7 @@ class TestMatchAllPagesForGivenScheme:
         assert up._host is None
         assert up._match_subdomains
         assert not up._match_all
-        assert up._path == '/*'
+        assert up._path is None
 
     @pytest.mark.parametrize('url, expected', [
         ("http://google.com", True),
@@ -202,7 +202,7 @@ class TestMatchIpAddresses:
         assert up._host == host
         assert up._match_subdomains == match_subdomains
         assert not up._match_all
-        assert up._path == '/*'
+        assert up._path is None
 
     @pytest.mark.parametrize('pattern, expected', [
         ("http://127.0.0.1/*", True),
@@ -225,7 +225,7 @@ class TestMatchChromeUrls:
         assert up._host == 'favicon'
         assert not up._match_subdomains
         assert not up._match_all
-        assert up._path == '/*'
+        assert up._path is None
 
     @pytest.mark.parametrize('url, expected', [
         ("chrome://favicon/http://google.com", True),

From 28aadc4f96034465a0d33830bdff77c2f29705b5 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 17:11:24 +0100
Subject: [PATCH 455/574] urlmatch: Add tests for <all_urls>

---
 tests/unit/utils/test_urlmatch.py | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index 23ca58acc..2a33675ae 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -238,16 +238,24 @@ class TestMatchChromeUrls:
 
 class TestMatchAnything:
 
-    @pytest.fixture
-    def up(self):
-        return urlmatch.UrlPattern("*://*/*")
+    @pytest.fixture(params=['*://*/*', '<all_urls>'])
+    def up(self, request):
+        return urlmatch.UrlPattern(request.param)
 
-    def test_attrs(self, up):
+    def test_attrs_common(self, up):
         assert up._scheme is None
         assert up._host is None
+        assert up._path is None
+
+    def test_attrs_wildcard(self):
+        up = urlmatch.UrlPattern('*://*/*')
         assert up._match_subdomains
         assert not up._match_all
-        assert up._path == '/*'
+
+    def test_attrs_all(self):
+        up = urlmatch.UrlPattern('<all_urls>')
+        assert not up._match_subdomains
+        assert up._match_all
 
     @pytest.mark.parametrize('url, expected', [
         ("http://127.0.0.1", True),

From dae164abeeb3aedc9bda6bec2621140f3a6b5b4b Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 17:16:20 +0100
Subject: [PATCH 456/574] urlmatch: Get rid of scheme whitelist

There are more schemes like data: or javascript:, and we don't want to restrict
schemes anyways.
---
 qutebrowser/utils/urlmatch.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index b42e4249d..72d026ba9 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -42,9 +42,6 @@ class UrlPattern:
 
     """A Chromium-like URL matching pattern.
 
-    Class attributes:
-        SCHEMES: Schemes which are allowed in patterns.
-
     Attributes:
         _pattern: The given pattern as string.
         _match_all: Whether the pattern should match all URLs.
@@ -59,8 +56,6 @@ class UrlPattern:
         _port: The port to match to as integer, or None for any port.
     """
 
-    SCHEMES = ['https', 'http', 'ftp', 'file', 'chrome', 'qute', 'about']
-
     def __init__(self, pattern):
         # Make sure all attributes are initialized if we exit early.
         self._pattern = pattern
@@ -116,8 +111,6 @@ class UrlPattern:
         elif parsed.scheme == 'any':
             self._scheme = None
             return
-        elif parsed.scheme not in self.SCHEMES:
-            raise ParseError("Unknown scheme {}".format(parsed.scheme))
 
         self._scheme = parsed.scheme
 
@@ -186,8 +179,6 @@ class UrlPattern:
         return utils.get_repr(self, pattern=self._pattern, constructor=True)
 
     def _matches_scheme(self, scheme):
-        if scheme not in self.SCHEMES:
-            return False
         return self._scheme is None or self._scheme == scheme
 
     def _matches_host(self, host):

From 084d3de65b89fcf4941c8156d90ad35ea3ec0280 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 17:25:10 +0100
Subject: [PATCH 457/574] urlmatch: Add support for data: and javascript:

---
 qutebrowser/utils/urlmatch.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index 72d026ba9..92a122377 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -127,7 +127,7 @@ class UrlPattern:
         - http://:1234/ is not a valid URL because it has no host.
         """
         if parsed.hostname is None or not parsed.hostname.strip():
-            if self._scheme not in ['about', 'file']:
+            if self._scheme not in ['about', 'file', 'data', 'javascript']:
                 raise ParseError("Pattern without host")
             assert self._host is None
             return
@@ -170,7 +170,8 @@ class UrlPattern:
 
         allows_ports = {'https': True, 'http': True, 'ftp': True,
                         'file': False, 'chrome': False, 'qute': False,
-                        'about': False, None: True}
+                        'about': False, 'data': False, 'javascript': False,
+                        None: True}
         if not allows_ports[self._scheme] and self._port is not None:
             raise ParseError("Ports are unsupported with {} scheme".format(
                 self._scheme))

From 0a10a4f7518b5967b456708f48740672ee90b9a6 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 17:25:23 +0100
Subject: [PATCH 458/574] urlmatch: Add more tests for special schemes

---
 tests/unit/utils/test_urlmatch.py | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index 2a33675ae..5a7a03a86 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -257,12 +257,27 @@ class TestMatchAnything:
         assert not up._match_subdomains
         assert up._match_all
 
-    @pytest.mark.parametrize('url, expected', [
-        ("http://127.0.0.1", True),
+    @pytest.mark.parametrize('url', [
+        "http://127.0.0.1",
         # We deviate from Chromium as we allow other schemes as well
-        ("chrome://favicon/http://google.com", True),
-        ("file:///foo/bar", True),
-        ("file://localhost/foo/bar", True),
+        "chrome://favicon/http://google.com",
+        "file:///foo/bar",
+        "file://localhost/foo/bar",
+        "qute://version",
+        "about:blank",
+        "data:text/html;charset=utf-8,<html>asdf</html>",
     ])
-    def test_urls(self, up, url, expected):
-        assert up.matches(QUrl(url)) == expected
+    def test_urls(self, up, url):
+        assert up.matches(QUrl(url))
+
+
+@pytest.mark.parametrize('pattern, url, expected', [
+    ("about:*", "about:blank", True),
+    ("about:blank", "about:blank", True),
+    ("about:*", "about:version", True),
+    ("data:*", "data:monkey", True),
+    ("javascript:*", "javascript:atemyhomework", True),
+    ("data:*", "about:blank", False),
+])
+def test_special_schemes(pattern, url, expected):
+    assert urlmatch.UrlPattern(pattern).matches(QUrl(url)) == expected

From a2836ba945e059558f6569309e34a57976daae43 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 17:26:06 +0100
Subject: [PATCH 459/574] urlmatch: Make sure URLs are valid

---
 qutebrowser/utils/urlmatch.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index 92a122377..e49036339 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -30,7 +30,7 @@ import fnmatch
 import contextlib
 import urllib.parse
 
-from qutebrowser.utils import utils
+from qutebrowser.utils import utils, qtutils
 
 
 class ParseError(Exception):
@@ -236,6 +236,8 @@ class UrlPattern:
 
     def matches(self, qurl):
         """Check if the pattern matches the given QUrl."""
+        qtutils.ensure_valid(qurl)
+
         # FIXME do we need to check this early?
         if not self._matches_scheme(qurl.scheme()):
             return False

From 45cc1aaeb036a9010f04a56dc09e41ee12039b5c Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 17:42:24 +0100
Subject: [PATCH 460/574] urlmatch: Add tests for file://

---
 qutebrowser/utils/urlmatch.py     |  1 +
 tests/unit/utils/test_urlmatch.py | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index e49036339..2291fe9e3 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -99,6 +99,7 @@ class UrlPattern:
             pattern = 'any:' + pattern[2:]
 
         # Chromium handles file://foo like file:///foo
+        # FIXME This doesn't actually strip the hostname correctly.
         if (pattern.startswith('file://') and
                 not pattern.startswith('file:///')):
             pattern = 'file:///' + pattern[len("file://"):]
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index 5a7a03a86..7b0e754f3 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -281,3 +281,33 @@ class TestMatchAnything:
 ])
 def test_special_schemes(pattern, url, expected):
     assert urlmatch.UrlPattern(pattern).matches(QUrl(url)) == expected
+
+
+class TestFileScheme:
+
+    @pytest.fixture(params=[
+        'file:///foo*',
+        'file://foo*',
+        # FIXME This doesn't pass all tests
+        pytest.param('file://localhost/foo*', marks=pytest.mark.skip(
+            reason="We're not handling this correctly in all cases"))
+    ])
+    def up(self, request):
+        return urlmatch.UrlPattern(request.param)
+
+    def test_attrs(self, up):
+        assert up._scheme == 'file'
+        assert up._host is None
+        assert not up._match_subdomains
+        assert not up._match_all
+        assert up._path == '/foo*'
+
+    @pytest.mark.parametrize('url, expected', [
+        ("file://foo", False),
+        ("file://foobar", False),
+        ("file:///foo", True),
+        ("file:///foobar", True),
+        ("file://localhost/foo", True),
+    ])
+    def test_urls(self, up, url, expected):
+        assert up.matches(QUrl(url)) == expected

From 33b7c4bdd0f5a9a97a0e2dcdfbf8a24ae859de1a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 17:51:50 +0100
Subject: [PATCH 461/574] urlmatch: Fix and test port handling

---
 qutebrowser/utils/urlmatch.py     | 18 +++++++-----
 tests/unit/utils/test_urlmatch.py | 46 +++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index 2291fe9e3..390ba733f 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -42,6 +42,9 @@ class UrlPattern:
 
     """A Chromium-like URL matching pattern.
 
+    Class attributes:
+        DEFAULT_PORTS: The default ports used for schemes which support ports.
+
     Attributes:
         _pattern: The given pattern as string.
         _match_all: Whether the pattern should match all URLs.
@@ -56,6 +59,8 @@ class UrlPattern:
         _port: The port to match to as integer, or None for any port.
     """
 
+    DEFAULT_PORTS = {'https': 443, 'http': 80, 'ftp': 21}
+
     def __init__(self, pattern):
         # Make sure all attributes are initialized if we exit early.
         self._pattern = pattern
@@ -169,11 +174,8 @@ class UrlPattern:
             except ValueError:
                 raise ParseError("Invalid port")
 
-        allows_ports = {'https': True, 'http': True, 'ftp': True,
-                        'file': False, 'chrome': False, 'qute': False,
-                        'about': False, 'data': False, 'javascript': False,
-                        None: True}
-        if not allows_ports[self._scheme] and self._port is not None:
+        if (self._scheme not in list(self.DEFAULT_PORTS) + [None] and
+                self._port is not None):
             raise ParseError("Ports are unsupported with {} scheme".format(
                 self._scheme))
 
@@ -218,7 +220,9 @@ class UrlPattern:
 
         return host[len(host) - len(self._host) - 1] == '.'
 
-    def _matches_port(self, port):
+    def _matches_port(self, scheme, port):
+        if port == -1 and scheme in self.DEFAULT_PORTS:
+            port = self.DEFAULT_PORTS[scheme]
         return self._port is None or self._port == port
 
     def _matches_path(self, path):
@@ -249,7 +253,7 @@ class UrlPattern:
         # FIXME ignore for file:// like Chromium?
         if not self._matches_host(qurl.host()):
             return False
-        if not self._matches_port(qurl.port()):
+        if not self._matches_port(qurl.scheme(), qurl.port()):
             return False
         if not self._matches_path(qurl.path()):
             return False
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index 7b0e754f3..b6f550bc8 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -311,3 +311,49 @@ class TestFileScheme:
     ])
     def test_urls(self, up, url, expected):
         assert up.matches(QUrl(url)) == expected
+
+
+class TestMatchSpecificPort:
+
+    @pytest.fixture
+    def up(self):
+        return urlmatch.UrlPattern("http://www.example.com:80/foo")
+
+    def test_attrs(self, up):
+        assert up._scheme == 'http'
+        assert up._host == 'www.example.com'
+        assert not up._match_subdomains
+        assert not up._match_all
+        assert up._path == '/foo'
+        assert up._port == 80
+
+    @pytest.mark.parametrize('url, expected', [
+        ("http://www.example.com:80/foo", True),
+        ("http://www.example.com/foo", True),
+        ("http://www.example.com:8080/foo", False),
+    ])
+    def test_urls(self, up, url, expected):
+        assert up.matches(QUrl(url)) == expected
+
+
+class TestExplicitPortWildcard:
+
+    @pytest.fixture
+    def up(self):
+        return urlmatch.UrlPattern("http://www.example.com:*/foo")
+
+    def test_attrs(self, up):
+        assert up._scheme == 'http'
+        assert up._host == 'www.example.com'
+        assert not up._match_subdomains
+        assert not up._match_all
+        assert up._path == '/foo'
+        assert up._port is None
+
+    @pytest.mark.parametrize('url, expected', [
+        ("http://www.example.com:80/foo", True),
+        ("http://www.example.com/foo", True),
+        ("http://www.example.com:8080/foo", True),
+    ])
+    def test_urls(self, up, url, expected):
+        assert up.matches(QUrl(url)) == expected

From e161458f917af520f6746da5509e4d75cfb772f3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 18:07:06 +0100
Subject: [PATCH 462/574] urlmatch: Add test cases for oddballs

---
 tests/unit/utils/test_urlmatch.py | 38 +++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index b6f550bc8..6a99e164f 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -26,6 +26,7 @@ Currently not tested:
 - The match_effective_tld attribute as it doesn't exist yet.
 - Nested filesystem:// URLs as we don't have those.
 - Unicode matching because QUrl doesn't like those URLs.
+- Any other features we don't need, such as .GetAsString() or set operations.
 """
 
 import pytest
@@ -357,3 +358,40 @@ class TestExplicitPortWildcard:
     ])
     def test_urls(self, up, url, expected):
         assert up.matches(QUrl(url)) == expected
+
+
+def test_ignore_missing_slashes():
+    pattern1 = urlmatch.UrlPattern("http://www.example.com/example")
+    pattern2 = urlmatch.UrlPattern("http://www.example.com/example/*")
+    url1 = QUrl('http://www.example.com/example')
+    url2 = QUrl('http://www.example.com/example/')
+
+    # Same patterns should match same URLs.
+    assert pattern1.matches(url1)
+    assert pattern2.matches(url1)
+    # The not terminated path should match the terminated pattern.
+    assert pattern2.matches(url1)
+    # The terminated path however should not match the unterminated pattern.
+    assert not pattern1.matches(url2)
+
+
+@pytest.mark.parametrize('pattern', ['*://example.com/*', '*://example.com./*'])
+@pytest.mark.parametrize('url', ['http://example.com/', 'http://example.com./'])
+def test_trailing_dot_domain(pattern, url):
+    """Both patterns should match trailing dot and non trailing dot domains.
+
+    More information about this not obvious behaviour can be found in [1].
+
+    RFC 1738 [2] specifies clearly that the <host> part of a URL is supposed to
+    contain a fully qualified domain name:
+
+    3.1. Common Internet Scheme Syntax
+         //<user>:<password>@<host>:<port>/<url-path>
+
+     host
+         The fully qualified domain name of a network host
+
+    [1] http://www.dns-sd.org./TrailingDotsInDomainNames.html
+    [2] http://www.ietf.org/rfc/rfc1738.txt
+    """
+    assert urlmatch.UrlPattern(pattern).matches(QUrl(url))

From 5627a632655a04a81f364aca987b509dac996503 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 18:10:11 +0100
Subject: [PATCH 463/574] urlmatch: Fix lint

---
 qutebrowser/utils/urlmatch.py     | 15 +++++++--------
 tests/unit/utils/test_urlmatch.py |  6 ++++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index 390ba733f..5a67d3ad1 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -27,7 +27,6 @@ https://cs.chromium.org/chromium/src/extensions/common/url_pattern.h
 
 import ipaddress
 import fnmatch
-import contextlib
 import urllib.parse
 
 from qutebrowser.utils import utils, qtutils
@@ -196,9 +195,9 @@ class UrlPattern:
         if host == self._host:
             return True
 
-        # If we're matching subdomains, and we have no host in the match pattern,
-        # that means that we're matching all hosts, which means we have a match no
-        # matter what the test host is.
+        # If we're matching subdomains, and we have no host in the match
+        # pattern, that means that we're matching all hosts, which means we
+        # have a match no matter what the test host is.
         if self._match_subdomains and not self._host:
             return True
 
@@ -206,8 +205,8 @@ class UrlPattern:
         if not self._match_subdomains:
             return False
 
-        # We don't do subdomain matching against IP addresses, so we can give up now
-        # if the test host is an IP address.
+        # We don't do subdomain matching against IP addresses, so we can give
+        # up now if the test host is an IP address.
         if not utils.raises(ValueError, ipaddress.ip_address, host):
             return False
 
@@ -230,8 +229,8 @@ class UrlPattern:
             return True
 
         # Match 'google.com' with 'google.com/'
-        # FIXME use the no-copy approach Chromium has in URLPattern::MatchesPath
-        # for performance?
+        # FIXME use the no-copy approach Chromium has in
+        # URLPattern::MatchesPath for performance?
         if path + '/*' == self._path:
             return True
 
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index 6a99e164f..b7f8da70a 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -375,8 +375,10 @@ def test_ignore_missing_slashes():
     assert not pattern1.matches(url2)
 
 
-@pytest.mark.parametrize('pattern', ['*://example.com/*', '*://example.com./*'])
-@pytest.mark.parametrize('url', ['http://example.com/', 'http://example.com./'])
+@pytest.mark.parametrize('pattern', ['*://example.com/*',
+                                     '*://example.com./*'])
+@pytest.mark.parametrize('url', ['http://example.com/',
+                                 'http://example.com./'])
 def test_trailing_dot_domain(pattern, url):
     """Both patterns should match trailing dot and non trailing dot domains.
 

From 41b7ac27d72a0b0f2fb572be6db289a49a794de3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 18:11:42 +0100
Subject: [PATCH 464/574] urlmatch: Postpone checking scheme

---
 qutebrowser/utils/urlmatch.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index 5a67d3ad1..f15ab45fe 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -242,13 +242,11 @@ class UrlPattern:
         """Check if the pattern matches the given QUrl."""
         qtutils.ensure_valid(qurl)
 
-        # FIXME do we need to check this early?
-        if not self._matches_scheme(qurl.scheme()):
-            return False
-
         if self._match_all:
             return True
 
+        if not self._matches_scheme(qurl.scheme()):
+            return False
         # FIXME ignore for file:// like Chromium?
         if not self._matches_host(qurl.host()):
             return False

From 5f6c8435a48d8abe7c325debb22caf8d555cf606 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 18:40:01 +0100
Subject: [PATCH 465/574] urlmatch: Add initial benchmark/hypothesis test

---
 tests/unit/utils/test_urlmatch.py | 45 ++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index b7f8da70a..67c7ea452 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -29,8 +29,11 @@ Currently not tested:
 - Any other features we don't need, such as .GetAsString() or set operations.
 """
 
-import pytest
+import string
 
+import pytest
+import hypothesis
+import hypothesis.strategies as hst
 from PyQt5.QtCore import QUrl
 
 from qutebrowser.utils import urlmatch
@@ -397,3 +400,43 @@ def test_trailing_dot_domain(pattern, url):
     [2] http://www.ietf.org/rfc/rfc1738.txt
     """
     assert urlmatch.UrlPattern(pattern).matches(QUrl(url))
+
+
+def test_urlpattern_benchmark(benchmark):
+    url = QUrl('https://www.example.com/barfoobar')
+
+    def run():
+        up = urlmatch.UrlPattern('https://*.example.com/*foo*')
+        up.matches(url)
+
+    benchmark(run)
+
+
+URL_TEXT = hst.text(alphabet=string.ascii_letters)
+
+
+@hypothesis.given(pattern=hst.builds(
+    lambda *a: ''.join(a),
+    # Scheme
+    hst.one_of(hst.just('*'), hst.just('http'), hst.just('file')),
+    # Separator
+    hst.one_of(hst.just(':'), hst.just('://')),
+    # Host
+    hst.one_of(hst.just('*'),
+               hst.builds(lambda *a: ''.join(a), hst.just('*.'), URL_TEXT),
+               URL_TEXT),
+    # Port
+    hst.one_of(hst.just(''),
+               hst.builds(lambda *a: ''.join(a), hst.just(':'),
+                          hst.integers(min_value=0,
+                                       max_value=65535).map(str))),
+    # Path
+    hst.one_of(hst.just(''),
+               hst.builds(lambda *a: ''.join(a), hst.just('/'), URL_TEXT))
+))
+def test_urlpattern_hypothesis(pattern):
+    try:
+        up = urlmatch.UrlPattern(pattern)
+    except urlmatch.ParseError:
+        return
+    up.matches(QUrl('https://www.example.com/'))

From 174dd5dd9e49b3a55e588b6f460fd029a6074511 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 18:42:47 +0100
Subject: [PATCH 466/574] urlmatch: Remove performance FIXME

---
 qutebrowser/utils/urlmatch.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index f15ab45fe..4bf02a3b8 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -229,8 +229,6 @@ class UrlPattern:
             return True
 
         # Match 'google.com' with 'google.com/'
-        # FIXME use the no-copy approach Chromium has in
-        # URLPattern::MatchesPath for performance?
         if path + '/*' == self._path:
             return True
 

From 3ee765869dcaa87663884c971f1635bd0364a17b Mon Sep 17 00:00:00 2001
From: jnphilipp <mail@jnphilipp.org>
Date: Fri, 16 Feb 2018 14:22:08 +0100
Subject: [PATCH 467/574] Add tor_identity userscript.

---
 misc/userscripts/tor_identity | 42 +++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100755 misc/userscripts/tor_identity

diff --git a/misc/userscripts/tor_identity b/misc/userscripts/tor_identity
new file mode 100755
index 000000000..7eada7fbf
--- /dev/null
+++ b/misc/userscripts/tor_identity
@@ -0,0 +1,42 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Copyright 2018 jnphilipp <mail@jnphilipp.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+# Change your tor identity.
+#
+# Set a hotkey to launch this script, then:
+#   :bind ti spawn --userscript tor_identity PASSWORD
+#
+# Use the hotkey to change your tor identity, press 'ti' to change it.
+# https://stem.torproject.org/faq.html#how-do-i-request-a-new-identity-from-tor
+#
+
+import os
+import sys
+
+from stem import Signal
+from stem.control import Controller
+
+
+password = sys.argv[1]
+with Controller.from_port(port=9051) as controller:
+    controller.authenticate(password)
+    controller.signal(Signal.NEWNYM)
+    with open(os.environ['QUTE_FIFO'], 'w') as f:
+        f.write('message-info "Tor identity changed."')

From 6219119476d35b24be5a83dd8956947db2463c3a Mon Sep 17 00:00:00 2001
From: jnphilipp <mail@jnphilipp.org>
Date: Sat, 17 Feb 2018 09:48:39 +0100
Subject: [PATCH 468/574] Update output.

---
 misc/userscripts/tor_identity | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/misc/userscripts/tor_identity b/misc/userscripts/tor_identity
index 7eada7fbf..1b0e317ca 100755
--- a/misc/userscripts/tor_identity
+++ b/misc/userscripts/tor_identity
@@ -38,5 +38,8 @@ password = sys.argv[1]
 with Controller.from_port(port=9051) as controller:
     controller.authenticate(password)
     controller.signal(Signal.NEWNYM)
-    with open(os.environ['QUTE_FIFO'], 'w') as f:
-        f.write('message-info "Tor identity changed."')
+    if os.getenv('QUTE_FIFO'):
+        with open(os.environ['QUTE_FIFO'], 'w') as f:
+            f.write('message-info "Tor identity changed."')
+    else:
+        print('Tor identity changed.')

From 60a7e483afc26012888227e48c7706e2be35cd5c Mon Sep 17 00:00:00 2001
From: jnphilipp <mail@jnphilipp.org>
Date: Sat, 17 Feb 2018 19:57:44 +0100
Subject: [PATCH 469/574] Add import error message for stem.

---
 misc/userscripts/tor_identity | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/misc/userscripts/tor_identity b/misc/userscripts/tor_identity
index 1b0e317ca..93b6d4136 100755
--- a/misc/userscripts/tor_identity
+++ b/misc/userscripts/tor_identity
@@ -30,8 +30,15 @@
 import os
 import sys
 
-from stem import Signal
-from stem.control import Controller
+try:
+    from stem import Signal
+    from stem.control import Controller
+except ImportError:
+    if os.getenv('QUTE_FIFO'):
+        with open(os.environ['QUTE_FIFO'], 'w') as f:
+            f.write('message-error "Failed to import stem."')
+    else:
+        print('Failed to import stem.')
 
 
 password = sys.argv[1]

From bf72d81bd3c1993ce634e0ef979bb2f510d342da Mon Sep 17 00:00:00 2001
From: Ross Smith II <ross@smithii.com>
Date: Sun, 18 Feb 2018 00:07:02 -0800
Subject: [PATCH 470/574] Add scoop installer

See https://github.com/lukesampson/scoop-extras/pull/783
---
 doc/install.asciidoc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/install.asciidoc b/doc/install.asciidoc
index 4b1fd3f26..8916c1fdd 100644
--- a/doc/install.asciidoc
+++ b/doc/install.asciidoc
@@ -277,6 +277,11 @@ PS C:\> Install-Package qutebrowser
 ----
 C:\> choco install qutebrowser
 ----
+* Scoop's client
+----
+C:\> scoop bucket add extras
+C:\> scoop install qutebrowser
+----
 
 Manual install
 ~~~~~~~~~~~~~~

From c84402307713ee71b9b6e5335bb1a0e4834c6c45 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Sun, 18 Feb 2018 14:28:46 -0500
Subject: [PATCH 471/574] Use QUTE_DATA_DIR in readability userscript

---
 misc/userscripts/readability | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/misc/userscripts/readability b/misc/userscripts/readability
index a5425dbac..f6df5000f 100755
--- a/misc/userscripts/readability
+++ b/misc/userscripts/readability
@@ -13,7 +13,13 @@
 from __future__ import absolute_import
 import codecs, os
 
-tmpfile=os.path.expanduser('~/.local/share/qutebrowser/userscripts/readability.html')
+if 'QUTE_DATA_DIR' in os.environ:
+    tmpfile = os.path.join(os.environ['QUTE_DATA_DIR'],
+                           'userscripts/readability.html')
+else:
+    tmpfile = os.path.expanduser(
+        '~/.local/share/qutebrowser/userscripts/readability.html')
+
 if not os.path.exists(os.path.dirname(tmpfile)):
     os.makedirs(os.path.dirname(tmpfile))
 

From 84907d5a2e6da150311d802fa4eb9a3e96270b52 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Sun, 18 Feb 2018 14:49:09 -0500
Subject: [PATCH 472/574] Simplify readability logic using get defaults

:D
---
 misc/userscripts/readability | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/misc/userscripts/readability b/misc/userscripts/readability
index f6df5000f..d0ef43795 100755
--- a/misc/userscripts/readability
+++ b/misc/userscripts/readability
@@ -13,12 +13,10 @@
 from __future__ import absolute_import
 import codecs, os
 
-if 'QUTE_DATA_DIR' in os.environ:
-    tmpfile = os.path.join(os.environ['QUTE_DATA_DIR'],
-                           'userscripts/readability.html')
-else:
-    tmpfile = os.path.expanduser(
-        '~/.local/share/qutebrowser/userscripts/readability.html')
+tmpfile = os.path.join(
+    os.environ.get('QUTE_DATA_DIR',
+                   os.path.expanduser('~/.local/share/qutebrowser')),
+    'userscripts/readability.html')
 
 if not os.path.exists(os.path.dirname(tmpfile)):
     os.makedirs(os.path.dirname(tmpfile))

From 11579b351138a1f95afde7b976397d04087313e1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 19 Feb 2018 17:04:12 +0100
Subject: [PATCH 473/574] Update hypothesis from 3.44.26 to 3.45.2

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 6c3d69497..03fadb7fb 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -11,7 +11,7 @@ fields==5.0.0
 Flask==0.12.2
 glob2==0.6
 hunter==2.0.2
-hypothesis==3.44.26
+hypothesis==3.45.2
 itsdangerous==0.24
 # Jinja2==2.10
 Mako==1.0.7

From 8a0be83e1e2e63277c600a1f9dc544cbadc9ba09 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 19 Feb 2018 17:04:13 +0100
Subject: [PATCH 474/574] Update pytest-mock from 1.6.3 to 1.7.0

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 03fadb7fb..796ed8085 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -28,7 +28,7 @@ pytest-benchmark==3.1.1
 pytest-cov==2.5.1
 pytest-faulthandler==1.4.1
 pytest-instafail==0.3.0
-pytest-mock==1.6.3
+pytest-mock==1.7.0
 pytest-qt==2.3.1
 pytest-repeat==0.4.1
 pytest-rerunfailures==4.0

From d6ea9b1e474313b3f78ce5f451610c0e3eec1079 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 21:47:34 +0100
Subject: [PATCH 475/574] urlmatch: Add test for invalid IPv6 URL

---
 tests/unit/utils/test_urlmatch.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index 67c7ea452..e60885516 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -72,6 +72,9 @@ from qutebrowser.utils import urlmatch
     ("http://foo:123456/", "Invalid port"),
     ("http://foo:80:80/monkey", "Invalid port"),
     ("chrome://foo:1234/bar", "Ports are unsupported with chrome scheme"),
+
+    # Additional tests
+    ("http://[", "Invalid IPv6 URL"),
 ])
 def test_invalid_patterns(pattern, error):
     with pytest.raises(urlmatch.ParseError, match=error):

From eda15c53add1f7e49d436b1184e89f353bf5c529 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 21:50:08 +0100
Subject: [PATCH 476/574] urlmatch: Improve port error output

---
 qutebrowser/utils/urlmatch.py     | 12 +++++-------
 tests/unit/utils/test_urlmatch.py | 20 ++++++++++++++------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index 4bf02a3b8..faae3b091 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -87,10 +87,8 @@ class UrlPattern:
             parsed = urllib.parse.urlparse(pattern)
         except ValueError as e:
             raise ParseError(str(e))
-        # "Changed in version 3.6: Out-of-range port numbers now raise
-        # ValueError, instead of returning None."
-        if parsed is None:
-            raise ParseError("Failed to parse {}".format(pattern))
+
+        assert parsed is not None
 
         self._init_scheme(parsed)
         self._init_host(parsed)
@@ -166,12 +164,12 @@ class UrlPattern:
             # We can't access parsed.port as it tries to run int()
             self._port = None
         elif parsed.netloc.endswith(':'):
-            raise ParseError("Empty port")
+            raise ParseError("Invalid port: Port is empty")
         else:
             try:
                 self._port = parsed.port
-            except ValueError:
-                raise ParseError("Invalid port")
+            except ValueError as e:
+                raise ParseError("Invalid port: {}".format(e))
 
         if (self._scheme not in list(self.DEFAULT_PORTS) + [None] and
                 self._port is not None):
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index e60885516..67368933d 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -29,6 +29,8 @@ Currently not tested:
 - Any other features we don't need, such as .GetAsString() or set operations.
 """
 
+import re
+import sys
 import string
 
 import pytest
@@ -66,18 +68,24 @@ from qutebrowser.utils import urlmatch
     ("http://foo.*/bar", "TLD wildcards are not implemented yet"),
 
     # Chromium: PARSE_ERROR_INVALID_PORT
-    ("http://foo:/", "Empty port"),
-    ("http://*.foo:/", "Empty port"),
-    ("http://foo:com/", "Invalid port"),
-    ("http://foo:123456/", "Invalid port"),
-    ("http://foo:80:80/monkey", "Invalid port"),
+    ("http://foo:/", "Invalid port: Port is empty"),
+    ("http://*.foo:/", "Invalid port: Port is empty"),
+    ("http://foo:com/",
+     "Invalid port: invalid literal for int() with base 10: 'com'"),
+    pytest.param("http://foo:123456/",
+                 "Invalid port: Port out of range 0-65535",
+                 marks=pytest.mark.skipif(
+                     sys.hexversion < 0x03060000,
+                     reason="Doesn't show an error on Python 3.5")),
+    ("http://foo:80:80/monkey",
+     "Invalid port: invalid literal for int() with base 10: '80:80'"),
     ("chrome://foo:1234/bar", "Ports are unsupported with chrome scheme"),
 
     # Additional tests
     ("http://[", "Invalid IPv6 URL"),
 ])
 def test_invalid_patterns(pattern, error):
-    with pytest.raises(urlmatch.ParseError, match=error):
+    with pytest.raises(urlmatch.ParseError, match=re.escape(error)):
         urlmatch.UrlPattern(pattern)
 
 

From 7033af816ac1d2b1b865a68756ace5956ed274a8 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 21:57:31 +0100
Subject: [PATCH 477/574] urlmatch: Add equality testcases

---
 tests/unit/utils/test_urlmatch.py | 66 +++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index 67368933d..ce300391b 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -451,3 +451,69 @@ def test_urlpattern_hypothesis(pattern):
     except urlmatch.ParseError:
         return
     up.matches(QUrl('https://www.example.com/'))
+
+
+@pytest.mark.parametrize('text1, text2, equal', [
+    # schemes
+    ("http://en.google.com/blah/*/foo",
+     "https://en.google.com/blah/*/foo",
+     False),
+    ("https://en.google.com/blah/*/foo",
+     "https://en.google.com/blah/*/foo",
+     True),
+    ("https://en.google.com/blah/*/foo",
+     "ftp://en.google.com/blah/*/foo",
+     False),
+
+    # subdomains
+    ("https://en.google.com/blah/*/foo",
+     "https://fr.google.com/blah/*/foo",
+     False),
+    ("https://www.google.com/blah/*/foo",
+     "https://*.google.com/blah/*/foo",
+     False),
+    ("https://*.google.com/blah/*/foo",
+     "https://*.google.com/blah/*/foo",
+     True),
+
+    # domains
+    ("http://en.example.com/blah/*/foo",
+     "http://en.google.com/blah/*/foo",
+     False),
+
+    # ports
+    ("http://en.google.com:8000/blah/*/foo",
+     "http://en.google.com/blah/*/foo",
+     False),
+    ("http://fr.google.com:8000/blah/*/foo",
+     "http://fr.google.com:8000/blah/*/foo",
+     True),
+    ("http://en.google.com:8000/blah/*/foo",
+     "http://en.google.com:8080/blah/*/foo",
+     False),
+
+    # paths
+    ("http://en.google.com/blah/*/foo",
+     "http://en.google.com/blah/*",
+     False),
+    ("http://en.google.com/*",
+     "http://en.google.com/",
+     False),
+    ("http://en.google.com/*",
+     "http://en.google.com/*",
+     True),
+
+    # all_urls
+    ("<all_urls>",
+     "<all_urls>",
+     True),
+    ("<all_urls>",
+     "http://*/*",
+     False)
+])
+def test_equal(text1, text2, equal):
+    pat1 = urlmatch.UrlPattern(text1)
+    pat2 = urlmatch.UrlPattern(text2)
+
+    assert (pat1 == pat2) == equal
+    assert (hash(pat1) == hash(pat2)) == equal

From 894da598d6eee6784416b562e3968687b94abf10 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 22:03:25 +0100
Subject: [PATCH 478/574] urlmatch: Remove dead code

---
 qutebrowser/utils/urlmatch.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index faae3b091..04811cb4a 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -186,6 +186,12 @@ class UrlPattern:
         # FIXME what about multiple dots?
         host = host.rstrip('.')
 
+        # If we have no host in the match pattern, that means that we're
+        # matching all hosts, which means we have a match no matter what the
+        # test host is.
+        # Contrary to Chromium, we don't need to check for
+        # self._match_subdomains, as we want to return True here for e.g.
+        # file:// as well.
         if self._host is None:
             return True
 
@@ -193,12 +199,6 @@ class UrlPattern:
         if host == self._host:
             return True
 
-        # If we're matching subdomains, and we have no host in the match
-        # pattern, that means that we're matching all hosts, which means we
-        # have a match no matter what the test host is.
-        if self._match_subdomains and not self._host:
-            return True
-
         # Otherwise, we can only match if our match pattern matches subdomains.
         if not self._match_subdomains:
             return False

From 4ed07d606297424e0e3f78baa480fcf3cc04bf78 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 21:28:05 +0100
Subject: [PATCH 479/574] Initial implementation of per-URL setting storage

---
 qutebrowser/config/config.py         | 93 +++++++++++++++++++++-------
 qutebrowser/config/configcommands.py | 43 +++++++++----
 qutebrowser/config/configfiles.py    | 63 ++++++++++++++-----
 qutebrowser/utils/urlmatch.py        | 11 ++++
 4 files changed, 161 insertions(+), 49 deletions(-)

diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index f30acb8ca..ec6a36176 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -23,6 +23,7 @@ import copy
 import contextlib
 import functools
 
+import attr
 from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject
 
 from qutebrowser.config import configdata, configexc
@@ -225,12 +226,25 @@ class KeyConfig:
         self._config.update_mutables(save_yaml=save_yaml)
 
 
+@attr.s
+class PerUrlSettings:
+
+    """A simple container with an URL pattern and settings for it."""
+
+    pattern = attr.ib()
+    values = attr.ib(default=attr.Factory(dict))
+
+
 class Config(QObject):
 
     """Main config object.
 
     Attributes:
         _values: A dict mapping setting names to their values.
+        _per_url_values: A mapping from UrlPattern objects to PerUrlSetting
+                         instances. Note that dict lookup is currently only
+                         useful for finding the pattern when adding values, not
+                         for getting values.
         _mutables: A dictionary of mutable objects to be checked for changes.
         _yaml: A YamlConfig object or None.
 
@@ -244,13 +258,18 @@ class Config(QObject):
         super().__init__(parent)
         self.changed.connect(_render_stylesheet.cache_clear)
         self._values = {}
+        self._per_url_values = {}
         self._mutables = {}
         self._yaml = yaml_config
 
     def __iter__(self):
-        """Iterate over Option, value tuples."""
+        """Iterate over UrlPattern, Option, value tuples."""
         for name, value in sorted(self._values.items()):
-            yield (self.get_opt(name), value)
+            yield (None, self.get_opt(name), value)
+
+        for pattern, options in sorted(self._per_url_values.items()):
+            for name, value in sorted(options.values.items()):
+                yield (pattern, self.get_opt(name), value)
 
     def init_save_manager(self, save_manager):
         """Make sure the config gets saved properly.
@@ -260,14 +279,31 @@ class Config(QObject):
         """
         self._yaml.init_save_manager(save_manager)
 
-    def _set_value(self, opt, value):
+    def _get_values(self, pattern=None, create=False):
+        """Get the appropriate _values instance for the given pattern.
+
+        With create=True, create a new one instead of returning an empty dict.
+        """
+        if pattern is None:
+            return self._values
+        elif pattern in self._per_url_values:
+            return self._per_url_values[pattern].values
+        elif create:
+            settings = PerUrlSettings(pattern)
+            self._per_url_values[pattern] = settings
+            return settings.values
+        else:
+            return {}
+
+    def _set_value(self, opt, value, pattern=None):
         """Set the given option to the given value."""
         if not isinstance(objects.backend, objects.NoBackend):
             if objects.backend not in opt.backends:
                 raise configexc.BackendError(opt.name, objects.backend)
 
         opt.typ.to_py(value)  # for validation
-        self._values[opt.name] = opt.typ.from_obj(value)
+        values = self._get_values(pattern, create=True)
+        values[opt.name] = opt.typ.from_obj(value)
 
         self.changed.emit(opt.name)
         log.config.debug("Config option changed: {} = {}".format(
@@ -276,8 +312,9 @@ class Config(QObject):
     def read_yaml(self):
         """Read the YAML settings from self._yaml."""
         self._yaml.load()
-        for name, value in self._yaml:
-            self._set_value(self.get_opt(name), value)
+        # FIXME:conf implement in self._yaml
+        for pattern, name, value in self._yaml:
+            self._set_value(self.get_opt(name), value, pattern=pattern)
 
     def get_opt(self, name):
         """Get a configdata.Option object for the given setting."""
@@ -290,16 +327,18 @@ class Config(QObject):
                 name, deleted=deleted, renamed=renamed)
             raise exception from None
 
-    def get(self, name):
+    def get(self, name, pattern=None):
         """Get the given setting converted for Python code."""
         opt = self.get_opt(name)
-        obj = self.get_obj(name, mutable=False)
+        obj = self.get_obj(name, mutable=False, pattern=pattern)
         return opt.typ.to_py(obj)
 
-    def get_obj(self, name, *, mutable=True):
+    def get_obj(self, name, *, mutable=True, pattern=None):
         """Get the given setting as object (for YAML/config.py).
 
         If mutable=True is set, watch the returned object for mutations.
+        If a pattern is given, get the per-domain setting for that pattern (if
+        any).
         """
         opt = self.get_opt(name)
         obj = None
@@ -311,7 +350,8 @@ class Config(QObject):
         # Otherwise, we return a copy of the value stored internally, so the
         # internal value can never be changed by mutating the object returned.
         else:
-            obj = copy.deepcopy(self._values.get(name, opt.default))
+            values = self._get_values(pattern)
+            obj = copy.deepcopy(values.get(name, opt.default))
             # Then we watch the returned object for changes.
             if isinstance(obj, (dict, list)):
                 if mutable:
@@ -321,22 +361,23 @@ class Config(QObject):
                 assert obj.__hash__ is not None, obj
         return obj
 
-    def get_str(self, name):
+    def get_str(self, name, *, pattern=None):
         """Get the given setting as string."""
         opt = self.get_opt(name)
-        value = self._values.get(name, opt.default)
+        values = self._get_values(pattern)
+        value = values.get(name, opt.default)
         return opt.typ.to_str(value)
 
-    def set_obj(self, name, value, *, save_yaml=False):
+    def set_obj(self, name, value, *, pattern=None, save_yaml=False):
         """Set the given setting from a YAML/config.py object.
 
         If save_yaml=True is given, store the new value to YAML.
         """
-        self._set_value(self.get_opt(name), value)
+        self._set_value(self.get_opt(name), value, pattern=pattern)
         if save_yaml:
-            self._yaml[name] = value
+            self._yaml.set_obj(name, value, pattern=pattern)
 
-    def set_str(self, name, value, *, save_yaml=False):
+    def set_str(self, name, value, *, pattern=None, save_yaml=False):
         """Set the given setting from a string.
 
         If save_yaml=True is given, store the new value to YAML.
@@ -346,21 +387,22 @@ class Config(QObject):
         log.config.debug("Setting {} (type {}) to {!r} (converted from {!r})"
                          .format(name, opt.typ.__class__.__name__, converted,
                                  value))
-        self._set_value(opt, converted)
+        self._set_value(opt, converted, pattern=pattern)
         if save_yaml:
-            self._yaml[name] = converted
+            self._yaml.set_obj(name, converted, pattern=pattern)
 
-    def unset(self, name, *, save_yaml=False):
+    def unset(self, name, *, save_yaml=False, pattern=None):
         """Set the given setting back to its default."""
         self.get_opt(name)
+        values = self._get_values(pattern)
         try:
-            del self._values[name]
+            del values[name]
         except KeyError:
             return
         self.changed.emit(name)
 
         if save_yaml:
-            self._yaml.unset(name)
+            self._yaml.unset(name, pattern=pattern)
 
     def clear(self, *, save_yaml=False):
         """Clear all settings in the config.
@@ -368,6 +410,7 @@ class Config(QObject):
         If save_yaml=True is given, also remove all customization from the YAML
         file.
         """
+        # FIXME:conf support per-URL settings?
         old_values = self._values
         self._values = {}
         for name in old_values:
@@ -398,9 +441,13 @@ class Config(QObject):
             The changed config part as string.
         """
         lines = []
-        for opt, value in self:
+        for pattern, opt, value in self:
             str_value = opt.typ.to_str(value)
-            lines.append('{} = {}'.format(opt.name, str_value))
+            if pattern is None:
+                lines.append('{} = {}'.format(opt.name, str_value))
+            else:
+                lines.append('{}: {} = {}'.format(pattern, opt.name,
+                                                  str_value))
         if not lines:
             lines = ['<Default configuration>']
         return '\n'.join(lines)
diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py
index 8bc2a9ed8..3c4c9bdfc 100644
--- a/qutebrowser/config/configcommands.py
+++ b/qutebrowser/config/configcommands.py
@@ -26,7 +26,7 @@ from PyQt5.QtCore import QUrl
 
 from qutebrowser.commands import cmdexc, cmdutils
 from qutebrowser.completion.models import configmodel
-from qutebrowser.utils import objreg, utils, message, standarddir
+from qutebrowser.utils import objreg, utils, message, standarddir, urlmatch
 from qutebrowser.config import configtypes, configexc, configfiles, configdata
 from qutebrowser.misc import editor
 
@@ -47,17 +47,29 @@ class ConfigCommands:
         except configexc.Error as e:
             raise cmdexc.CommandError(str(e))
 
-    def _print_value(self, option):
+    def _parse_pattern(self, url):
+        """Parse an URL argument to a pattern."""
+        if url is None:
+            return None
+
+        try:
+            return urlmatch.UrlPattern(url)
+        except urlmatch.ParseError as e:
+            raise cmdexc.CommandError("Error while parsing {}: {}"
+                                      .format(url, str(e)))
+
+    def _print_value(self, option, pattern):
         """Print the value of the given option."""
         with self._handle_config_error():
-            value = self._config.get_str(option)
+            value = self._config.get_str(option, pattern=pattern)
         message.info("{} = {}".format(option, value))
 
     @cmdutils.register(instance='config-commands')
     @cmdutils.argument('option', completion=configmodel.option)
     @cmdutils.argument('value', completion=configmodel.value)
     @cmdutils.argument('win_id', win_id=True)
-    def set(self, win_id, option=None, value=None, temp=False, print_=False):
+    def set(self, win_id, option=None, value=None, temp=False, print_=False,
+            *, url=None):
         """Set an option.
 
         If the option name ends with '?', the value of the option is shown
@@ -69,6 +81,7 @@ class ConfigCommands:
         Args:
             option: The name of the option.
             value: The value to set.
+            url: The URL pattern to use.
             temp: Set value temporarily until qutebrowser is closed.
             print_: Print the value after setting.
         """
@@ -82,8 +95,10 @@ class ConfigCommands:
             raise cmdexc.CommandError("Toggling values was moved to the "
                                       ":config-cycle command")
 
+        pattern = self._parse_pattern(url)
+
         if option.endswith('?') and option != '?':
-            self._print_value(option[:-1])
+            self._print_value(option[:-1], pattern=pattern)
             return
 
         with self._handle_config_error():
@@ -91,10 +106,11 @@ class ConfigCommands:
                 raise cmdexc.CommandError("set: The following arguments "
                                           "are required: value")
             else:
-                self._config.set_str(option, value, save_yaml=not temp)
+                self._config.set_str(option, value, pattern=pattern,
+                                     save_yaml=not temp)
 
         if print_:
-            self._print_value(option)
+            self._print_value(option, pattern=pattern)
 
     @cmdutils.register(instance='config-commands', maxsplit=1,
                        no_cmd_split=True, no_replace_variables=True)
@@ -161,18 +177,22 @@ class ConfigCommands:
     @cmdutils.register(instance='config-commands', star_args_optional=True)
     @cmdutils.argument('option', completion=configmodel.option)
     @cmdutils.argument('values', completion=configmodel.value)
-    def config_cycle(self, option, *values, temp=False, print_=False):
+    def config_cycle(self, option, *values, url=None, temp=False, print_=False):
         """Cycle an option between multiple values.
 
         Args:
             option: The name of the option.
             values: The values to cycle through.
+            url: The URL pattern to use.
             temp: Set value temporarily until qutebrowser is closed.
             print_: Print the value after setting.
         """
+        pattern = self._parse_pattern(url)
+
         with self._handle_config_error():
             opt = self._config.get_opt(option)
-            old_value = self._config.get_obj(option, mutable=False)
+            old_value = self._config.get_obj(option, mutable=False,
+                                             pattern=pattern)
 
         if not values and isinstance(opt.typ, configtypes.Bool):
             values = ['true', 'false']
@@ -194,10 +214,11 @@ class ConfigCommands:
             value = values[0]
 
         with self._handle_config_error():
-            self._config.set_obj(option, value, save_yaml=not temp)
+            self._config.set_obj(option, value, pattern=pattern,
+                                 save_yaml=not temp)
 
         if print_:
-            self._print_value(option)
+            self._print_value(option, pattern=pattern)
 
     @cmdutils.register(instance='config-commands')
     @cmdutils.argument('option', completion=configmodel.customized_option)
diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 3dccc129f..9db4384f9 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -88,6 +88,7 @@ class YamlConfig(QObject):
         self._filename = os.path.join(standarddir.config(auto=True),
                                       'autoconfig.yml')
         self._values = {}
+        self._per_url_values = {}
         self._dirty = None
 
     def init_save_manager(self, save_manager):
@@ -98,18 +99,24 @@ class YamlConfig(QObject):
         """
         save_manager.add_saveable('yaml-config', self._save, self.changed)
 
-    def __getitem__(self, name):
-        return self._values[name]
-
-    def __setitem__(self, name, value):
-        self._values[name] = value
-        self._mark_changed()
-
-    def __contains__(self, name):
-        return name in self._values
-
     def __iter__(self):
-        return iter(sorted(self._values.items()))
+        for name, value in sorted(self._values.items()):
+            yield (None, name, value)
+
+        for pattern, options in sorted(self._per_url_values.items()):
+            for name, value in sorted(options.values.items()):
+                yield (pattern, name, value)
+
+    def _get_values(self, pattern=None):
+        """Get the appropriate _values instance for the given pattern."""
+        if pattern is None:
+            return self._values
+        elif pattern in self._per_url_values:
+            return self._per_url_values[pattern]
+        else:
+            values = {}
+            self._per_url_values[pattern] = values
+            return values
 
     def _mark_changed(self):
         """Mark the YAML config as changed."""
@@ -122,6 +129,9 @@ class YamlConfig(QObject):
             return
 
         data = {'config_version': self.VERSION, 'global': self._values}
+        for pattern, values in sorted(self._per_url_values.items()):
+            data[str(pattern)] = values
+
         with qtutils.savefile_open(self._filename) as f:
             f.write(textwrap.dedent("""
                 # DO NOT edit this file by hand, qutebrowser will overwrite it.
@@ -145,7 +155,7 @@ class YamlConfig(QObject):
             raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
 
         try:
-            global_obj = yaml_data['global']
+            global_obj = yaml_data.pop('global')
         except KeyError:
             desc = configexc.ConfigErrorDesc(
                 "While loading data",
@@ -156,6 +166,15 @@ class YamlConfig(QObject):
                                              "Toplevel object is not a dict")
             raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
 
+        # FIXME:conf test this
+        try:
+            yaml_data.pop('config_version')
+        except KeyError:
+            desc = configexc.ConfigErrorDesc(
+                "While loading data",
+                "Toplevel object does not contain 'config_version' key")
+            raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
+
         if not isinstance(global_obj, dict):
             desc = configexc.ConfigErrorDesc(
                 "While loading data",
@@ -163,6 +182,7 @@ class YamlConfig(QObject):
             raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
 
         self._values = global_obj
+        self._per_url_values = yaml_data
         self._dirty = False
 
         self._handle_migrations()
@@ -170,6 +190,7 @@ class YamlConfig(QObject):
 
     def _handle_migrations(self):
         """Migrate older configs to the newest format."""
+        # FIXME:conf handle per-URL settings
         # Simple renamed/deleted options
         for name in list(self._values):
             if name in configdata.MIGRATIONS.renamed:
@@ -196,23 +217,35 @@ class YamlConfig(QObject):
 
     def _validate(self):
         """Make sure all settings exist."""
-        unknown = set(self._values) - set(configdata.DATA)
+        unknown = []
+        for _pattern, name, value in self:
+            # FIXME:conf show pattern
+            if name not in configdata.DATA:
+                unknown.append(name)
+
         if unknown:
             errors = [configexc.ConfigErrorDesc("While loading options",
                                                 "Unknown option {}".format(e))
                       for e in sorted(unknown)]
             raise configexc.ConfigFileErrors('autoconfig.yml', errors)
 
-    def unset(self, name):
+    def set_obj(self, name, value, *, pattern=None):
+        """Set the given setting to the given value."""
+        values = self._get_values(pattern)
+        values[name] = value
+
+    def unset(self, name, *, pattern=None):
         """Remove the given option name if it's configured."""
+        values = self._get_values(pattern)
         try:
-            del self._values[name]
+            del values[name]
         except KeyError:
             return
         self._mark_changed()
 
     def clear(self):
         """Clear all values from the YAML file."""
+        # FIXME:conf per-URL support?
         self._values = []
         self._mark_changed()
 
diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index 04811cb4a..446f53bb2 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -95,6 +95,17 @@ class UrlPattern:
         self._init_path(parsed)
         self._init_port(parsed)
 
+    def _to_tuple(self):
+        """Get a pattern with information used for __eq__/__hash__."""
+        return (self._match_all, self._match_subdomains, self._scheme,
+                self._host, self._path, self._port)
+
+    def __hash__(self):
+        return hash(self._to_tuple())
+
+    def __eq__(self, other):
+        return self._to_tuple() == other._to_tuple()
+
     def _fixup_pattern(self, pattern):
         """Make sure the given pattern is parseable by urllib.parse."""
         if pattern.startswith('*:'):  # Any scheme, but *:// is unparseable

From 5e50824042b5a60c47ef3f70aaf2f7d5b1456967 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 15 Feb 2018 22:54:22 +0100
Subject: [PATCH 480/574] Broken per-URL proof-of-concept

---
 .../browser/webengine/webenginesettings.py    |  4 ++
 qutebrowser/browser/webengine/webenginetab.py |  3 +
 qutebrowser/browser/webkit/webkitsettings.py  |  4 ++
 qutebrowser/browser/webkit/webkittab.py       |  3 +
 qutebrowser/config/config.py                  | 56 ++++++++++++++++++-
 qutebrowser/config/websettings.py             |  7 ++-
 6 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
index 607499401..cf734d78b 100644
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -298,6 +298,10 @@ def init(args):
     config.instance.changed.connect(_update_settings)
 
 
+def update_for_tab(tab, url):
+    websettings.update_mappings(MAPPINGS, option, url, tab.settings())
+
+
 def shutdown():
     # FIXME:qtwebengine do we need to do something for a clean shutdown here?
     pass
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index ed6697f03..197fa03bd 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -906,5 +906,8 @@ class WebEngineTab(browsertab.AbstractTab):
             page.loadFinished.connect(self._restore_zoom)
             page.loadFinished.connect(self._on_load_finished)
 
+        self.on_url_changed.connect(
+            functools.partial(webenginesettings.update_for_tab, self))
+
     def event_target(self):
         return self._widget.focusProxy()
diff --git a/qutebrowser/browser/webkit/webkitsettings.py b/qutebrowser/browser/webkit/webkitsettings.py
index ee01c40db..4b51177bb 100644
--- a/qutebrowser/browser/webkit/webkitsettings.py
+++ b/qutebrowser/browser/webkit/webkitsettings.py
@@ -118,6 +118,10 @@ def _update_settings(option):
     websettings.update_mappings(MAPPINGS, option)
 
 
+def update_for_tab(tab, url, option):
+    websettings.update_mappings(MAPPINGS, option, url, tab.settings())
+
+
 def init(_args):
     """Initialize the global QWebSettings."""
     cache_path = standarddir.cache()
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 9395630db..414b0f16a 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -780,5 +780,8 @@ class WebKitTab(browsertab.AbstractTab):
         frame.contentsSizeChanged.connect(self._on_contents_size_changed)
         frame.initialLayoutCompleted.connect(self._on_history_trigger)
 
+        self.on_url_changed.connect(
+            functools.partial(webkitsettings.update_for_tab, self))
+
     def event_target(self):
         return self._widget
diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index ec6a36176..af0fe28a7 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -38,6 +38,9 @@ key_instance = None
 # Keeping track of all change filters to validate them later.
 change_filters = []
 
+# Sentinel
+UNSET = object()
+
 
 class change_filter:  # noqa: N801,N806 pylint: disable=invalid-name
 
@@ -279,7 +282,7 @@ class Config(QObject):
         """
         self._yaml.init_save_manager(save_manager)
 
-    def _get_values(self, pattern=None, create=False):
+    def _get_values(self, pattern=None, *, create=False):
         """Get the appropriate _values instance for the given pattern.
 
         With create=True, create a new one instead of returning an empty dict.
@@ -295,6 +298,24 @@ class Config(QObject):
         else:
             return {}
 
+    def _get_values_for_url(self, url):
+        """Get a temporary values container which merges all matching values.
+
+        Note that this does *not* include global values.
+
+        Currently, this iterates linearly over all patterns. This could probably
+        be optimized by storing patterns based on their scheme/host/port and
+        then searching all possible matches in a dict before doing a full match.
+        """
+        # FIXME We could avoid the copy if there's no per-url match.
+        # values = self._values.copy()
+        values = {}
+        # FIXME:conf what order?
+        for options in self._per_url_values.values():
+            if options.pattern.matches(url):
+                values.update(options.values)
+        return values
+
     def _set_value(self, opt, value, pattern=None):
         """Set the given option to the given value."""
         if not isinstance(objects.backend, objects.NoBackend):
@@ -327,10 +348,10 @@ class Config(QObject):
                 name, deleted=deleted, renamed=renamed)
             raise exception from None
 
-    def get(self, name, pattern=None):
+    def get(self, name):
         """Get the given setting converted for Python code."""
         opt = self.get_opt(name)
-        obj = self.get_obj(name, mutable=False, pattern=pattern)
+        obj = self.get_obj(name, mutable=False)
         return opt.typ.to_py(obj)
 
     def get_obj(self, name, *, mutable=True, pattern=None):
@@ -351,6 +372,7 @@ class Config(QObject):
         # internal value can never be changed by mutating the object returned.
         else:
             values = self._get_values(pattern)
+
             obj = copy.deepcopy(values.get(name, opt.default))
             # Then we watch the returned object for changes.
             if isinstance(obj, (dict, list)):
@@ -361,6 +383,34 @@ class Config(QObject):
                 assert obj.__hash__ is not None, obj
         return obj
 
+    def get_for_url(self, name, url, *, maybe_unset=True):
+        """Get the given per-url setting converted for Python code.
+
+        With maybe_unset=True, if the value isn't overridden for a given domain,
+        return UNSET.
+
+        With maybe_unset=False, return the global/default value instead.
+        """
+        opt = self.get_opt(name)
+        obj = self._get_obj_for_url(opt, url=url, maybe_unset=maybe_unset)
+        return opt.typ.to_py(obj)
+
+    def _get_obj_for_url(self, opt, url, *, maybe_unset=True):
+        """Get the given setting as object (for YAML/config.py).
+
+        With maybe_unset=True, if the value isn't overridden for a given domain,
+        return UNSET.
+
+        With maybe_unset=False, return the global/default value instead.
+        """
+        values = self._get_values_for_url(url)
+        if opt in values:
+            return values[opt]
+        elif maybe_unset:
+            return UNSET
+        else:
+            return self.get_obj(opt.name, mutable=False)
+
     def get_str(self, name, *, pattern=None):
         """Get the given setting as string."""
         opt = self.get_opt(name)
diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py
index fa8abb76f..1d29c28a5 100644
--- a/qutebrowser/config/websettings.py
+++ b/qutebrowser/config/websettings.py
@@ -198,14 +198,15 @@ def init_mappings(mappings):
         mapping.set(value)
 
 
-def update_mappings(mappings, option):
+def update_mappings(mappings, option, url=None, settings=None):
     """Update global settings when QWeb(Engine)Settings changed."""
     try:
         mapping = mappings[option]
     except KeyError:
         return
-    value = config.instance.get(option)
-    mapping.set(value)
+    value = config.instance.get(option, url=url)
+    # FIXME:conf handle settings != None with global/static setters
+    mapping.set(value, settings=settings)
 
 
 def init(args):

From 8551288efbc2af0637a8b1da91b718a57fceeff0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 16 Feb 2018 11:18:43 +0100
Subject: [PATCH 481/574] Start working on different per-URL storage

---
 qutebrowser/config/config.py      | 125 +++++++-----------------------
 qutebrowser/config/configfiles.py |  63 ++++++++-------
 2 files changed, 57 insertions(+), 131 deletions(-)

diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index af0fe28a7..27f927708 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -26,7 +26,7 @@ import functools
 import attr
 from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject
 
-from qutebrowser.config import configdata, configexc
+from qutebrowser.config import configdata, configexc, configutils
 from qutebrowser.utils import utils, log, jinja
 from qutebrowser.misc import objects
 
@@ -229,25 +229,12 @@ class KeyConfig:
         self._config.update_mutables(save_yaml=save_yaml)
 
 
-@attr.s
-class PerUrlSettings:
-
-    """A simple container with an URL pattern and settings for it."""
-
-    pattern = attr.ib()
-    values = attr.ib(default=attr.Factory(dict))
-
-
 class Config(QObject):
 
     """Main config object.
 
     Attributes:
-        _values: A dict mapping setting names to their values.
-        _per_url_values: A mapping from UrlPattern objects to PerUrlSetting
-                         instances. Note that dict lookup is currently only
-                         useful for finding the pattern when adding values, not
-                         for getting values.
+        _values: A dict mapping setting names to configutils.Values objects.
         _mutables: A dictionary of mutable objects to be checked for changes.
         _yaml: A YamlConfig object or None.
 
@@ -261,18 +248,14 @@ class Config(QObject):
         super().__init__(parent)
         self.changed.connect(_render_stylesheet.cache_clear)
         self._values = {}
-        self._per_url_values = {}
         self._mutables = {}
         self._yaml = yaml_config
 
     def __iter__(self):
-        """Iterate over UrlPattern, Option, value tuples."""
-        for name, value in sorted(self._values.items()):
-            yield (None, self.get_opt(name), value)
-
-        for pattern, options in sorted(self._per_url_values.items()):
-            for name, value in sorted(options.values.items()):
-                yield (pattern, self.get_opt(name), value)
+        """Iterate over Option, ScopedValue tuples."""
+        for name, values in sorted(self._values.items()):
+            for scoped in values:
+                yield self.get_opt(name), scoped
 
     def init_save_manager(self, save_manager):
         """Make sure the config gets saved properly.
@@ -282,40 +265,6 @@ class Config(QObject):
         """
         self._yaml.init_save_manager(save_manager)
 
-    def _get_values(self, pattern=None, *, create=False):
-        """Get the appropriate _values instance for the given pattern.
-
-        With create=True, create a new one instead of returning an empty dict.
-        """
-        if pattern is None:
-            return self._values
-        elif pattern in self._per_url_values:
-            return self._per_url_values[pattern].values
-        elif create:
-            settings = PerUrlSettings(pattern)
-            self._per_url_values[pattern] = settings
-            return settings.values
-        else:
-            return {}
-
-    def _get_values_for_url(self, url):
-        """Get a temporary values container which merges all matching values.
-
-        Note that this does *not* include global values.
-
-        Currently, this iterates linearly over all patterns. This could probably
-        be optimized by storing patterns based on their scheme/host/port and
-        then searching all possible matches in a dict before doing a full match.
-        """
-        # FIXME We could avoid the copy if there's no per-url match.
-        # values = self._values.copy()
-        values = {}
-        # FIXME:conf what order?
-        for options in self._per_url_values.values():
-            if options.pattern.matches(url):
-                values.update(options.values)
-        return values
-
     def _set_value(self, opt, value, pattern=None):
         """Set the given option to the given value."""
         if not isinstance(objects.backend, objects.NoBackend):
@@ -323,8 +272,8 @@ class Config(QObject):
                 raise configexc.BackendError(opt.name, objects.backend)
 
         opt.typ.to_py(value)  # for validation
-        values = self._get_values(pattern, create=True)
-        values[opt.name] = opt.typ.from_obj(value)
+        scoped = configutils.ScopedValue(opt.typ.from_obj(value), pattern)
+        self._values[opt.name].add(scoped)
 
         self.changed.emit(opt.name)
         log.config.debug("Config option changed: {} = {}".format(
@@ -348,20 +297,18 @@ class Config(QObject):
                 name, deleted=deleted, renamed=renamed)
             raise exception from None
 
-    def get(self, name):
+    def get(self, name, url=None):
         """Get the given setting converted for Python code."""
         opt = self.get_opt(name)
-        obj = self.get_obj(name, mutable=False)
+        obj = self.get_obj(name, mutable=False, url=url)
         return opt.typ.to_py(obj)
 
-    def get_obj(self, name, *, mutable=True, pattern=None):
+    def get_obj(self, name, *, mutable=True, url=None):
         """Get the given setting as object (for YAML/config.py).
 
         If mutable=True is set, watch the returned object for mutations.
-        If a pattern is given, get the per-domain setting for that pattern (if
-        any).
+        If a URL is given, return the value which should be used for that URL.
         """
-        opt = self.get_opt(name)
         obj = None
         # If we allow mutation, there is a chance that prior mutations already
         # entered the mutable dictionary and thus further copies are unneeded
@@ -371,9 +318,11 @@ class Config(QObject):
         # Otherwise, we return a copy of the value stored internally, so the
         # internal value can never be changed by mutating the object returned.
         else:
-            values = self._get_values(pattern)
-
-            obj = copy.deepcopy(values.get(name, opt.default))
+            if name in self._values:
+                value = self._values[name].get_any(url)
+            else:
+                value = self.get_opt(name).default
+            obj = copy.deepcopy(value)
             # Then we watch the returned object for changes.
             if isinstance(obj, (dict, list)):
                 if mutable:
@@ -383,39 +332,17 @@ class Config(QObject):
                 assert obj.__hash__ is not None, obj
         return obj
 
-    def get_for_url(self, name, url, *, maybe_unset=True):
-        """Get the given per-url setting converted for Python code.
-
-        With maybe_unset=True, if the value isn't overridden for a given domain,
-        return UNSET.
-
-        With maybe_unset=False, return the global/default value instead.
-        """
-        opt = self.get_opt(name)
-        obj = self._get_obj_for_url(opt, url=url, maybe_unset=maybe_unset)
-        return opt.typ.to_py(obj)
-
-    def _get_obj_for_url(self, opt, url, *, maybe_unset=True):
-        """Get the given setting as object (for YAML/config.py).
-
-        With maybe_unset=True, if the value isn't overridden for a given domain,
-        return UNSET.
-
-        With maybe_unset=False, return the global/default value instead.
-        """
-        values = self._get_values_for_url(url)
-        if opt in values:
-            return values[opt]
-        elif maybe_unset:
-            return UNSET
-        else:
-            return self.get_obj(opt.name, mutable=False)
-
     def get_str(self, name, *, pattern=None):
-        """Get the given setting as string."""
+        """Get the given setting as string.
+
+        If a pattern is given, get the setting for the given pattern or
+        configutils.UNSET.
+        """
         opt = self.get_opt(name)
-        values = self._get_values(pattern)
-        value = values.get(name, opt.default)
+        values = self._values[name]
+        value = values.get_for_pattern(pattern)
+        if value is configutils.UNSET:
+            return value
         return opt.typ.to_str(value)
 
     def set_obj(self, name, value, *, pattern=None, save_yaml=False):
diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 9db4384f9..84ab36c8e 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -32,7 +32,7 @@ import yaml
 from PyQt5.QtCore import pyqtSignal, QObject, QSettings
 
 import qutebrowser
-from qutebrowser.config import configexc, config, configdata
+from qutebrowser.config import configexc, config, configdata, configutils
 from qutebrowser.utils import standarddir, utils, qtutils, log
 
 
@@ -88,7 +88,6 @@ class YamlConfig(QObject):
         self._filename = os.path.join(standarddir.config(auto=True),
                                       'autoconfig.yml')
         self._values = {}
-        self._per_url_values = {}
         self._dirty = None
 
     def init_save_manager(self, save_manager):
@@ -100,23 +99,8 @@ class YamlConfig(QObject):
         save_manager.add_saveable('yaml-config', self._save, self.changed)
 
     def __iter__(self):
-        for name, value in sorted(self._values.items()):
-            yield (None, name, value)
-
-        for pattern, options in sorted(self._per_url_values.items()):
-            for name, value in sorted(options.values.items()):
-                yield (pattern, name, value)
-
-    def _get_values(self, pattern=None):
-        """Get the appropriate _values instance for the given pattern."""
-        if pattern is None:
-            return self._values
-        elif pattern in self._per_url_values:
-            return self._per_url_values[pattern]
-        else:
-            values = {}
-            self._per_url_values[pattern] = values
-            return values
+        for name, values in sorted(self._values.items()):
+            yield from values
 
     def _mark_changed(self):
         """Mark the YAML config as changed."""
@@ -129,7 +113,7 @@ class YamlConfig(QObject):
             return
 
         data = {'config_version': self.VERSION, 'global': self._values}
-        for pattern, values in sorted(self._per_url_values.items()):
+        for pattern, values in sorted(self._values.items()):
             data[str(pattern)] = values
 
         with qtutils.savefile_open(self._filename) as f:
@@ -155,18 +139,17 @@ class YamlConfig(QObject):
             raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
 
         try:
-            global_obj = yaml_data.pop('global')
+            settings_obj = yaml_data.pop('settings')
         except KeyError:
             desc = configexc.ConfigErrorDesc(
                 "While loading data",
-                "Toplevel object does not contain 'global' key")
+                "Toplevel object does not contain 'settings' key")
             raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
         except TypeError:
             desc = configexc.ConfigErrorDesc("While loading data",
                                              "Toplevel object is not a dict")
             raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
 
-        # FIXME:conf test this
         try:
             yaml_data.pop('config_version')
         except KeyError:
@@ -175,22 +158,38 @@ class YamlConfig(QObject):
                 "Toplevel object does not contain 'config_version' key")
             raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
 
-        if not isinstance(global_obj, dict):
-            desc = configexc.ConfigErrorDesc(
-                "While loading data",
-                "'global' object is not a dict")
-            raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
-
-        self._values = global_obj
-        self._per_url_values = yaml_data
+        self._load_settings_object(settings_obj)
         self._dirty = False
-
         self._handle_migrations()
         self._validate()
 
+    def _load_settings_obj(self, settings_obj):
+        """Load the settings from the settings: key."""
+        if not isinstance(settings_obj, dict):
+            desc = configexc.ConfigErrorDesc(
+                "While loading data",
+                "'settings' object is not a dict")
+            raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
+
+        # FIXME:conf test this
+        self._values = {}
+        for name, yaml_values in settings_obj.items():
+            values = configutils.Values(self._config.get_opt(name))
+            if 'global' in yaml_values:
+                scoped = configutils.ScopedValue(yaml_values.pop('global'))
+                values.add(scoped)
+
+            for pattern, value in yaml_values.items():
+                scoped = configutils.ScopedValue(value, pattern)
+                values.add(scoped)
+
+            self._values[name] = values
+
     def _handle_migrations(self):
         """Migrate older configs to the newest format."""
         # FIXME:conf handle per-URL settings
+        # FIXME:conf migrate from older format with global: key
+
         # Simple renamed/deleted options
         for name in list(self._values):
             if name in configdata.MIGRATIONS.renamed:

From d09afdf0ee60ff10b235e5e69a5adcf3e89f7787 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 18 Feb 2018 19:11:12 +0100
Subject: [PATCH 482/574] Refactor handling of mutables with url/pattern in
 Config

This also should not copy stuff coming from the config if it's not needed.
---
 qutebrowser/config/config.py | 67 +++++++++++++++++++++++++-----------
 1 file changed, 47 insertions(+), 20 deletions(-)

diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 27f927708..30f2003ac 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -233,6 +233,10 @@ class Config(QObject):
 
     """Main config object.
 
+    Class attributes:
+        MUTABLE_TYPES: Types returned from the config which could potentially be
+        mutated.
+
     Attributes:
         _values: A dict mapping setting names to configutils.Values objects.
         _mutables: A dictionary of mutable objects to be checked for changes.
@@ -242,6 +246,7 @@ class Config(QObject):
         changed: Emitted with the option name when an option changed.
     """
 
+    MUTABLE_TYPES = (dict, list)
     changed = pyqtSignal(str)
 
     def __init__(self, yaml_config, parent=None):
@@ -303,34 +308,56 @@ class Config(QObject):
         obj = self.get_obj(name, mutable=False, url=url)
         return opt.typ.to_py(obj)
 
-    def get_obj(self, name, *, mutable=True, url=None):
+    def _maybe_copy(self, value):
+        """Copy the value if it could potentially be mutated."""
+        if isinstance(value, self.MUTABLE_TYPES):
+            # For mutable objects, create a copy so we don't accidentally mutate
+            # the config's internal value.
+            return copy.deepcopy(value)
+        else:
+            # Shouldn't be mutable (and thus hashable)
+            assert value.__hash__ is not None, value
+            return value
+
+    def get_obj(self, name, *, url=None):
         """Get the given setting as object (for YAML/config.py).
 
-        If mutable=True is set, watch the returned object for mutations.
+        Note that the returned values are not watched for mutation.
         If a URL is given, return the value which should be used for that URL.
         """
-        obj = None
+        value = self._values[name].get_for_url(url)
+        return self._maybe_copy(value)
+
+    def get_obj_for_pattern(self, name, *, pattern):
+        """Get the given setting as object (for YAML/config.py).
+
+        This gets the overridden value for a given pattern, or configutils.UNSET
+        if no such override exists.
+        """
+        value = self._values[name].get_for_pattern(pattern, fallback=False)
+        return self._maybe_copy(value)
+
+    def get_mutable_obj(self, name, *, pattern=None):
+        """Get an object which can be mutated, e.g. in a config.py.
+
+        If a pattern is given, return the value for that pattern.
+        Note that it's impossible to get a mutable object for an URL as we
+        wouldn't know what pattern to apply.
+        """
         # If we allow mutation, there is a chance that prior mutations already
         # entered the mutable dictionary and thus further copies are unneeded
         # until update_mutables() is called
-        if name in self._mutables and mutable:
+        if name in self._mutables:
             _copy, obj = self._mutables[name]
-        # Otherwise, we return a copy of the value stored internally, so the
-        # internal value can never be changed by mutating the object returned.
-        else:
-            if name in self._values:
-                value = self._values[name].get_any(url)
-            else:
-                value = self.get_opt(name).default
-            obj = copy.deepcopy(value)
-            # Then we watch the returned object for changes.
-            if isinstance(obj, (dict, list)):
-                if mutable:
-                    self._mutables[name] = (copy.deepcopy(obj), obj)
-            else:
-                # Shouldn't be mutable (and thus hashable)
-                assert obj.__hash__ is not None, obj
-        return obj
+            return obj
+
+        value = self._values[name].get_for_pattern(pattern)
+
+        # Watch the returned object for changes if it's mutable.
+        if isinstance(value, self.MUTABLE_TYPES):
+            self._mutables[name] = (copy.deepcopy(value), value)
+
+        return self._maybe_copy(value)
 
     def get_str(self, name, *, pattern=None):
         """Get the given setting as string.

From 74a76761112bb41a143558652e3eb3c9a53262ec Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 18 Feb 2018 20:06:43 +0100
Subject: [PATCH 483/574] Fix issues with per-domain proof-of-concept

---
 .../browser/webengine/webenginesettings.py    |  2 +-
 qutebrowser/browser/webengine/webenginetab.py |  2 +-
 qutebrowser/browser/webkit/webkitsettings.py  |  4 +--
 qutebrowser/browser/webkit/webkittab.py       |  5 ++--
 qutebrowser/config/config.py                  | 23 +++++++++--------
 qutebrowser/config/configcommands.py          |  6 ++---
 qutebrowser/config/configfiles.py             | 25 ++++++++-----------
 qutebrowser/config/websettings.py             | 20 +++++++++++----
 8 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
index cf734d78b..18516c719 100644
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -299,7 +299,7 @@ def init(args):
 
 
 def update_for_tab(tab, url):
-    websettings.update_mappings(MAPPINGS, option, url, tab.settings())
+    websettings.update_for_tab(MAPPINGS, tab, url)
 
 
 def shutdown():
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 197fa03bd..4e91ebd72 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -906,7 +906,7 @@ class WebEngineTab(browsertab.AbstractTab):
             page.loadFinished.connect(self._restore_zoom)
             page.loadFinished.connect(self._on_load_finished)
 
-        self.on_url_changed.connect(
+        self.url_changed.connect(
             functools.partial(webenginesettings.update_for_tab, self))
 
     def event_target(self):
diff --git a/qutebrowser/browser/webkit/webkitsettings.py b/qutebrowser/browser/webkit/webkitsettings.py
index 4b51177bb..976432418 100644
--- a/qutebrowser/browser/webkit/webkitsettings.py
+++ b/qutebrowser/browser/webkit/webkitsettings.py
@@ -118,8 +118,8 @@ def _update_settings(option):
     websettings.update_mappings(MAPPINGS, option)
 
 
-def update_for_tab(tab, url, option):
-    websettings.update_mappings(MAPPINGS, option, url, tab.settings())
+def update_for_tab(tab, url):
+    websettings.update_for_tab(MAPPINGS, tab, url)
 
 
 def init(_args):
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 414b0f16a..41e2432b3 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -36,7 +36,8 @@ from PyQt5.QtWebKit import QWebSettings
 from PyQt5.QtPrintSupport import QPrinter
 
 from qutebrowser.browser import browsertab
-from qutebrowser.browser.webkit import webview, tabhistory, webkitelem
+from qutebrowser.browser.webkit import (webview, tabhistory, webkitelem,
+                                        webkitsettings)
 from qutebrowser.utils import qtutils, objreg, usertypes, utils, log, debug
 
 
@@ -780,7 +781,7 @@ class WebKitTab(browsertab.AbstractTab):
         frame.contentsSizeChanged.connect(self._on_contents_size_changed)
         frame.initialLayoutCompleted.connect(self._on_history_trigger)
 
-        self.on_url_changed.connect(
+        self.url_changed.connect(
             functools.partial(webkitsettings.update_for_tab, self))
 
     def event_target(self):
diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 30f2003ac..341ecba93 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -190,7 +190,7 @@ class KeyConfig:
         log.keyboard.vdebug("Adding binding {} -> {} in mode {}.".format(
             key, command, mode))
 
-        bindings = self._config.get_obj('bindings.commands')
+        bindings = self._config.get_mutable_obj('bindings.commands')
         if mode not in bindings:
             bindings[mode] = {}
         bindings[mode][key] = command
@@ -200,7 +200,7 @@ class KeyConfig:
         """Restore a default keybinding."""
         key = self._prepare(key, mode)
 
-        bindings_commands = self._config.get_obj('bindings.commands')
+        bindings_commands = self._config.get_mutable_obj('bindings.commands')
         try:
             del bindings_commands[mode][key]
         except KeyError:
@@ -212,7 +212,7 @@ class KeyConfig:
         """Unbind the given key in the given mode."""
         key = self._prepare(key, mode)
 
-        bindings_commands = self._config.get_obj('bindings.commands')
+        bindings_commands = self._config.get_mutable_obj('bindings.commands')
 
         if val.bindings.commands[mode].get(key, None) is not None:
             # In custom bindings -> remove it
@@ -252,15 +252,17 @@ class Config(QObject):
     def __init__(self, yaml_config, parent=None):
         super().__init__(parent)
         self.changed.connect(_render_stylesheet.cache_clear)
-        self._values = {}
         self._mutables = {}
         self._yaml = yaml_config
 
+        self._values = {}
+        for name, opt in configdata.DATA.items():
+            self._values[name] = configutils.Values(opt)
+
     def __iter__(self):
-        """Iterate over Option, ScopedValue tuples."""
+        """Iterate over Option, configutils.Values tuples."""
         for name, values in sorted(self._values.items()):
-            for scoped in values:
-                yield self.get_opt(name), scoped
+            yield self.get_opt(name), values
 
     def init_save_manager(self, save_manager):
         """Make sure the config gets saved properly.
@@ -277,8 +279,7 @@ class Config(QObject):
                 raise configexc.BackendError(opt.name, objects.backend)
 
         opt.typ.to_py(value)  # for validation
-        scoped = configutils.ScopedValue(opt.typ.from_obj(value), pattern)
-        self._values[opt.name].add(scoped)
+        self._values[opt.name].add(opt.typ.from_obj(value), pattern)
 
         self.changed.emit(opt.name)
         log.config.debug("Config option changed: {} = {}".format(
@@ -305,7 +306,7 @@ class Config(QObject):
     def get(self, name, url=None):
         """Get the given setting converted for Python code."""
         opt = self.get_opt(name)
-        obj = self.get_obj(name, mutable=False, url=url)
+        obj = self.get_obj(name, url=url)
         return opt.typ.to_py(obj)
 
     def _maybe_copy(self, value):
@@ -511,7 +512,7 @@ class ConfigContainer:
                 return self._config.get(name)
             else:
                 # access from config.py
-                return self._config.get_obj(name)
+                return self._config.get_mutable_obj(name)
 
     def __setattr__(self, attr, value):
         """Set the given option in the config."""
diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py
index 3c4c9bdfc..a527d47f1 100644
--- a/qutebrowser/config/configcommands.py
+++ b/qutebrowser/config/configcommands.py
@@ -191,8 +191,8 @@ class ConfigCommands:
 
         with self._handle_config_error():
             opt = self._config.get_opt(option)
-            old_value = self._config.get_obj(option, mutable=False,
-                                             pattern=pattern)
+            old_value = self._config.get_obj_for_pattern(option,
+                                                         pattern=pattern)
 
         if not values and isinstance(opt.typ, configtypes.Bool):
             values = ['true', 'false']
@@ -318,7 +318,7 @@ class ConfigCommands:
             commented = True
         else:
             options = list(self._config)
-            bindings = dict(self._config.get_obj('bindings.commands'))
+            bindings = dict(self._config.get_mutable_obj('bindings.commands'))
             commented = False
 
         writer = configfiles.ConfigPyWriter(options, bindings,
diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 84ab36c8e..8a7476ca9 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -87,9 +87,12 @@ class YamlConfig(QObject):
         super().__init__(parent)
         self._filename = os.path.join(standarddir.config(auto=True),
                                       'autoconfig.yml')
-        self._values = {}
         self._dirty = None
 
+        self._values = {}
+        for name, opt in configdata.DATA.items():
+            self._values[name] = configutils.Values(opt)
+
     def init_save_manager(self, save_manager):
         """Make sure the config gets saved properly.
 
@@ -163,7 +166,7 @@ class YamlConfig(QObject):
         self._handle_migrations()
         self._validate()
 
-    def _load_settings_obj(self, settings_obj):
+    def _load_settings_object(self, settings_obj):
         """Load the settings from the settings: key."""
         if not isinstance(settings_obj, dict):
             desc = configexc.ConfigErrorDesc(
@@ -172,16 +175,13 @@ class YamlConfig(QObject):
             raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
 
         # FIXME:conf test this
-        self._values = {}
         for name, yaml_values in settings_obj.items():
             values = configutils.Values(self._config.get_opt(name))
             if 'global' in yaml_values:
-                scoped = configutils.ScopedValue(yaml_values.pop('global'))
-                values.add(scoped)
+                values.add(yaml_values.pop('global'))
 
             for pattern, value in yaml_values.items():
-                scoped = configutils.ScopedValue(value, pattern)
-                values.add(scoped)
+                values.add(value, pattern)
 
             self._values[name] = values
 
@@ -230,16 +230,11 @@ class YamlConfig(QObject):
 
     def set_obj(self, name, value, *, pattern=None):
         """Set the given setting to the given value."""
-        values = self._get_values(pattern)
-        values[name] = value
+        self._values[name].add(value, pattern)
 
     def unset(self, name, *, pattern=None):
         """Remove the given option name if it's configured."""
-        values = self._get_values(pattern)
-        try:
-            del values[name]
-        except KeyError:
-            return
+        self._values[name].remove(pattern)
         self._mark_changed()
 
     def clear(self):
@@ -294,7 +289,7 @@ class ConfigAPI:
 
     def get(self, name):
         with self._handle_error('getting', name):
-            return self._config.get_obj(name)
+            return self._config.get_mutable_obj(name)
 
     def set(self, name, value):
         with self._handle_error('setting', name):
diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py
index 1d29c28a5..32520b324 100644
--- a/qutebrowser/config/websettings.py
+++ b/qutebrowser/config/websettings.py
@@ -24,7 +24,7 @@
 
 from PyQt5.QtGui import QFont
 
-from qutebrowser.config import config
+from qutebrowser.config import config, configutils
 from qutebrowser.utils import log, utils, debug, usertypes
 from qutebrowser.misc import objects
 
@@ -198,15 +198,25 @@ def init_mappings(mappings):
         mapping.set(value)
 
 
-def update_mappings(mappings, option, url=None, settings=None):
+def update_mappings(mappings, option):
     """Update global settings when QWeb(Engine)Settings changed."""
     try:
         mapping = mappings[option]
     except KeyError:
         return
-    value = config.instance.get(option, url=url)
-    # FIXME:conf handle settings != None with global/static setters
-    mapping.set(value, settings=settings)
+    value = config.instance.get(option)
+    mapping.set(value)
+
+
+def update_for_tab(mappings, tab, url):
+    """Update settings customized for the given tab."""
+    for opt, values in config.instance:
+        value = values.get_for_url(url, fallback=False)
+        if value is not configutils.UNSET and opt.name in mappings:
+            # FIXME:conf handle settings != None with global/static setters
+            mapping = mappings[opt.name]
+            # FIXME:conf have a proper API for this.
+            mapping.set(value, settings=tab._widget.settings())
 
 
 def init(args):

From 2a7998847fc70308399a26bf99f271eb4000be76 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 18 Feb 2018 20:30:38 +0100
Subject: [PATCH 484/574] Unset values properly

---
 qutebrowser/config/websettings.py | 33 ++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py
index 32520b324..2831af01e 100644
--- a/qutebrowser/config/websettings.py
+++ b/qutebrowser/config/websettings.py
@@ -93,6 +93,13 @@ class Base:
         """
         raise NotImplementedError
 
+    def unset(self, settings=None):
+        """Unset a customized setting.
+
+        Must be overridden by subclasses.
+        """
+        raise NotImplementedError
+
 
 class Attribute(Base):
 
@@ -118,6 +125,11 @@ class Attribute(Base):
             for attribute in self._attributes:
                 obj.setAttribute(attribute, value)
 
+    def unset(self, settings=None):
+        for obj in self._get_settings(settings):
+            for attribute in self._attributes:
+                obj.resetAttribute(attribute)
+
 
 class Setter(Base):
 
@@ -211,12 +223,23 @@ def update_mappings(mappings, option):
 def update_for_tab(mappings, tab, url):
     """Update settings customized for the given tab."""
     for opt, values in config.instance:
+        if opt.name not in mappings:
+            continue
+
+        # FIXME:conf handle settings != None with global/static setters
+        mapping = mappings[opt.name]
+
         value = values.get_for_url(url, fallback=False)
-        if value is not configutils.UNSET and opt.name in mappings:
-            # FIXME:conf handle settings != None with global/static setters
-            mapping = mappings[opt.name]
-            # FIXME:conf have a proper API for this.
-            mapping.set(value, settings=tab._widget.settings())
+        # FIXME:conf have a proper API for this.
+        settings = tab._widget.settings()
+
+        if value is configutils.UNSET:
+            try:
+                mapping.unset(settings=settings)
+            except NotImplementedError:
+                pass
+        else:
+            mapping.set(value, settings=settings)
 
 
 def init(args):

From 7c1fb1d2155bcd23a8a58f066f28a5b47978c4f9 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 04:24:40 +0100
Subject: [PATCH 485/574] Refactor acceptNavigationRequest handling to use
 signals

---
 qutebrowser/browser/browsertab.py             | 22 ++++++-
 qutebrowser/browser/webengine/webenginetab.py |  1 +
 qutebrowser/browser/webengine/webview.py      | 37 +++++++-----
 qutebrowser/browser/webkit/webkittab.py       | 22 ++++++-
 qutebrowser/browser/webkit/webpage.py         | 58 ++++++++-----------
 qutebrowser/browser/webkit/webview.py         |  4 +-
 qutebrowser/utils/usertypes.py                | 20 +++++++
 tests/end2end/features/hints.feature          |  6 +-
 tests/end2end/features/search.feature         |  2 +-
 9 files changed, 116 insertions(+), 56 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 6ed5afe52..5598a0904 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -30,7 +30,8 @@ from PyQt5.QtWidgets import QWidget, QApplication
 
 from qutebrowser.keyinput import modeman
 from qutebrowser.config import config
-from qutebrowser.utils import utils, objreg, usertypes, log, qtutils
+from qutebrowser.utils import (utils, objreg, usertypes, log, qtutils, urlutils,
+                               message)
 from qutebrowser.misc import miscwidgets, objects
 from qutebrowser.browser import mouse, hints
 
@@ -94,6 +95,8 @@ class TabData:
         keep_icon: Whether the (e.g. cloned) icon should not be cleared on page
                    load.
         inspector: The QWebInspector used for this webview.
+        open_target: Where to open the next link.
+                     Only used for QtWebKit.
         override_target: Override for open_target for fake clicks (like hints).
                          Only used for QtWebKit.
         pinned: Flag to pin the tab.
@@ -104,6 +107,7 @@ class TabData:
 
     keep_icon = attr.ib(False)
     inspector = attr.ib(None)
+    open_target = attr.ib(usertypes.ClickTarget.normal)
     override_target = attr.ib(None)
     pinned = attr.ib(False)
     fullscreen = attr.ib(False)
@@ -719,6 +723,22 @@ class AbstractTab(QWidget):
         self._set_load_status(usertypes.LoadStatus.loading)
         self.load_started.emit()
 
+    @pyqtSlot(usertypes.NavigationRequest)
+    def _on_navigation_request(self, navigation):
+        """Handle common acceptNavigationRequest code."""
+        log.webview.debug("navigation request: url {}, type {}, is_main_frame "
+                          "{}".format(navigation.url.toDisplayString(),
+                                      navigation.navigation_type,
+                                      navigation.is_main_frame))
+
+        if (navigation.navigation_type == navigation.Type.link_clicked and
+                not navigation.url.isValid()):
+            msg = urlutils.get_errstring(navigation.url,
+                                         "Invalid link clicked")
+            message.error(msg)
+            self.data.open_target = usertypes.ClickTarget.normal
+            navigation.accepted = False
+
     def handle_auto_insert_mode(self, ok):
         """Handle `input.insert_mode.auto_load` after loading finished."""
         if not config.val.input.insert_mode.auto_load or not ok:
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 4e91ebd72..be559de54 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -886,6 +886,7 @@ class WebEngineTab(browsertab.AbstractTab):
             self._on_proxy_authentication_required)
         page.fullScreenRequested.connect(self._on_fullscreen_requested)
         page.contentsSizeChanged.connect(self.contents_size_changed)
+        page.navigation_request.connect(self._on_navigation_request)
 
         view.titleChanged.connect(self.title_changed)
         view.urlChanged.connect(self._on_url_changed)
diff --git a/qutebrowser/browser/webengine/webview.py b/qutebrowser/browser/webengine/webview.py
index 1b3c15f9e..ef666c934 100644
--- a/qutebrowser/browser/webengine/webview.py
+++ b/qutebrowser/browser/webengine/webview.py
@@ -124,10 +124,12 @@ class WebEnginePage(QWebEnginePage):
     Signals:
         certificate_error: Emitted on certificate errors.
         shutting_down: Emitted when the page is shutting down.
+        navigation_request: Emitted on acceptNavigationRequest.
     """
 
     certificate_error = pyqtSignal()
     shutting_down = pyqtSignal()
+    navigation_request = pyqtSignal(usertypes.NavigationRequest)
 
     def __init__(self, *, theme_color, profile, parent=None):
         super().__init__(profile, parent)
@@ -288,21 +290,26 @@ class WebEnginePage(QWebEnginePage):
                                 url: QUrl,
                                 typ: QWebEnginePage.NavigationType,
                                 is_main_frame: bool):
-        """Override acceptNavigationRequest to handle clicked links.
-
-        This only show an error on invalid links - everything else is handled
-        in createWindow.
-        """
-        log.webview.debug("navigation request: url {}, type {}, is_main_frame "
-                          "{}".format(url.toDisplayString(),
-                                      debug.qenum_key(QWebEnginePage, typ),
-                                      is_main_frame))
-        if (typ == QWebEnginePage.NavigationTypeLinkClicked and
-                not url.isValid()):
-            msg = urlutils.get_errstring(url, "Invalid link clicked")
-            message.error(msg)
-            return False
-        return True
+        """Override acceptNavigationRequest to forward it to the tab API."""
+        type_map = {
+            QWebEnginePage.NavigationTypeLinkClicked:
+                usertypes.NavigationRequest.Type.link_clicked,
+            QWebEnginePage.NavigationTypeTyped:
+                usertypes.NavigationRequest.Type.typed,
+            QWebEnginePage.NavigationTypeFormSubmitted:
+                usertypes.NavigationRequest.Type.form_submitted,
+            QWebEnginePage.NavigationTypeBackForward:
+                usertypes.NavigationRequest.Type.back_forward,
+            QWebEnginePage.NavigationTypeReload:
+                usertypes.NavigationRequest.Type.reloaded,
+            QWebEnginePage.NavigationTypeOther:
+                usertypes.NavigationRequest.Type.other,
+        }
+        navigation = usertypes.NavigationRequest(url=url,
+                                                 navigation_type=type_map[typ],
+                                                 is_main_frame=is_main_frame)
+        self.navigation_request.emit(navigation)
+        return navigation.accepted
 
     @pyqtSlot('QUrl')
     def _inject_userjs(self, url):
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 41e2432b3..165d2fdc4 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -35,7 +35,7 @@ from PyQt5.QtWebKitWidgets import QWebPage, QWebFrame
 from PyQt5.QtWebKit import QWebSettings
 from PyQt5.QtPrintSupport import QPrinter
 
-from qutebrowser.browser import browsertab
+from qutebrowser.browser import browsertab, shared
 from qutebrowser.browser.webkit import (webview, tabhistory, webkitelem,
                                         webkitsettings)
 from qutebrowser.utils import qtutils, objreg, usertypes, utils, log, debug
@@ -762,6 +762,25 @@ class WebKitTab(browsertab.AbstractTab):
     def _on_contents_size_changed(self, size):
         self.contents_size_changed.emit(QSizeF(size))
 
+    @pyqtSlot(usertypes.NavigationRequest)
+    def _on_navigation_request(self, navigation):
+        super()._on_navigation_request(navigation)
+        log.webview.debug("target {} override {}".format(
+            self.data.open_target, self.data.override_target))
+
+        if self.data.override_target is not None:
+            target = self.data.override_target
+            self.data.override_target = None
+        else:
+            target = self.data.open_target
+
+        if (navigation.navigation_type == navigation.Type.link_clicked and
+                target != usertypes.ClickTarget.normal):
+            tab = shared.get_tab(self.win_id, target)
+            tab.openurl(navigation.url)
+            self.data.open_target = usertypes.ClickTarget.normal
+            navigation.accepted = False
+
     def _connect_signals(self):
         view = self._widget
         page = view.page()
@@ -780,6 +799,7 @@ class WebKitTab(browsertab.AbstractTab):
         page.frameCreated.connect(self._on_frame_created)
         frame.contentsSizeChanged.connect(self._on_contents_size_changed)
         frame.initialLayoutCompleted.connect(self._on_history_trigger)
+        page.navigation_request.connect(self._on_navigation_request)
 
         self.url_changed.connect(
             functools.partial(webkitsettings.update_for_tab, self))
diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index 679ec2d88..89b205fa8 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -54,10 +54,12 @@ class BrowserPage(QWebPage):
         shutting_down: Emitted when the page is currently shutting down.
         reloading: Emitted before a web page reloads.
                    arg: The URL which gets reloaded.
+        navigation_request: Emitted on acceptNavigationRequest.
     """
 
     shutting_down = pyqtSignal()
     reloading = pyqtSignal(QUrl)
+    navigation_request = pyqtSignal(usertypes.NavigationRequest)
 
     def __init__(self, win_id, tab_id, tabdata, private, parent=None):
         super().__init__(parent)
@@ -70,7 +72,6 @@ class BrowserPage(QWebPage):
         }
         self._ignore_load_started = False
         self.error_occurred = False
-        self.open_target = usertypes.ClickTarget.normal
         self._networkmanager = networkmanager.NetworkManager(
             win_id=win_id, tab_id=tab_id, private=private, parent=self)
         self.setNetworkAccessManager(self._networkmanager)
@@ -474,7 +475,7 @@ class BrowserPage(QWebPage):
                                       source, line, msg)
 
     def acceptNavigationRequest(self,
-                                _frame: QWebFrame,
+                                frame: QWebFrame,
                                 request: QNetworkRequest,
                                 typ: QWebPage.NavigationType):
         """Override acceptNavigationRequest to handle clicked links.
@@ -486,36 +487,27 @@ class BrowserPage(QWebPage):
         Checks if it should open it in a tab (middle-click or control) or not,
         and then conditionally opens the URL here or in another tab/window.
         """
-        url = request.url()
-        log.webview.debug("navigation request: url {}, type {}, "
-                          "target {} override {}".format(
-                              url.toDisplayString(),
-                              debug.qenum_key(QWebPage, typ),
-                              self.open_target,
-                              self._tabdata.override_target))
+        type_map = {
+            QWebPage.NavigationTypeLinkClicked:
+                usertypes.NavigationRequest.Type.link_clicked,
+            QWebPage.NavigationTypeFormSubmitted:
+                usertypes.NavigationRequest.Type.form_submitted,
+            QWebPage.NavigationTypeFormResubmitted:
+                usertypes.NavigationRequest.Type.form_resubmitted,
+            QWebPage.NavigationTypeBackOrForward:
+                usertypes.NavigationRequest.Type.back_forward,
+            QWebPage.NavigationTypeReload:
+                usertypes.NavigationRequest.Type.reloaded,
+            QWebPage.NavigationTypeOther:
+                usertypes.NavigationRequest.Type.other,
+        }
+        is_main_frame = frame is self.mainFrame()
+        navigation = usertypes.NavigationRequest(url=request.url(),
+                                                 navigation_type=type_map[typ],
+                                                 is_main_frame=is_main_frame)
 
-        if self._tabdata.override_target is not None:
-            target = self._tabdata.override_target
-            self._tabdata.override_target = None
-        else:
-            target = self.open_target
+        if navigation.navigation_type == navigation.Type.reloaded:
+            self.reloading.emit(navigation.url)
 
-        if typ == QWebPage.NavigationTypeReload:
-            self.reloading.emit(url)
-            return True
-        elif typ != QWebPage.NavigationTypeLinkClicked:
-            return True
-
-        if not url.isValid():
-            msg = urlutils.get_errstring(url, "Invalid link clicked")
-            message.error(msg)
-            self.open_target = usertypes.ClickTarget.normal
-            return False
-
-        if target == usertypes.ClickTarget.normal:
-            return True
-
-        tab = shared.get_tab(self._win_id, target)
-        tab.openurl(url)
-        self.open_target = usertypes.ClickTarget.normal
-        return False
+        self.navigation_request.emit(navigation)
+        return navigation.accepted
diff --git a/qutebrowser/browser/webkit/webview.py b/qutebrowser/browser/webkit/webview.py
index 942e7265c..79da9778c 100644
--- a/qutebrowser/browser/webkit/webview.py
+++ b/qutebrowser/browser/webkit/webview.py
@@ -262,10 +262,10 @@ class WebView(QWebView):
                 target = usertypes.ClickTarget.tab_bg
             else:
                 target = usertypes.ClickTarget.tab
-            self.page().open_target = target
+            self._tabdata.open_target = target
             log.mouse.debug("Ctrl/Middle click, setting target: {}".format(
                 target))
         else:
-            self.page().open_target = usertypes.ClickTarget.normal
+            self._tabdata.open_target = usertypes.ClickTarget.normal
             log.mouse.debug("Normal click, setting normal target")
         super().mousePressEvent(e)
diff --git a/qutebrowser/utils/usertypes.py b/qutebrowser/utils/usertypes.py
index 8312cd803..06b70fc21 100644
--- a/qutebrowser/utils/usertypes.py
+++ b/qutebrowser/utils/usertypes.py
@@ -27,6 +27,7 @@ import operator
 import collections.abc
 import enum
 
+import attr
 from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QTimer
 
 from qutebrowser.utils import log, qtutils, utils
@@ -394,3 +395,22 @@ class AbstractCertificateErrorWrapper:
 
     def is_overridable(self):
         raise NotImplementedError
+
+
+@attr.s
+class NavigationRequest:
+
+    Type = enum.Enum('Type', [
+        'link_clicked',
+        'typed',  # QtWebEngine only
+        'form_submitted',
+        'form_resubmitted',  # QtWebKit only
+        'back_forward',
+        'reloaded',
+        'other'
+    ])
+
+    url = attr.ib()
+    navigation_type = attr.ib()
+    is_main_frame = attr.ib()
+    accepted = attr.ib(default=True)
diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature
index dc14750e1..eb6a24df9 100644
--- a/tests/end2end/features/hints.feature
+++ b/tests/end2end/features/hints.feature
@@ -207,7 +207,7 @@ Feature: Using hints
     Scenario: Using :follow-hint inside an iframe
         When I open data/hints/iframe.html
         And I hint with args "links normal" and follow a
-        Then "navigation request: url http://localhost:*/data/hello.txt, type NavigationTypeLinkClicked, *" should be logged
+        Then "navigation request: url http://localhost:*/data/hello.txt, type Type.link_clicked, *" should be logged
 
     Scenario: Using :follow-hint inside an iframe button
         When I open data/hints/iframe_button.html
@@ -228,12 +228,12 @@ Feature: Using hints
         And I hint with args "all normal" and follow a
         And I run :scroll bottom
         And I hint with args "links normal" and follow a
-        Then "navigation request: url http://localhost:*/data/hello2.txt, type NavigationTypeLinkClicked, *" should be logged
+        Then "navigation request: url http://localhost:*/data/hello2.txt, type Type.link_clicked, *" should be logged
 
     Scenario: Opening a link inside a specific iframe
         When I open data/hints/iframe_target.html
         And I hint with args "links normal" and follow a
-        Then "navigation request: url http://localhost:*/data/hello.txt, type NavigationTypeLinkClicked, *" should be logged
+        Then "navigation request: url http://localhost:*/data/hello.txt, type Type.link_clicked, *" should be logged
 
     Scenario: Opening a link with specific target frame in a new tab
         When I open data/hints/iframe_target.html
diff --git a/tests/end2end/features/search.feature b/tests/end2end/features/search.feature
index ae3f07999..4b379b8fe 100644
--- a/tests/end2end/features/search.feature
+++ b/tests/end2end/features/search.feature
@@ -250,7 +250,7 @@ Feature: Searching on a page
         And I run :search follow
         And I wait for "search found follow" in the log
         And I run :follow-selected
-        Then "navigation request: url http://localhost:*/data/hello.txt, type NavigationTypeLinkClicked, is_main_frame False" should be logged
+        Then "navigation request: url http://localhost:*/data/hello.txt, type Type.link_clicked, is_main_frame False" should be logged
 
     @qtwebkit_skip: Not supported in qtwebkit
     Scenario: Follow a tabbed searched link in an iframe

From 14a69d90472278cc8edbb6d2363efee094fec7e5 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 04:30:24 +0100
Subject: [PATCH 486/574] Fix lint

---
 qutebrowser/browser/browsertab.py        |  4 ++--
 qutebrowser/browser/webengine/webview.py |  3 +--
 qutebrowser/browser/webkit/webpage.py    |  3 +--
 qutebrowser/config/config.py             | 13 ++++++-------
 qutebrowser/config/configcommands.py     |  3 ++-
 qutebrowser/config/configfiles.py        |  4 ++--
 qutebrowser/config/websettings.py        |  2 +-
 qutebrowser/utils/urlmatch.py            |  1 +
 qutebrowser/utils/usertypes.py           |  2 ++
 9 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 5598a0904..4fa65eee0 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -30,8 +30,8 @@ from PyQt5.QtWidgets import QWidget, QApplication
 
 from qutebrowser.keyinput import modeman
 from qutebrowser.config import config
-from qutebrowser.utils import (utils, objreg, usertypes, log, qtutils, urlutils,
-                               message)
+from qutebrowser.utils import (utils, objreg, usertypes, log, qtutils,
+                               urlutils, message)
 from qutebrowser.misc import miscwidgets, objects
 from qutebrowser.browser import mouse, hints
 
diff --git a/qutebrowser/browser/webengine/webview.py b/qutebrowser/browser/webengine/webview.py
index ef666c934..91c5bfab6 100644
--- a/qutebrowser/browser/webengine/webview.py
+++ b/qutebrowser/browser/webengine/webview.py
@@ -29,8 +29,7 @@ from PyQt5.QtWebEngineWidgets import (QWebEngineView, QWebEnginePage,
 from qutebrowser.browser import shared
 from qutebrowser.browser.webengine import certificateerror, webenginesettings
 from qutebrowser.config import config
-from qutebrowser.utils import (log, debug, usertypes, jinja, urlutils, message,
-                               objreg, qtutils)
+from qutebrowser.utils import log, debug, usertypes, jinja, objreg, qtutils
 
 
 class WebEngineView(QWebEngineView):
diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index 89b205fa8..aebf53d87 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -33,8 +33,7 @@ from qutebrowser.config import config
 from qutebrowser.browser import pdfjs, shared
 from qutebrowser.browser.webkit import http
 from qutebrowser.browser.webkit.network import networkmanager
-from qutebrowser.utils import (message, usertypes, log, jinja, objreg, debug,
-                               urlutils)
+from qutebrowser.utils import message, usertypes, log, jinja, objreg
 
 
 class BrowserPage(QWebPage):
diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 341ecba93..be8aee85d 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -23,7 +23,6 @@ import copy
 import contextlib
 import functools
 
-import attr
 from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject
 
 from qutebrowser.config import configdata, configexc, configutils
@@ -234,8 +233,8 @@ class Config(QObject):
     """Main config object.
 
     Class attributes:
-        MUTABLE_TYPES: Types returned from the config which could potentially be
-        mutated.
+        MUTABLE_TYPES: Types returned from the config which could potentially
+        be mutated.
 
     Attributes:
         _values: A dict mapping setting names to configutils.Values objects.
@@ -312,8 +311,8 @@ class Config(QObject):
     def _maybe_copy(self, value):
         """Copy the value if it could potentially be mutated."""
         if isinstance(value, self.MUTABLE_TYPES):
-            # For mutable objects, create a copy so we don't accidentally mutate
-            # the config's internal value.
+            # For mutable objects, create a copy so we don't accidentally
+            # mutate the config's internal value.
             return copy.deepcopy(value)
         else:
             # Shouldn't be mutable (and thus hashable)
@@ -332,8 +331,8 @@ class Config(QObject):
     def get_obj_for_pattern(self, name, *, pattern):
         """Get the given setting as object (for YAML/config.py).
 
-        This gets the overridden value for a given pattern, or configutils.UNSET
-        if no such override exists.
+        This gets the overridden value for a given pattern, or
+        configutils.UNSET if no such override exists.
         """
         value = self._values[name].get_for_pattern(pattern, fallback=False)
         return self._maybe_copy(value)
diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py
index a527d47f1..f3f8e82b7 100644
--- a/qutebrowser/config/configcommands.py
+++ b/qutebrowser/config/configcommands.py
@@ -177,7 +177,8 @@ class ConfigCommands:
     @cmdutils.register(instance='config-commands', star_args_optional=True)
     @cmdutils.argument('option', completion=configmodel.option)
     @cmdutils.argument('values', completion=configmodel.value)
-    def config_cycle(self, option, *values, url=None, temp=False, print_=False):
+    def config_cycle(self, option, *values, url=None, temp=False,
+                     print_=False):
         """Cycle an option between multiple values.
 
         Args:
diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 8a7476ca9..91735f536 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -102,7 +102,7 @@ class YamlConfig(QObject):
         save_manager.add_saveable('yaml-config', self._save, self.changed)
 
     def __iter__(self):
-        for name, values in sorted(self._values.items()):
+        for _name, values in sorted(self._values.items()):
             yield from values
 
     def _mark_changed(self):
@@ -217,7 +217,7 @@ class YamlConfig(QObject):
     def _validate(self):
         """Make sure all settings exist."""
         unknown = []
-        for _pattern, name, value in self:
+        for _pattern, name, _value in self:
             # FIXME:conf show pattern
             if name not in configdata.DATA:
                 unknown.append(name)
diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py
index 2831af01e..f4b5d9820 100644
--- a/qutebrowser/config/websettings.py
+++ b/qutebrowser/config/websettings.py
@@ -231,7 +231,7 @@ def update_for_tab(mappings, tab, url):
 
         value = values.get_for_url(url, fallback=False)
         # FIXME:conf have a proper API for this.
-        settings = tab._widget.settings()
+        settings = tab._widget.settings()  # pylint: disable=protected-access
 
         if value is configutils.UNSET:
             try:
diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index 446f53bb2..c59db211b 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -104,6 +104,7 @@ class UrlPattern:
         return hash(self._to_tuple())
 
     def __eq__(self, other):
+        # pylint: disable=protected-access
         return self._to_tuple() == other._to_tuple()
 
     def _fixup_pattern(self, pattern):
diff --git a/qutebrowser/utils/usertypes.py b/qutebrowser/utils/usertypes.py
index 06b70fc21..039d805f9 100644
--- a/qutebrowser/utils/usertypes.py
+++ b/qutebrowser/utils/usertypes.py
@@ -400,6 +400,8 @@ class AbstractCertificateErrorWrapper:
 @attr.s
 class NavigationRequest:
 
+    """A request to navigate to the given URL."""
+
     Type = enum.Enum('Type', [
         'link_clicked',
         'typed',  # QtWebEngine only

From a6b979539dd976f1d7741b68b898e353f8926b78 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 04:54:12 +0100
Subject: [PATCH 487/574] Add missing configutils.py

---
 qutebrowser/config/configutils.py | 139 ++++++++++++++++++++++++++++++
 1 file changed, 139 insertions(+)
 create mode 100644 qutebrowser/config/configutils.py

diff --git a/qutebrowser/config/configutils.py b/qutebrowser/config/configutils.py
new file mode 100644
index 000000000..8b5593749
--- /dev/null
+++ b/qutebrowser/config/configutils.py
@@ -0,0 +1,139 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+
+"""Utilities and data structures used by various config code."""
+
+
+import attr
+
+
+# Sentinel object
+UNSET = object()
+
+
+@attr.s
+class ScopedValue:
+
+    """A configuration value which is valid for a UrlPattern.
+
+    Attributes:
+        value: The value itself.
+        pattern: The UrlPattern for the value, or None for global values.
+    """
+
+    value = attr.ib()
+    pattern = attr.ib()
+
+
+class Values:
+
+    """A collection of values for a single setting.
+
+    Currently, this is a list and iterates through all possible ScopedValues to
+    find matching ones.
+
+    In the future, it should be possible to optimize this by doing
+    pre-selection based on hosts, by making this a dict mapping the
+    non-wildcard part of the host to a list of matching ScopedValues.
+
+    That way, when searching for a setting for sub.example.com, we only have to
+    check 'sub.example.com', 'example.com', '.com' and '' instead of checking
+    all ScopedValues for the given setting.
+
+    Attributes:
+        _opt: The Option being customized.
+    """
+
+    def __init__(self, opt):
+        self._opt = opt
+        self._values = []
+
+    def __iter__(self):
+        """Yield ScopedValue elements.
+
+        This yields in "normal" order, i.e. global and then first-set settings
+        first.
+        """
+        yield from self._values
+
+    def add(self, value, pattern=None):
+        """Add a value with the given pattern to the list of values.
+
+        Currently, we just add this to the end of the list, meaning the same
+        pattern can be in there multiple times. However, that avoids doing a
+        search through all values every time a setting is set. We can still
+        optimize this later when changing the data structure as mentioned in
+        the class docstring.
+        """
+        scoped = ScopedValue(value, pattern)
+        self._values.append(scoped)
+
+    def remove(self, pattern=None):
+        """Remove the value with the given pattern."""
+        # FIXME:conf Should this ignore patterns which weren't found?
+        self._values = [v for v in self._values if v.pattern != pattern]
+
+    def _get_fallback(self):
+        """Get the fallback global/default value."""
+        if self._values:
+            scoped = self._values[-1]
+            if scoped.pattern is None:
+                # It's possible that the setting is only customized from the
+                # default for a given URL.
+                return scoped.value
+
+        return self._opt.default
+
+    def get_for_url(self, url=None, *, fallback=True):
+        """Get a config value, falling back when needed.
+
+        This first tries to find a value matching the URL (if given).
+        If there's no match:
+          With fallback=True, the global/default setting is returned.
+          With fallback=False, UNSET is returned.
+        """
+        if url is not None:
+            for scoped in reversed(self._values):
+                if scoped.pattern is not None and scoped.pattern.matches(url):
+                    return scoped.value
+
+            if not fallback:
+                return UNSET
+
+        return self._get_fallback()
+
+    def get_for_pattern(self, pattern, *, fallback=True):
+        """Get a value only if it's been overridden for the given pattern.
+
+        This is useful when showing values to the user.
+
+        If there's no match:
+          With fallback=True, the global/default setting is returned.
+          With fallback=False, UNSET is returned.
+        """
+        if pattern is not None:
+            for scoped in reversed(self._values):
+                if scoped.pattern == pattern:
+                    return scoped.value
+
+            if not fallback:
+                return UNSET
+
+        return self._get_fallback()

From 9c670e13ceb8b9b65abe69202e9d41d1e0f2fddc Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 05:08:17 +0100
Subject: [PATCH 488/574] Make clearing config work

---
 qutebrowser/config/config.py      | 6 ++----
 qutebrowser/config/configfiles.py | 4 ++--
 qutebrowser/config/configutils.py | 4 ++++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index be8aee85d..baadf1cfa 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -414,10 +414,8 @@ class Config(QObject):
         If save_yaml=True is given, also remove all customization from the YAML
         file.
         """
-        # FIXME:conf support per-URL settings?
-        old_values = self._values
-        self._values = {}
-        for name in old_values:
+        for name, values in self._values.items():
+            values.clear()
             self.changed.emit(name)
 
         if save_yaml:
diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 91735f536..f2e104c05 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -239,8 +239,8 @@ class YamlConfig(QObject):
 
     def clear(self):
         """Clear all values from the YAML file."""
-        # FIXME:conf per-URL support?
-        self._values = []
+        for values in self._values.values():
+            values.clear()
         self._mark_changed()
 
 
diff --git a/qutebrowser/config/configutils.py b/qutebrowser/config/configutils.py
index 8b5593749..c915b7674 100644
--- a/qutebrowser/config/configutils.py
+++ b/qutebrowser/config/configutils.py
@@ -90,6 +90,10 @@ class Values:
         # FIXME:conf Should this ignore patterns which weren't found?
         self._values = [v for v in self._values if v.pattern != pattern]
 
+    def clear(self):
+        """Clear all customization for this value."""
+        self._values = []
+
     def _get_fallback(self):
         """Get the fallback global/default value."""
         if self._values:

From 469175396500235c620030938befaa8b55f6af1d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 05:19:25 +0100
Subject: [PATCH 489/574] Avoid running change handlers on config.clear

---
 qutebrowser/config/config.py      | 5 +++--
 qutebrowser/config/configutils.py | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index baadf1cfa..b3ebc97c3 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -415,8 +415,9 @@ class Config(QObject):
         file.
         """
         for name, values in self._values.items():
-            values.clear()
-            self.changed.emit(name)
+            cleared = values.clear()
+            if cleared:
+                self.changed.emit(name)
 
         if save_yaml:
             self._yaml.clear()
diff --git a/qutebrowser/config/configutils.py b/qutebrowser/config/configutils.py
index c915b7674..cae1de7b7 100644
--- a/qutebrowser/config/configutils.py
+++ b/qutebrowser/config/configutils.py
@@ -92,7 +92,9 @@ class Values:
 
     def clear(self):
         """Clear all customization for this value."""
+        had_values = bool(self._values)
         self._values = []
+        return had_values
 
     def _get_fallback(self):
         """Get the fallback global/default value."""

From 6abb42a0665bc532ead67ec838823e10684f0de5 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 06:25:28 +0100
Subject: [PATCH 490/574] Make saving in autoconfig.yml work

---
 qutebrowser/config/config.py      |  4 ++--
 qutebrowser/config/configfiles.py | 14 +++++++++++---
 qutebrowser/config/configutils.py |  6 ++++--
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index b3ebc97c3..13f745216 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -415,8 +415,8 @@ class Config(QObject):
         file.
         """
         for name, values in self._values.items():
-            cleared = values.clear()
-            if cleared:
+            if values:
+                values.clear()
                 self.changed.emit(name)
 
         if save_yaml:
diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index f2e104c05..d7ba4493c 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -115,10 +115,17 @@ class YamlConfig(QObject):
         if not self._dirty:
             return
 
-        data = {'config_version': self.VERSION, 'global': self._values}
-        for pattern, values in sorted(self._values.items()):
-            data[str(pattern)] = values
+        settings = {}
+        for name, values in sorted(self._values.items()):
+            if not values:
+                continue
+            settings[name] = {}
+            for scoped in values:
+                key = ('global' if scoped.pattern is None
+                       else str(scoped.pattern))
+                settings[name][key] = scoped.value
 
+        data = {'config_version': self.VERSION, 'settings': settings}
         with qtutils.savefile_open(self._filename) as f:
             f.write(textwrap.dedent("""
                 # DO NOT edit this file by hand, qutebrowser will overwrite it.
@@ -231,6 +238,7 @@ class YamlConfig(QObject):
     def set_obj(self, name, value, *, pattern=None):
         """Set the given setting to the given value."""
         self._values[name].add(value, pattern)
+        self._mark_changed()
 
     def unset(self, name, *, pattern=None):
         """Remove the given option name if it's configured."""
diff --git a/qutebrowser/config/configutils.py b/qutebrowser/config/configutils.py
index cae1de7b7..ef6e87359 100644
--- a/qutebrowser/config/configutils.py
+++ b/qutebrowser/config/configutils.py
@@ -73,6 +73,10 @@ class Values:
         """
         yield from self._values
 
+    def __bool__(self):
+        """Check whether this value is customized."""
+        return bool(self._values)
+
     def add(self, value, pattern=None):
         """Add a value with the given pattern to the list of values.
 
@@ -92,9 +96,7 @@ class Values:
 
     def clear(self):
         """Clear all customization for this value."""
-        had_values = bool(self._values)
         self._values = []
-        return had_values
 
     def _get_fallback(self):
         """Get the fallback global/default value."""

From 8504ad6ff33360ffc34616fc4ad1787aac579faf Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 06:35:14 +0100
Subject: [PATCH 491/574] Change how iterating over Config/YamlConfig works

---
 qutebrowser/config/config.py      | 29 +++++++++++++----------------
 qutebrowser/config/configfiles.py | 13 ++++++-------
 qutebrowser/config/configutils.py | 21 ++++++++++++++++++---
 qutebrowser/config/websettings.py |  6 +++---
 4 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 13f745216..d1f8b2b44 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -259,9 +259,8 @@ class Config(QObject):
             self._values[name] = configutils.Values(opt)
 
     def __iter__(self):
-        """Iterate over Option, configutils.Values tuples."""
-        for name, values in sorted(self._values.items()):
-            yield self.get_opt(name), values
+        """Iterate over configutils.Values items."""
+        yield from self._values.values()
 
     def init_save_manager(self, save_manager):
         """Make sure the config gets saved properly.
@@ -287,9 +286,10 @@ class Config(QObject):
     def read_yaml(self):
         """Read the YAML settings from self._yaml."""
         self._yaml.load()
-        # FIXME:conf implement in self._yaml
-        for pattern, name, value in self._yaml:
-            self._set_value(self.get_opt(name), value, pattern=pattern)
+        for values in self._yaml:
+            for scoped in values:
+                self._set_value(values.opt, scoped.value,
+                                pattern=scoped.pattern)
 
     def get_opt(self, name):
         """Get a configdata.Option object for the given setting."""
@@ -443,17 +443,14 @@ class Config(QObject):
         Return:
             The changed config part as string.
         """
-        lines = []
-        for pattern, opt, value in self:
-            str_value = opt.typ.to_str(value)
-            if pattern is None:
-                lines.append('{} = {}'.format(opt.name, str_value))
-            else:
-                lines.append('{}: {} = {}'.format(pattern, opt.name,
-                                                  str_value))
-        if not lines:
+        blocks = []
+        for values in self:
+            if values:
+                blocks.append(str(values))
+
+        if not blocks:
             lines = ['<Default configuration>']
-        return '\n'.join(lines)
+        return '\n'.join(blocks)
 
 
 class ConfigContainer:
diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index d7ba4493c..cbd6dd4f6 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -102,8 +102,8 @@ class YamlConfig(QObject):
         save_manager.add_saveable('yaml-config', self._save, self.changed)
 
     def __iter__(self):
-        for _name, values in sorted(self._values.items()):
-            yield from values
+        """Iterate over configutils.Values items."""
+        yield from self._values.values()
 
     def _mark_changed(self):
         """Mark the YAML config as changed."""
@@ -183,7 +183,7 @@ class YamlConfig(QObject):
 
         # FIXME:conf test this
         for name, yaml_values in settings_obj.items():
-            values = configutils.Values(self._config.get_opt(name))
+            values = configutils.Values(configdata.DATA[name])
             if 'global' in yaml_values:
                 values.add(yaml_values.pop('global'))
 
@@ -224,10 +224,9 @@ class YamlConfig(QObject):
     def _validate(self):
         """Make sure all settings exist."""
         unknown = []
-        for _pattern, name, _value in self:
-            # FIXME:conf show pattern
-            if name not in configdata.DATA:
-                unknown.append(name)
+        for values in self:
+            if values.opt.name not in configdata.DATA:
+                unknown.append(values.opt.name)
 
         if unknown:
             errors = [configexc.ConfigErrorDesc("While loading options",
diff --git a/qutebrowser/config/configutils.py b/qutebrowser/config/configutils.py
index ef6e87359..9ddd6e824 100644
--- a/qutebrowser/config/configutils.py
+++ b/qutebrowser/config/configutils.py
@@ -58,13 +58,28 @@ class Values:
     all ScopedValues for the given setting.
 
     Attributes:
-        _opt: The Option being customized.
+        opt: The Option being customized.
     """
 
     def __init__(self, opt):
-        self._opt = opt
+        self.opt = opt
         self._values = []
 
+    def __str__(self):
+        """Get the values as human-readable string."""
+        if not self:
+            return '{}: <unchanged>'.format(self.opt.name)
+
+        lines = []
+        for scoped in self._values:
+            str_value = self.opt.typ.to_str(scoped.value)
+            if scoped.pattern is None:
+                lines.append('{} = {}'.format(self.opt.name, str_value))
+            else:
+                lines.append('{}: {} = {}'.format(
+                    scoped.pattern, self.opt.name, str_value))
+        return '\n'.join(lines)
+
     def __iter__(self):
         """Yield ScopedValue elements.
 
@@ -107,7 +122,7 @@ class Values:
                 # default for a given URL.
                 return scoped.value
 
-        return self._opt.default
+        return self.opt.default
 
     def get_for_url(self, url=None, *, fallback=True):
         """Get a config value, falling back when needed.
diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py
index f4b5d9820..83b45186a 100644
--- a/qutebrowser/config/websettings.py
+++ b/qutebrowser/config/websettings.py
@@ -222,12 +222,12 @@ def update_mappings(mappings, option):
 
 def update_for_tab(mappings, tab, url):
     """Update settings customized for the given tab."""
-    for opt, values in config.instance:
-        if opt.name not in mappings:
+    for values in config.instance:
+        if values.opt.name not in mappings:
             continue
 
         # FIXME:conf handle settings != None with global/static setters
-        mapping = mappings[opt.name]
+        mapping = mappings[values.opt.name]
 
         value = values.get_for_url(url, fallback=False)
         # FIXME:conf have a proper API for this.

From ddb914dc652626beec6e9992e462daf3edd04140 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 06:49:55 +0100
Subject: [PATCH 492/574] Refactor YAML init

---
 qutebrowser/config/configfiles.py | 74 ++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 32 deletions(-)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index cbd6dd4f6..a865709de 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -148,18 +148,6 @@ class YamlConfig(QObject):
             desc = configexc.ConfigErrorDesc("While parsing", e)
             raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
 
-        try:
-            settings_obj = yaml_data.pop('settings')
-        except KeyError:
-            desc = configexc.ConfigErrorDesc(
-                "While loading data",
-                "Toplevel object does not contain 'settings' key")
-            raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
-        except TypeError:
-            desc = configexc.ConfigErrorDesc("While loading data",
-                                             "Toplevel object is not a dict")
-            raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
-
         try:
             yaml_data.pop('config_version')
         except KeyError:
@@ -167,22 +155,42 @@ class YamlConfig(QObject):
                 "While loading data",
                 "Toplevel object does not contain 'config_version' key")
             raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
+        except TypeError:
+            desc = configexc.ConfigErrorDesc("While loading data",
+                                             "Toplevel object is not a dict")
+            raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
 
-        self._load_settings_object(settings_obj)
+        settings = self._load_settings_object(yaml_data)
         self._dirty = False
-        self._handle_migrations()
-        self._validate()
+        settings = self._handle_migrations(settings)
+        self._validate(settings)
+        self._build_values(settings)
+
+    def _load_settings_object(self, yaml_data):
+        """Load the settings from the settings: key.
+
+        FIXME: conf migrate old settings
+        """
+        try:
+            settings_obj = yaml_data.pop('settings')
+        except KeyError:
+            desc = configexc.ConfigErrorDesc(
+                "While loading data",
+                "Toplevel object does not contain 'settings' key")
+            raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
 
-    def _load_settings_object(self, settings_obj):
-        """Load the settings from the settings: key."""
         if not isinstance(settings_obj, dict):
             desc = configexc.ConfigErrorDesc(
                 "While loading data",
                 "'settings' object is not a dict")
             raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
 
+        return settings_obj
+
+    def _build_values(self, settings):
+        """Build up self._values from the values in the given dict."""
         # FIXME:conf test this
-        for name, yaml_values in settings_obj.items():
+        for name, yaml_values in settings.items():
             values = configutils.Values(configdata.DATA[name])
             if 'global' in yaml_values:
                 values.add(yaml_values.pop('global'))
@@ -192,41 +200,43 @@ class YamlConfig(QObject):
 
             self._values[name] = values
 
-    def _handle_migrations(self):
+    def _handle_migrations(self, settings):
         """Migrate older configs to the newest format."""
         # FIXME:conf handle per-URL settings
         # FIXME:conf migrate from older format with global: key
 
         # Simple renamed/deleted options
-        for name in list(self._values):
+        for name in list(settings):
             if name in configdata.MIGRATIONS.renamed:
                 new_name = configdata.MIGRATIONS.renamed[name]
                 log.config.debug("Renaming {} to {}".format(name, new_name))
-                self._values[new_name] = self._values[name]
-                del self._values[name]
+                settings[new_name] = settings[name]
+                del settings[name]
                 self._mark_changed()
             elif name in configdata.MIGRATIONS.deleted:
                 log.config.debug("Removing {}".format(name))
-                del self._values[name]
+                del settings[name]
                 self._mark_changed()
 
         # tabs.persist_mode_on_change got merged into tabs.mode_on_change
         old = 'tabs.persist_mode_on_change'
         new = 'tabs.mode_on_change'
-        if old in self._values:
-            if self._values[old]:
-                self._values[new] = 'persist'
+        if old in settings:
+            if settings[old]:
+                settings[new] = 'persist'
             else:
-                self._values[new] = 'normal'
-            del self._values[old]
+                settings[new] = 'normal'
+            del settings[old]
             self._mark_changed()
 
-    def _validate(self):
+        return settings
+
+    def _validate(self, settings):
         """Make sure all settings exist."""
         unknown = []
-        for values in self:
-            if values.opt.name not in configdata.DATA:
-                unknown.append(values.opt.name)
+        for name in settings:
+            if name not in configdata.DATA:
+                unknown.append(name)
 
         if unknown:
             errors = [configexc.ConfigErrorDesc("While loading options",

From 93972ff3f135cf344abad49dc62c257a4f956f8e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 07:12:27 +0100
Subject: [PATCH 493/574] Copy value before watching it for mutations in config

If we copy it afterwards, we are going to mutate the copied object.
---
 qutebrowser/config/config.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index d1f8b2b44..7cfd326d3 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -352,12 +352,13 @@ class Config(QObject):
             return obj
 
         value = self._values[name].get_for_pattern(pattern)
+        value = self._maybe_copy(value)
 
         # Watch the returned object for changes if it's mutable.
         if isinstance(value, self.MUTABLE_TYPES):
             self._mutables[name] = (copy.deepcopy(value), value)
 
-        return self._maybe_copy(value)
+        return value
 
     def get_str(self, name, *, pattern=None):
         """Get the given setting as string.

From bd6e99158e42a76880bcd2fdcd13de72d1c64324 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 07:14:48 +0100
Subject: [PATCH 494/574] Get rid of the second deepcopy for config values

There were two reasons why we deepcopy mutable objects in the config:

1) So mutations don't mess with our internal/default values.
2) So we can detect mutations and update the config.

If we're going to copy the value for 1) in maybe_copy(), we know the original
value is not going to be mutated, so we can use that directly for self._mutables
instead of making another copy.
---
 qutebrowser/config/config.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 7cfd326d3..1d87ca777 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -352,13 +352,13 @@ class Config(QObject):
             return obj
 
         value = self._values[name].get_for_pattern(pattern)
-        value = self._maybe_copy(value)
+        copy_value = self._maybe_copy(value)
 
         # Watch the returned object for changes if it's mutable.
-        if isinstance(value, self.MUTABLE_TYPES):
-            self._mutables[name] = (copy.deepcopy(value), value)
+        if isinstance(copy_value, self.MUTABLE_TYPES):
+            self._mutables[name] = (value, copy_value)  # old, new
 
-        return value
+        return copy_value
 
     def get_str(self, name, *, pattern=None):
         """Get the given setting as string.

From 8b666d2d2e5d5a4f330634a6121a559608cd2654 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 07:50:51 +0100
Subject: [PATCH 495/574] Try to update settings in acceptNavigationRequest

This still doesn't seem to update them early enough?
---
 qutebrowser/browser/webengine/webenginetab.py |  9 ++++++---
 qutebrowser/browser/webkit/webkittab.py       |  7 ++++---
 qutebrowser/config/configutils.py             | 13 +++++++++++--
 qutebrowser/config/websettings.py             |  3 +++
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index be559de54..fdabb195a 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -872,6 +872,12 @@ class WebEngineTab(browsertab.AbstractTab):
         if not ok:
             self._load_finished_fake.emit(False)
 
+    @pyqtSlot(usertypes.NavigationRequest)
+    def _on_navigation_request(self, navigation):
+        super()._on_navigation_request(navigation)
+        if navigation.accepted:
+            webenginesettings.update_for_tab(self, navigation.url)
+
     def _connect_signals(self):
         view = self._widget
         page = view.page()
@@ -907,8 +913,5 @@ class WebEngineTab(browsertab.AbstractTab):
             page.loadFinished.connect(self._restore_zoom)
             page.loadFinished.connect(self._on_load_finished)
 
-        self.url_changed.connect(
-            functools.partial(webenginesettings.update_for_tab, self))
-
     def event_target(self):
         return self._widget.focusProxy()
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 165d2fdc4..2decac683 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -781,6 +781,10 @@ class WebKitTab(browsertab.AbstractTab):
             self.data.open_target = usertypes.ClickTarget.normal
             navigation.accepted = False
 
+        if (navigation.accepted and navigation.navigation_type !=
+                navigation.Type.reloaded):
+            webkitsettings.update_for_tab(self, navigation.url)
+
     def _connect_signals(self):
         view = self._widget
         page = view.page()
@@ -801,8 +805,5 @@ class WebKitTab(browsertab.AbstractTab):
         frame.initialLayoutCompleted.connect(self._on_history_trigger)
         page.navigation_request.connect(self._on_navigation_request)
 
-        self.url_changed.connect(
-            functools.partial(webkitsettings.update_for_tab, self))
-
     def event_target(self):
         return self._widget
diff --git a/qutebrowser/config/configutils.py b/qutebrowser/config/configutils.py
index 9ddd6e824..9234a5ece 100644
--- a/qutebrowser/config/configutils.py
+++ b/qutebrowser/config/configutils.py
@@ -24,8 +24,17 @@
 import attr
 
 
-# Sentinel object
-UNSET = object()
+class _UnsetObject:
+
+    """Sentinel object."""
+
+    __slots__ = ()
+
+    def __repr__(self):
+        return '<UNSET>'
+
+
+UNSET = _UnsetObject()
 
 
 @attr.s
diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py
index 83b45186a..0f057d865 100644
--- a/qutebrowser/config/websettings.py
+++ b/qutebrowser/config/websettings.py
@@ -230,6 +230,9 @@ def update_for_tab(mappings, tab, url):
         mapping = mappings[values.opt.name]
 
         value = values.get_for_url(url, fallback=False)
+        log.config.debug("Updating for {}: {} = {}".format(
+            url.toDisplayString(), values.opt.name, value))
+
         # FIXME:conf have a proper API for this.
         settings = tab._widget.settings()  # pylint: disable=protected-access
 

From cb631d532a3e82e2c1e8833c4cd13facf5bc7465 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 10:35:35 +0100
Subject: [PATCH 496/574] Fix getting global value from configutils.Values

---
 qutebrowser/config/configutils.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/qutebrowser/config/configutils.py b/qutebrowser/config/configutils.py
index 9234a5ece..6c19ebab0 100644
--- a/qutebrowser/config/configutils.py
+++ b/qutebrowser/config/configutils.py
@@ -124,8 +124,7 @@ class Values:
 
     def _get_fallback(self):
         """Get the fallback global/default value."""
-        if self._values:
-            scoped = self._values[-1]
+        for scoped in self._values:
             if scoped.pattern is None:
                 # It's possible that the setting is only customized from the
                 # default for a given URL.

From d3e8d46593e7a427f343ae02f17d598c5f99a66a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 15:25:11 +0100
Subject: [PATCH 497/574] Use a real YamlConfig for tests

---
 tests/helpers/fixtures.py |  7 ++++---
 tests/helpers/stubs.py    | 27 ---------------------------
 2 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/tests/helpers/fixtures.py b/tests/helpers/fixtures.py
index 686db4125..193a40a8a 100644
--- a/tests/helpers/fixtures.py
+++ b/tests/helpers/fixtures.py
@@ -42,7 +42,8 @@ from PyQt5.QtNetwork import QNetworkCookieJar
 
 import helpers.stubs as stubsmod
 import helpers.utils
-from qutebrowser.config import config, configdata, configtypes, configexc
+from qutebrowser.config import (config, configdata, configtypes, configexc,
+                                configfiles)
 from qutebrowser.utils import objreg, standarddir
 from qutebrowser.browser.webkit import cookies
 from qutebrowser.misc import savemanager, sql
@@ -193,9 +194,9 @@ def configdata_init():
 
 
 @pytest.fixture
-def config_stub(stubs, monkeypatch, configdata_init):
+def config_stub(stubs, monkeypatch, configdata_init, config_tmpdir):
     """Fixture which provides a fake config object."""
-    yaml_config = stubs.FakeYamlConfig()
+    yaml_config = configfiles.YamlConfig()
 
     conf = config.Config(yaml_config=yaml_config)
     monkeypatch.setattr(config, 'instance', conf)
diff --git a/tests/helpers/stubs.py b/tests/helpers/stubs.py
index 64bc793cb..5a74b6a43 100644
--- a/tests/helpers/stubs.py
+++ b/tests/helpers/stubs.py
@@ -406,33 +406,6 @@ class InstaTimer(QObject):
         fun()
 
 
-class FakeYamlConfig:
-
-    """Fake configfiles.YamlConfig object."""
-
-    def __init__(self):
-        self.loaded = False
-        self._values = {}
-
-    def __contains__(self, item):
-        return item in self._values
-
-    def __iter__(self):
-        return iter(self._values.items())
-
-    def __setitem__(self, key, value):
-        self._values[key] = value
-
-    def __getitem__(self, key):
-        return self._values[key]
-
-    def unset(self, name):
-        self._values.pop(name, None)
-
-    def clear(self):
-        self._values = []
-
-
 class StatusBarCommandStub(QLineEdit):
 
     """Stub for the statusbar command prompt."""

From f43c7fa360fc6643af1ed26198a09208641d52fe Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 15:32:38 +0100
Subject: [PATCH 498/574] Fix changing values in configutils.Values

---
 qutebrowser/config/configutils.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/config/configutils.py b/qutebrowser/config/configutils.py
index 6c19ebab0..e47195654 100644
--- a/qutebrowser/config/configutils.py
+++ b/qutebrowser/config/configutils.py
@@ -102,14 +102,8 @@ class Values:
         return bool(self._values)
 
     def add(self, value, pattern=None):
-        """Add a value with the given pattern to the list of values.
-
-        Currently, we just add this to the end of the list, meaning the same
-        pattern can be in there multiple times. However, that avoids doing a
-        search through all values every time a setting is set. We can still
-        optimize this later when changing the data structure as mentioned in
-        the class docstring.
-        """
+        """Add a value with the given pattern to the list of values."""
+        self.remove(pattern)
         scoped = ScopedValue(value, pattern)
         self._values.append(scoped)
 

From 5eeb2233384c5c8f1dc4892524ec2f1d65cb75e7 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 15:35:29 +0100
Subject: [PATCH 499/574] Use a different directory for file prompt tests

This way they aren't influenced by the config_tmpdir fixture.
---
 tests/unit/mainwindow/test_prompt.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/tests/unit/mainwindow/test_prompt.py b/tests/unit/mainwindow/test_prompt.py
index eb0ba9e69..e467b0316 100644
--- a/tests/unit/mainwindow/test_prompt.py
+++ b/tests/unit/mainwindow/test_prompt.py
@@ -56,22 +56,25 @@ class TestFileCompletion:
     def test_simple_completion(self, tmpdir, get_prompt, steps, where,
                                subfolder):
         """Simply trying to tab through items."""
+        testdir = tmpdir / 'test'
         for directory in 'abc':
-            (tmpdir / directory).ensure(dir=True)
+            (testdir / directory).ensure(dir=True)
 
-        prompt = get_prompt(str(tmpdir) + os.sep)
+        prompt = get_prompt(str(testdir) + os.sep)
 
         for _ in range(steps):
             prompt.item_focus(where)
 
-        assert prompt._lineedit.text() == str(tmpdir / subfolder)
+        assert prompt._lineedit.text() == str(testdir / subfolder)
 
     def test_backspacing_path(self, qtbot, tmpdir, get_prompt):
         """When we start deleting a path we want to see the subdir."""
-        for directory in ['bar', 'foo']:
-            (tmpdir / directory).ensure(dir=True)
+        testdir = tmpdir / 'test'
 
-        prompt = get_prompt(str(tmpdir / 'foo') + os.sep)
+        for directory in ['bar', 'foo']:
+            (testdir / directory).ensure(dir=True)
+
+        prompt = get_prompt(str(testdir / 'foo') + os.sep)
 
         # Deleting /f[oo/]
         with qtbot.wait_signal(prompt._file_model.directoryLoaded):
@@ -81,7 +84,7 @@ class TestFileCompletion:
         # We should now show / again, so tabbing twice gives us .. -> bar
         prompt.item_focus('next')
         prompt.item_focus('next')
-        assert prompt._lineedit.text() == str(tmpdir / 'bar')
+        assert prompt._lineedit.text() == str(testdir / 'bar')
 
     @pytest.mark.linux
     def test_root_path(self, get_prompt):

From 87e329aee3b52f4a2196b154da6ff3aac7f6ff27 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 16:36:18 +0100
Subject: [PATCH 500/574] Fix config.dump_userconfig() with defaults

---
 qutebrowser/config/config.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 1d87ca777..8f34b6e44 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -450,7 +450,8 @@ class Config(QObject):
                 blocks.append(str(values))
 
         if not blocks:
-            lines = ['<Default configuration>']
+            return '<Default configuration>'
+
         return '\n'.join(blocks)
 
 

From c89e8046535634021a1e855e9a952bcb3940c48f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 16:36:32 +0100
Subject: [PATCH 501/574] Fix handling of invalid types in YamlConfig

---
 qutebrowser/config/configfiles.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index a865709de..2c26058a8 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -155,7 +155,7 @@ class YamlConfig(QObject):
                 "While loading data",
                 "Toplevel object does not contain 'config_version' key")
             raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
-        except TypeError:
+        except (TypeError, AttributeError):
             desc = configexc.ConfigErrorDesc("While loading data",
                                              "Toplevel object is not a dict")
             raise configexc.ConfigFileErrors('autoconfig.yml', [desc])

From 19f7b92abbe565fceb8131dfd44644af3d2ded3d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 16:36:45 +0100
Subject: [PATCH 502/574] Fix test_configinit.py

---
 tests/unit/config/test_configinit.py | 65 ++++++++++++++++++----------
 1 file changed, 43 insertions(+), 22 deletions(-)

diff --git a/tests/unit/config/test_configinit.py b/tests/unit/config/test_configinit.py
index a845f84f2..230b64a54 100644
--- a/tests/unit/config/test_configinit.py
+++ b/tests/unit/config/test_configinit.py
@@ -100,14 +100,15 @@ class TestEarlyInit:
 
         # Check config values
         if config_py:
-            assert config.instance._values == {'colors.hints.bg': 'red'}
+            expected = 'colors.hints.bg = red'
         else:
-            assert config.instance._values == {}
+            expected = '<Default configuration>'
+        assert config.instance.dump_userconfig() == expected
 
     @pytest.mark.parametrize('load_autoconfig', [True, False])  # noqa
     @pytest.mark.parametrize('config_py', [True, 'error', False])
-    @pytest.mark.parametrize('invalid_yaml', ['42', 'unknown', 'wrong-type',
-                                              False])
+    @pytest.mark.parametrize('invalid_yaml', ['42', 'list', 'unknown',
+                                              'wrong-type', False])
     def test_autoconfig_yml(self, init_patch, config_tmpdir, caplog, args,
                             load_autoconfig, config_py, invalid_yaml):
         """Test interaction between config.py and autoconfig.yml."""
@@ -115,14 +116,30 @@ class TestEarlyInit:
         autoconfig_file = config_tmpdir / 'autoconfig.yml'
         config_py_file = config_tmpdir / 'config.py'
 
-        yaml_text = {
+        yaml_lines = {
             '42': '42',
-            'unknown': 'global:\n  colors.foobar: magenta\n',
-            'wrong-type': 'global:\n  tabs.position: true\n',
-            False: 'global:\n  colors.hints.fg: magenta\n',
+            'list': '[1, 2]',
+            'unknown': [
+                'settings:',
+                '  colors.foobar:',
+                '    global: magenta',
+                'config_version: 1',
+            ],
+            'wrong-type': [
+                'settings:',
+                '  tabs.position:',
+                '    global: true',
+                'config_version: 1',
+            ],
+            False: [
+                'settings:',
+                '  colors.hints.fg:',
+                '    global: magenta',
+                'config_version: 1',
+            ],
         }
-        autoconfig_file.write_text(yaml_text[invalid_yaml], 'utf-8',
-                                   ensure=True)
+        text = '\n'.join(yaml_lines[invalid_yaml])
+        autoconfig_file.write_text(text, 'utf-8', ensure=True)
 
         if config_py:
             config_py_lines = ['c.colors.hints.bg = "red"']
@@ -141,7 +158,7 @@ class TestEarlyInit:
 
         if load_autoconfig or not config_py:
             suffix = ' (autoconfig.yml)' if config_py else ''
-            if invalid_yaml == '42':
+            if invalid_yaml in ['42', 'list']:
                 error = ("While loading data{}: Toplevel object is not a dict"
                          .format(suffix))
                 expected_errors.append(error)
@@ -165,17 +182,21 @@ class TestEarlyInit:
         assert actual_errors == expected_errors
 
         # Check config values
+        dump = config.instance.dump_userconfig()
+
         if config_py and load_autoconfig and not invalid_yaml:
-            assert config.instance._values == {
-                'colors.hints.bg': 'red',
-                'colors.hints.fg': 'magenta',
-            }
+            expected = [
+                'colors.hints.fg = magenta',
+                'colors.hints.bg = red',
+            ]
         elif config_py:
-            assert config.instance._values == {'colors.hints.bg': 'red'}
+            expected = ['colors.hints.bg = red']
         elif invalid_yaml:
-            assert config.instance._values == {}
+            expected = ['<Default configuration>']
         else:
-            assert config.instance._values == {'colors.hints.fg': 'magenta'}
+            expected = ['colors.hints.fg = magenta']
+
+        assert dump == '\n'.join(expected)
 
     def test_invalid_change_filter(self, init_patch, args):
         config.change_filter('foobar')
@@ -185,7 +206,7 @@ class TestEarlyInit:
     def test_temp_settings_valid(self, init_patch, args):
         args.temp_settings = [('colors.completion.fg', 'magenta')]
         configinit.early_init(args)
-        assert config.instance._values['colors.completion.fg'] == 'magenta'
+        assert config.instance.get_obj('colors.completion.fg') == 'magenta'
 
     def test_temp_settings_invalid(self, caplog, init_patch, message_mock,
                                    args):
@@ -198,7 +219,6 @@ class TestEarlyInit:
         msg = message_mock.getmsg()
         assert msg.level == usertypes.MessageLevel.error
         assert msg.text == "set: NoOptionError - No option 'foo'"
-        assert 'colors.completion.fg' not in config.instance._values
 
     @pytest.mark.parametrize('settings, size, family', [
         # Only fonts.monospace customized
@@ -220,8 +240,9 @@ class TestEarlyInit:
             args.temp_settings = settings
         elif method == 'auto':
             autoconfig_file = config_tmpdir / 'autoconfig.yml'
-            lines = ["global:"] + ["  {}: '{}'".format(k, v)
-                                   for k, v in settings]
+            lines = (["config_version: 1", "settings:"] +
+                     ["  {}:\n    global:\n      '{}'".format(k, v)
+                      for k, v in settings])
             autoconfig_file.write_text('\n'.join(lines), 'utf-8', ensure=True)
         elif method == 'py':
             config_py_file = config_tmpdir / 'config.py'

From 75181e16faca3c590308e3c8843d714064004448 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 19:16:50 +0100
Subject: [PATCH 503/574] Fix test_models.py

The Config object got initialized via the config_stub fixture early, so we need
to force it to re-init its values after patching configdata.DATA.
---
 qutebrowser/config/config.py         | 3 +++
 tests/unit/completion/test_models.py | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 8f34b6e44..4ad00fec4 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -253,7 +253,10 @@ class Config(QObject):
         self.changed.connect(_render_stylesheet.cache_clear)
         self._mutables = {}
         self._yaml = yaml_config
+        self._init_values()
 
+    def _init_values(self):
+        """Populate the self._values dict."""
         self._values = {}
         for name, opt in configdata.DATA.items():
             self._values[name] = configutils.Values(opt)
diff --git a/tests/unit/completion/test_models.py b/tests/unit/completion/test_models.py
index ff9a24112..32e6920fe 100644
--- a/tests/unit/completion/test_models.py
+++ b/tests/unit/completion/test_models.py
@@ -80,9 +80,9 @@ def cmdutils_stub(monkeypatch, stubs):
 
 
 @pytest.fixture()
-def configdata_stub(monkeypatch, configdata_init):
+def configdata_stub(config_stub, monkeypatch, configdata_init):
     """Patch the configdata module to provide fake data."""
-    return monkeypatch.setattr(configdata, 'DATA', collections.OrderedDict([
+    monkeypatch.setattr(configdata, 'DATA', collections.OrderedDict([
         ('aliases', configdata.Option(
             name='aliases',
             description='Aliases for commands.',
@@ -132,6 +132,7 @@ def configdata_stub(monkeypatch, configdata_init):
             backends=[],
             raw_backends=None)),
     ]))
+    config_stub._init_values()
 
 
 @pytest.fixture

From 0f907b1a779dbca1f616a57494f7051ffd555209 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 19:34:30 +0100
Subject: [PATCH 504/574] Fix getting YAML values in test_configcommands.py

---
 qutebrowser/config/configutils.py        | 11 +++--
 tests/unit/config/test_configcommands.py | 51 ++++++++++++------------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/qutebrowser/config/configutils.py b/qutebrowser/config/configutils.py
index e47195654..043650524 100644
--- a/qutebrowser/config/configutils.py
+++ b/qutebrowser/config/configutils.py
@@ -116,7 +116,7 @@ class Values:
         """Clear all customization for this value."""
         self._values = []
 
-    def _get_fallback(self):
+    def _get_fallback(self, fallback):
         """Get the fallback global/default value."""
         for scoped in self._values:
             if scoped.pattern is None:
@@ -124,7 +124,10 @@ class Values:
                 # default for a given URL.
                 return scoped.value
 
-        return self.opt.default
+        if fallback:
+            return self.opt.default
+        else:
+            return UNSET
 
     def get_for_url(self, url=None, *, fallback=True):
         """Get a config value, falling back when needed.
@@ -142,7 +145,7 @@ class Values:
             if not fallback:
                 return UNSET
 
-        return self._get_fallback()
+        return self._get_fallback(fallback)
 
     def get_for_pattern(self, pattern, *, fallback=True):
         """Get a value only if it's been overridden for the given pattern.
@@ -161,4 +164,4 @@ class Values:
             if not fallback:
                 return UNSET
 
-        return self._get_fallback()
+        return self._get_fallback(fallback)
diff --git a/tests/unit/config/test_configcommands.py b/tests/unit/config/test_configcommands.py
index 13b2ae943..945eb2bc7 100644
--- a/tests/unit/config/test_configcommands.py
+++ b/tests/unit/config/test_configcommands.py
@@ -24,7 +24,7 @@ import unittest.mock
 import pytest
 from PyQt5.QtCore import QUrl
 
-from qutebrowser.config import configcommands
+from qutebrowser.config import configcommands, configutils
 from qutebrowser.commands import cmdexc
 from qutebrowser.utils import usertypes
 from qutebrowser.misc import objects
@@ -35,6 +35,14 @@ def commands(config_stub, key_config_stub):
     return configcommands.ConfigCommands(config_stub, key_config_stub)
 
 
+@pytest.fixture
+def yaml_value(config_stub):
+    """Fixture which provides a getter for a YAML value."""
+    def getter(option):
+        return config_stub._yaml._values[option].get_for_url(fallback=False)
+    return getter
+
+
 class TestSet:
 
     """Tests for :set."""
@@ -64,7 +72,7 @@ class TestSet:
          ['gvim', '-f', '{file}', '-c', 'normal {line}G{column0}l'],
          '[emacs, "{}"]', ['emacs', '{}']),
     ])
-    def test_set_simple(self, monkeypatch, commands, config_stub,
+    def test_set_simple(self, monkeypatch, commands, config_stub, yaml_value,
                         temp, option, old_value, inp, new_value):
         """Run ':set [-t] option value'.
 
@@ -76,14 +84,10 @@ class TestSet:
         commands.set(0, option, inp, temp=temp)
 
         assert config_stub.get(option) == new_value
-
-        if temp:
-            assert option not in config_stub._yaml
-        else:
-            assert config_stub._yaml[option] == new_value
+        assert yaml_value(option) == (configutils.UNSET if temp else new_value)
 
     @pytest.mark.parametrize('temp', [True, False])
-    def test_set_temp_override(self, commands, config_stub, temp):
+    def test_set_temp_override(self, commands, config_stub, yaml_value, temp):
         """Invoking :set twice.
 
         :set url.auto_search dns
@@ -96,7 +100,7 @@ class TestSet:
         commands.set(0, 'url.auto_search', 'never', temp=True)
 
         assert config_stub.val.url.auto_search == 'never'
-        assert config_stub._yaml['url.auto_search'] == 'dns'
+        assert yaml_value('url.auto_search') == 'dns'
 
     def test_set_print(self, config_stub, commands, message_mock):
         """Run ':set -p url.auto_search never'.
@@ -177,13 +181,14 @@ class TestCycle:
         # Value which is not in the list
         ('red', 'green'),
     ])
-    def test_cycling(self, commands, config_stub, initial, expected):
+    def test_cycling(self, commands, config_stub, yaml_value,
+                     initial, expected):
         """Run ':set' with multiple values."""
         opt = 'colors.statusbar.normal.bg'
         config_stub.set_obj(opt, initial)
         commands.config_cycle(opt, 'green', 'magenta', 'blue', 'yellow')
         assert config_stub.get(opt) == expected
-        assert config_stub._yaml[opt] == expected
+        assert yaml_value(opt) == expected
 
     def test_different_representation(self, commands, config_stub):
         """When using a different representation, cycling should work.
@@ -205,7 +210,7 @@ class TestCycle:
         assert not config_stub.val.auto_save.session
         commands.config_cycle('auto_save.session')
         assert config_stub.val.auto_save.session
-        assert config_stub._yaml['auto_save.session']
+        assert yaml_value('auto_save.session')
 
     @pytest.mark.parametrize('args', [
         ['url.auto_search'], ['url.auto_search', 'foo']
@@ -239,34 +244,28 @@ class TestUnsetAndClear:
     """Test :config-unset and :config-clear."""
 
     @pytest.mark.parametrize('temp', [True, False])
-    def test_unset(self, commands, config_stub, temp):
+    def test_unset(self, commands, config_stub, yaml_value, temp):
         name = 'tabs.show'
         config_stub.set_obj(name, 'never', save_yaml=True)
 
         commands.config_unset(name, temp=temp)
 
         assert config_stub.get(name) == 'always'
-        if temp:
-            assert config_stub._yaml[name] == 'never'
-        else:
-            assert name not in config_stub._yaml
+        assert yaml_value(name) == ('never' if temp else configutils.UNSET)
 
     def test_unset_unknown_option(self, commands):
         with pytest.raises(cmdexc.CommandError, match="No option 'tabs'"):
             commands.config_unset('tabs')
 
     @pytest.mark.parametrize('save', [True, False])
-    def test_clear(self, commands, config_stub, save):
+    def test_clear(self, commands, config_stub, yaml_value, save):
         name = 'tabs.show'
         config_stub.set_obj(name, 'never', save_yaml=True)
 
         commands.config_clear(save=save)
 
         assert config_stub.get(name) == 'always'
-        if save:
-            assert name not in config_stub._yaml
-        else:
-            assert config_stub._yaml[name] == 'never'
+        assert yaml_value(name) == (configutils.UNSET if save else 'never')
 
 
 class TestSource:
@@ -453,7 +452,7 @@ class TestBind:
 
     @pytest.mark.parametrize('command', ['nop', 'nope'])
     def test_bind(self, commands, config_stub, no_bindings, key_config_stub,
-                  command):
+                  yaml_value, command):
         """Simple :bind test (and aliases)."""
         config_stub.val.aliases = {'nope': 'nop'}
         config_stub.val.bindings.default = no_bindings
@@ -461,7 +460,7 @@ class TestBind:
 
         commands.bind(0, 'a', command)
         assert key_config_stub.get_command('a', 'normal') == command
-        yaml_bindings = config_stub._yaml['bindings.commands']['normal']
+        yaml_bindings = yaml_value('bindings.commands')['normal']
         assert yaml_bindings['a'] == command
 
     @pytest.mark.parametrize('key, mode, expected', [
@@ -573,7 +572,7 @@ class TestBind:
         ('c', 'c'),  # :bind then :unbind
         ('<Ctrl-X>', '<ctrl+x>')  # normalized special binding
     ])
-    def test_unbind(self, commands, key_config_stub, config_stub,
+    def test_unbind(self, commands, key_config_stub, config_stub, yaml_value,
                     key, normalized):
         config_stub.val.bindings.default = {
             'normal': {'a': 'nop', '<ctrl+x>': 'nop'},
@@ -590,7 +589,7 @@ class TestBind:
         commands.unbind(key)
         assert key_config_stub.get_command(key, 'normal') is None
 
-        yaml_bindings = config_stub._yaml['bindings.commands']['normal']
+        yaml_bindings = yaml_value('bindings.commands')['normal']
         if key in 'bc':
             # Custom binding
             assert normalized not in yaml_bindings

From 615c6ffe5a5b0b9b4ef29007c8b6b45dbe8ac899 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 19:38:45 +0100
Subject: [PATCH 505/574] Make :config-write-py work again

---
 qutebrowser/config/configcommands.py | 7 +++++--
 qutebrowser/config/configfiles.py    | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py
index f3f8e82b7..3e55cbd57 100644
--- a/qutebrowser/config/configcommands.py
+++ b/qutebrowser/config/configcommands.py
@@ -313,12 +313,15 @@ class ConfigCommands:
                                       "overwrite!".format(filename))
 
         if defaults:
-            options = [(opt, opt.default)
+            options = [(None, opt, opt.default)
                        for _name, opt in sorted(configdata.DATA.items())]
             bindings = dict(configdata.DATA['bindings.default'].default)
             commented = True
         else:
-            options = list(self._config)
+            options = []
+            for values in self._config:
+                for scoped in values:
+                    options.append((scoped.pattern, values.opt, scoped.value))
             bindings = dict(self._config.get_mutable_obj('bindings.commands'))
             commented = False
 
diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 2c26058a8..cc306b1c9 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -388,7 +388,8 @@ class ConfigPyWriter:
 
     def _gen_options(self):
         """Generate the options part of the config."""
-        for opt, value in self._options:
+        # FIXME:conf handle _pattern
+        for _pattern, opt, value in self._options:
             if opt.name in ['bindings.commands', 'bindings.default']:
                 continue
 

From 19148a45936378a48ddbe6a736205dd63b9fbb1a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 19:41:00 +0100
Subject: [PATCH 506/574] Fix :config-unset

---
 qutebrowser/config/config.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 4ad00fec4..232c5d4c8 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -401,12 +401,8 @@ class Config(QObject):
 
     def unset(self, name, *, save_yaml=False, pattern=None):
         """Set the given setting back to its default."""
-        self.get_opt(name)
-        values = self._get_values(pattern)
-        try:
-            del values[name]
-        except KeyError:
-            return
+        self.get_opt(name)  # To check whether it exists
+        self._values[name].remove(pattern)
         self.changed.emit(name)
 
         if save_yaml:

From 5d63dfb24c5e42bafd01289adba2d5ceb25342b2 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 20:26:38 +0100
Subject: [PATCH 507/574] Start fixing test_configfiles.py

---
 tests/unit/config/test_configfiles.py | 157 ++++++++++++++------------
 1 file changed, 86 insertions(+), 71 deletions(-)

diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index 06633ffc7..e71c7498d 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -38,6 +38,36 @@ def configdata_init():
         configdata.init()
 
 
+class AutoConfigHelper:
+
+    """A helper to easily create/validate autoconfig.yml files."""
+
+    def __init__(self, config_tmpdir):
+        self.fobj = config_tmpdir / 'autoconfig.yml'
+
+    def write(self, values):
+        data = {'config_version': 1, 'settings': values}
+        with self.fobj.open('w', encoding='utf-8') as f:
+            utils.yaml_dump(data, f)
+
+    def write_raw(self, text):
+        self.fobj.write_text(text, encoding='utf-8', ensure=True)
+
+    def read(self):
+        with self.fobj.open('r', encoding='utf-8') as f:
+            data = utils.yaml_load(f)
+            assert data['config_version'] == 1
+            return data['settings']
+
+    def read_raw(self):
+        return self.fobj.read_text('utf-8')
+
+
+@pytest.fixture
+def autoconfig(config_tmpdir):
+    return AutoConfigHelper(config_tmpdir)
+
+
 @pytest.mark.parametrize('old_data, insert, new_data', [
     (None, False, '[general]\n\n[geometry]\n\n'),
     ('[general]\nfooled = true', False, '[general]\n\n[geometry]\n\n'),
@@ -75,49 +105,44 @@ class TestYaml:
 
     @pytest.mark.parametrize('old_config', [
         None,
-        'global:\n  colors.hints.fg: magenta',
+        {'colors.hints.fg': {'global': 'magenta'}}
     ])
     @pytest.mark.parametrize('insert', [True, False])
-    def test_yaml_config(self, yaml, config_tmpdir, old_config, insert):
-        autoconfig = config_tmpdir / 'autoconfig.yml'
+    def test_yaml_config(self, yaml, autoconfig, old_config, insert):
         if old_config is not None:
-            autoconfig.write_text(old_config, 'utf-8')
+            autoconfig.write(old_config)
 
         yaml.load()
 
         if insert:
-            yaml['tabs.show'] = 'never'
+            yaml.set_obj('tabs.show', 'never')
 
         yaml._save()
 
         if not insert and old_config is None:
             lines = []
         else:
-            text = autoconfig.read_text('utf-8')
-            lines = text.splitlines()
+            data = autoconfig.read()
+            lines = autoconfig.read_raw().splitlines()
 
             if insert:
                 assert lines[0].startswith('# DO NOT edit this file by hand,')
-                assert 'config_version: {}'.format(yaml.VERSION) in lines
-
-            assert 'global:' in lines
 
         print(lines)
 
-        if 'magenta' in (old_config or ''):
-            assert '  colors.hints.fg: magenta' in lines
+        if old_config is not None:
+            assert data['colors.hints.fg'] == {'global': 'magenta'}
         if insert:
-            assert '  tabs.show: never' in lines
+            assert data['tabs.show'] == {'global': 'never'}
 
     def test_init_save_manager(self, yaml, fake_save_manager):
         yaml.init_save_manager(fake_save_manager)
         fake_save_manager.add_saveable.assert_called_with(
             'yaml-config', unittest.mock.ANY, unittest.mock.ANY)
 
-    def test_unknown_key(self, yaml, config_tmpdir):
+    def test_unknown_key(self, yaml, autoconfig):
         """An unknown setting should show an error."""
-        autoconfig = config_tmpdir / 'autoconfig.yml'
-        autoconfig.write_text('global:\n  hello: world', encoding='utf-8')
+        autoconfig.write({'hello': {'global': 'world'}})
 
         with pytest.raises(configexc.ConfigFileErrors) as excinfo:
             yaml.load()
@@ -127,10 +152,9 @@ class TestYaml:
         assert error.text == "While loading options"
         assert str(error.exception) == "Unknown option hello"
 
-    def test_multiple_unknown_keys(self, yaml, config_tmpdir):
+    def test_multiple_unknown_keys(self, yaml, autoconfig):
         """With multiple unknown settings, all should be shown."""
-        autoconfig = config_tmpdir / 'autoconfig.yml'
-        autoconfig.write_text('global:\n  one: 1\n  two: 2', encoding='utf-8')
+        autoconfig.write({'one': {'global': 1}, 'two': {'global': 2}})
 
         with pytest.raises(configexc.ConfigFileErrors) as excinfo:
             yaml.load()
@@ -141,23 +165,21 @@ class TestYaml:
         assert str(error1.exception) == "Unknown option one"
         assert str(error2.exception) == "Unknown option two"
 
-    def test_deleted_key(self, monkeypatch, yaml, config_tmpdir):
+    def test_deleted_key(self, monkeypatch, yaml, autoconfig):
         """A key marked as deleted should be removed."""
-        autoconfig = config_tmpdir / 'autoconfig.yml'
-        autoconfig.write_text('global:\n  hello: world', encoding='utf-8')
+        autoconfig.write({'hello': {'global': 'world'}})
 
         monkeypatch.setattr(configdata.MIGRATIONS, 'deleted', ['hello'])
 
         yaml.load()
         yaml._save()
 
-        lines = autoconfig.read_text('utf-8').splitlines()
-        assert '  hello: world' not in lines
+        data = autoconfig.read()
+        assert not data
 
-    def test_renamed_key(self, monkeypatch, yaml, config_tmpdir):
+    def test_renamed_key(self, monkeypatch, yaml, autoconfig):
         """A key marked as renamed should be renamed properly."""
-        autoconfig = config_tmpdir / 'autoconfig.yml'
-        autoconfig.write_text('global:\n  old: value', encoding='utf-8')
+        autoconfig.write({'old': {'global': 'value'}})
 
         monkeypatch.setattr(configdata.MIGRATIONS, 'renamed',
                             {'old': 'tabs.show'})
@@ -165,29 +187,25 @@ class TestYaml:
         yaml.load()
         yaml._save()
 
-        lines = autoconfig.read_text('utf-8').splitlines()
-        assert '  old: value' not in lines
-        assert '  tabs.show: value' in lines
+        data = autoconfig.read()
+        assert data == {'tabs.show': {'global': 'value'}}
 
     @pytest.mark.parametrize('persist', [True, False])
-    def test_merge_persist(self, yaml, config_tmpdir, persist):
+    def test_merge_persist(self, yaml, autoconfig, persist):
         """Tests for migration of tabs.persist_mode_on_change."""
-        autoconfig = config_tmpdir / 'autoconfig.yml'
-        autoconfig.write_text('global:\n  tabs.persist_mode_on_change: {}'.
-                              format(persist), encoding='utf-8')
+        autoconfig.write({'tabs.persist_mode_on_change': {'global': persist}})
         yaml.load()
         yaml._save()
 
-        lines = autoconfig.read_text('utf-8').splitlines()
+        data = autoconfig.read()
+        assert 'tabs.persist_mode_on_change' not in data
         mode = 'persist' if persist else 'normal'
-        assert '  tabs.persist_mode_on_change:' not in lines
-        assert '  tabs.mode_on_change: {}'.format(mode) in lines
+        assert data['tabs.mode_on_change'] == mode
 
     def test_renamed_key_unknown_target(self, monkeypatch, yaml,
-                                        config_tmpdir):
+                                        autoconfig):
         """A key marked as renamed with invalid name should raise an error."""
-        autoconfig = config_tmpdir / 'autoconfig.yml'
-        autoconfig.write_text('global:\n  old: value', encoding='utf-8')
+        autoconfig.write_text({'old': {'global': 'value'}})
 
         monkeypatch.setattr(configdata.MIGRATIONS, 'renamed',
                             {'old': 'new'})
@@ -202,7 +220,7 @@ class TestYaml:
 
     @pytest.mark.parametrize('old_config', [
         None,
-        'global:\n  colors.hints.fg: magenta',
+        {'colors.hints.fg': {'global': 'magenta'}},
     ])
     @pytest.mark.parametrize('key, value', [
         ('colors.hints.fg', 'green'),
@@ -210,18 +228,18 @@ class TestYaml:
         ('confirm_quit', True),
         ('confirm_quit', False),
     ])
-    def test_changed(self, yaml, qtbot, config_tmpdir, old_config, key, value):
-        autoconfig = config_tmpdir / 'autoconfig.yml'
+    def test_changed(self, yaml, qtbot, autoconfig,
+                     old_config, key, value):
         if old_config is not None:
-            autoconfig.write_text(old_config, 'utf-8')
+            autoconfig.write(old_config)
 
         yaml.load()
 
         with qtbot.wait_signal(yaml.changed):
-            yaml[key] = value
+            yaml.set_obj(key, value)
 
         assert key in yaml
-        assert yaml[key] == value
+        assert yaml._values[key].get_for_url(fallback=False) == value
 
         yaml._save()
 
@@ -229,42 +247,40 @@ class TestYaml:
         yaml.load()
 
         assert key in yaml
-        assert yaml[key] == value
+        assert yaml._values[key].get_for_url(fallback=False) == value
 
     def test_iter(self, yaml):
-        yaml['foo'] = 23
-        yaml['bar'] = 42
+        yaml.set_obj('foo', 23)
+        yaml.set_obj('bar', 42)
         assert list(iter(yaml)) == [('bar', 42), ('foo', 23)]
 
     @pytest.mark.parametrize('old_config', [
         None,
-        'global:\n  colors.hints.fg: magenta',
+        {'colors.hints.fg': {'global': 'magenta'}},
     ])
-    def test_unchanged(self, yaml, config_tmpdir, old_config):
-        autoconfig = config_tmpdir / 'autoconfig.yml'
+    def test_unchanged(self, yaml, autoconfig, old_config):
         mtime = None
         if old_config is not None:
-            autoconfig.write_text(old_config, 'utf-8')
-            mtime = autoconfig.stat().mtime
+            autoconfig.write(old_config)
+            mtime = autoconfig.fobj.stat().mtime
 
         yaml.load()
         yaml._save()
 
         if old_config is None:
-            assert not autoconfig.exists()
+            assert not autoconfig.fobj.exists()
         else:
-            assert autoconfig.stat().mtime == mtime
+            assert autoconfig.fobj.stat().mtime == mtime
 
     @pytest.mark.parametrize('line, text, exception', [
         ('%', 'While parsing', 'while scanning a directive'),
-        ('global: 42', 'While loading data', "'global' object is not a dict"),
+        ('settings: 42', 'While loading data', "'settings' object is not a dict"),
         ('foo: 42', 'While loading data',
-         "Toplevel object does not contain 'global' key"),
+         "Toplevel object does not contain 'settings' key"),
         ('42', 'While loading data', "Toplevel object is not a dict"),
     ])
-    def test_invalid(self, yaml, config_tmpdir, line, text, exception):
-        autoconfig = config_tmpdir / 'autoconfig.yml'
-        autoconfig.write_text(line, 'utf-8', ensure=True)
+    def test_invalid(self, yaml, autoconfig, line, text, exception):
+        autoconfig.write_raw(line)
 
         with pytest.raises(configexc.ConfigFileErrors) as excinfo:
             yaml.load()
@@ -275,11 +291,10 @@ class TestYaml:
         assert str(error.exception).splitlines()[0] == exception
         assert error.traceback is None
 
-    def test_oserror(self, yaml, config_tmpdir):
-        autoconfig = config_tmpdir / 'autoconfig.yml'
-        autoconfig.ensure()
-        autoconfig.chmod(0)
-        if os.access(str(autoconfig), os.R_OK):
+    def test_oserror(self, yaml, autoconfig):
+        autoconfig.fobj.ensure()
+        autoconfig.fobj.chmod(0)
+        if os.access(str(autoconfig.fobj), os.R_OK):
             # Docker container or similar
             pytest.skip("File was still readable")
 
@@ -292,22 +307,22 @@ class TestYaml:
         assert isinstance(error.exception, OSError)
         assert error.traceback is None
 
-    def test_unset(self, yaml, qtbot, config_tmpdir):
+    def test_unset(self, yaml, qtbot):
         name = 'tabs.show'
-        yaml[name] = 'never'
+        yaml.set_obj(name, 'never')
 
         with qtbot.wait_signal(yaml.changed):
             yaml.unset(name)
 
         assert name not in yaml
 
-    def test_unset_never_set(self, yaml, qtbot, config_tmpdir):
+    def test_unset_never_set(self, yaml, qtbot):
         with qtbot.assert_not_emitted(yaml.changed):
             yaml.unset('tabs.show')
 
-    def test_clear(self, yaml, qtbot, config_tmpdir):
+    def test_clear(self, yaml, qtbot):
         name = 'tabs.show'
-        yaml[name] = 'never'
+        yaml.set_obj(name, 'never')
 
         with qtbot.wait_signal(yaml.changed):
             yaml.clear()

From 1409f4e564f9a35a7faa1209d7594d1258d75b2a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 21:01:52 +0100
Subject: [PATCH 508/574] Fix migration of tabs.persist_mode_on_change

---
 qutebrowser/config/configfiles.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index cc306b1c9..3a49f0e27 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -222,10 +222,13 @@ class YamlConfig(QObject):
         old = 'tabs.persist_mode_on_change'
         new = 'tabs.mode_on_change'
         if old in settings:
-            if settings[old]:
-                settings[new] = 'persist'
-            else:
-                settings[new] = 'normal'
+            settings[new] = {}
+            for scope, val in settings[old].items():
+                if val:
+                    settings[new][scope] = 'persist'
+                else:
+                    settings[new][scope] = 'normal'
+
             del settings[old]
             self._mark_changed()
 

From 8fead148e2118467edea7e2f5adca44fcf9ec454 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 21:02:07 +0100
Subject: [PATCH 509/574] Add FIXME

---
 qutebrowser/config/configfiles.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 3a49f0e27..ee22ff8e0 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -195,6 +195,7 @@ class YamlConfig(QObject):
             if 'global' in yaml_values:
                 values.add(yaml_values.pop('global'))
 
+            # FIXME:conf what if yaml_values is not a dict...
             for pattern, value in yaml_values.items():
                 values.add(value, pattern)
 

From ab119975e742b06f20179210d82d2ea946f52919 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 21:02:29 +0100
Subject: [PATCH 510/574] Only emit changed in unset if there was a change

---
 qutebrowser/config/configfiles.py | 5 +++--
 qutebrowser/config/configutils.py | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index ee22ff8e0..7a555e6a5 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -255,8 +255,9 @@ class YamlConfig(QObject):
 
     def unset(self, name, *, pattern=None):
         """Remove the given option name if it's configured."""
-        self._values[name].remove(pattern)
-        self._mark_changed()
+        changed = self._values[name].remove(pattern)
+        if changed:
+            self._mark_changed()
 
     def clear(self):
         """Clear all values from the YAML file."""
diff --git a/qutebrowser/config/configutils.py b/qutebrowser/config/configutils.py
index 043650524..cf5569b61 100644
--- a/qutebrowser/config/configutils.py
+++ b/qutebrowser/config/configutils.py
@@ -110,7 +110,9 @@ class Values:
     def remove(self, pattern=None):
         """Remove the value with the given pattern."""
         # FIXME:conf Should this ignore patterns which weren't found?
+        old_len = len(self._values)
         self._values = [v for v in self._values if v.pattern != pattern]
+        return old_len != len(self._values)
 
     def clear(self):
         """Clear all customization for this value."""

From 7d80825853a4738a171babc81279ea012b4e2316 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 21:02:52 +0100
Subject: [PATCH 511/574] Fix test_configfiles.py

---
 tests/unit/config/test_configfiles.py | 51 +++++++++++++--------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index e71c7498d..4606bc38b 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -27,7 +27,7 @@ import pytest
 from PyQt5.QtCore import QSettings
 
 from qutebrowser.config import (config, configfiles, configexc, configdata,
-                                configtypes)
+                                configtypes, configutils)
 from qutebrowser.utils import utils, usertypes
 
 
@@ -200,12 +200,12 @@ class TestYaml:
         data = autoconfig.read()
         assert 'tabs.persist_mode_on_change' not in data
         mode = 'persist' if persist else 'normal'
-        assert data['tabs.mode_on_change'] == mode
+        assert data['tabs.mode_on_change']['global'] == mode
 
     def test_renamed_key_unknown_target(self, monkeypatch, yaml,
                                         autoconfig):
         """A key marked as renamed with invalid name should raise an error."""
-        autoconfig.write_text({'old': {'global': 'value'}})
+        autoconfig.write({'old': {'global': 'value'}})
 
         monkeypatch.setattr(configdata.MIGRATIONS, 'renamed',
                             {'old': 'new'})
@@ -238,7 +238,6 @@ class TestYaml:
         with qtbot.wait_signal(yaml.changed):
             yaml.set_obj(key, value)
 
-        assert key in yaml
         assert yaml._values[key].get_for_url(fallback=False) == value
 
         yaml._save()
@@ -246,13 +245,10 @@ class TestYaml:
         yaml = configfiles.YamlConfig()
         yaml.load()
 
-        assert key in yaml
         assert yaml._values[key].get_for_url(fallback=False) == value
 
     def test_iter(self, yaml):
-        yaml.set_obj('foo', 23)
-        yaml.set_obj('bar', 42)
-        assert list(iter(yaml)) == [('bar', 42), ('foo', 23)]
+        assert list(iter(yaml)) == list(iter(yaml._values.values()))
 
     @pytest.mark.parametrize('old_config', [
         None,
@@ -274,9 +270,12 @@ class TestYaml:
 
     @pytest.mark.parametrize('line, text, exception', [
         ('%', 'While parsing', 'while scanning a directive'),
-        ('settings: 42', 'While loading data', "'settings' object is not a dict"),
-        ('foo: 42', 'While loading data',
+        ('settings: 42\nconfig_version: 1',
+         'While loading data', "'settings' object is not a dict"),
+        ('foo: 42\nconfig_version: 1', 'While loading data',
          "Toplevel object does not contain 'settings' key"),
+        ('settings: {}', 'While loading data',
+         "Toplevel object does not contain 'config_version' key"),
         ('42', 'While loading data', "Toplevel object is not a dict"),
     ])
     def test_invalid(self, yaml, autoconfig, line, text, exception):
@@ -385,7 +384,7 @@ class TestConfigPyModules:
         confpy.write_qbmodule()
         confpy.read()
         expected = {'normal': {',a': 'message-info foo'}}
-        assert config.instance._values['bindings.commands'] == expected
+        assert config.instance.get_obj('bindings.commands') == expected
         assert "qbmodule" not in sys.modules.keys()
         assert tmpdir not in sys.path
 
@@ -451,7 +450,7 @@ class TestConfigPy:
     def test_set(self, confpy, line):
         confpy.write(line)
         confpy.read()
-        assert config.instance._values['colors.hints.bg'] == 'red'
+        assert config.instance.get_obj('colors.hints.bg') == 'red'
 
     @pytest.mark.parametrize('set_first', [True, False])
     @pytest.mark.parametrize('get_line', [
@@ -478,7 +477,7 @@ class TestConfigPy:
         confpy.write(line)
         confpy.read()
         expected = {mode: {',a': 'message-info foo'}}
-        assert config.instance._values['bindings.commands'] == expected
+        assert config.instance.get_obj('bindings.commands') == expected
 
     def test_bind_freshly_defined_alias(self, confpy):
         """Make sure we can bind to a new alias.
@@ -494,14 +493,14 @@ class TestConfigPy:
         confpy.write("config.bind('H', 'message-info back')")
         confpy.read()
         expected = {'normal': {'H': 'message-info back'}}
-        assert config.instance._values['bindings.commands'] == expected
+        assert config.instance.get_obj('bindings.commands') == expected
 
     def test_bind_none(self, confpy):
         confpy.write("c.bindings.commands = None",
                      "config.bind(',x', 'nop')")
         confpy.read()
         expected = {'normal': {',x': 'nop'}}
-        assert config.instance._values['bindings.commands'] == expected
+        assert config.instance.get_obj('bindings.commands') == expected
 
     @pytest.mark.parametrize('line, key, mode', [
         ('config.unbind("o")', 'o', 'normal'),
@@ -511,14 +510,14 @@ class TestConfigPy:
         confpy.write(line)
         confpy.read()
         expected = {mode: {key: None}}
-        assert config.instance._values['bindings.commands'] == expected
+        assert config.instance.get_obj('bindings.commands') == expected
 
     def test_mutating(self, confpy):
         confpy.write('c.aliases["foo"] = "message-info foo"',
                      'c.aliases["bar"] = "message-info bar"')
         confpy.read()
-        assert config.instance._values['aliases']['foo'] == 'message-info foo'
-        assert config.instance._values['aliases']['bar'] == 'message-info bar'
+        assert config.instance.get_obj('aliases')['foo'] == 'message-info foo'
+        assert config.instance.get_obj('aliases')['bar'] == 'message-info bar'
 
     @pytest.mark.parametrize('option, value', [
         ('content.user_stylesheets', 'style.css'),
@@ -532,7 +531,7 @@ class TestConfigPy:
         (config_tmpdir / 'style.css').ensure()
         confpy.write('c.{}.append("{}")'.format(option, value))
         confpy.read()
-        assert config.instance._values[option][-1] == value
+        assert config.instance.get_obj(option)[-1] == value
 
     def test_oserror(self, tmpdir, data_tmpdir, config_tmpdir):
         with pytest.raises(configexc.ConfigFileErrors) as excinfo:
@@ -653,7 +652,7 @@ class TestConfigPy:
         confpy.write("config.source({!r})".format(arg))
         confpy.read()
 
-        assert not config.instance._values['content.javascript.enabled']
+        assert not config.instance.get_obj('content.javascript.enabled')
 
     def test_source_errors(self, tmpdir, confpy):
         subfile = tmpdir / 'config' / 'subfile.py'
@@ -697,7 +696,7 @@ class TestConfigPyWriter:
             name='opt', typ=configtypes.Int(), default='def',
             backends=[usertypes.Backend.QtWebEngine], raw_backends=None,
             description=desc)
-        options = [(opt, 'val')]
+        options = [(None, opt, 'val')]
         bindings = {'normal': {',x': 'message-info normal'},
                     'caret': {',y': 'message-info caret'}}
 
@@ -729,8 +728,8 @@ class TestConfigPyWriter:
     def test_binding_options_hidden(self):
         opt1 = configdata.DATA['bindings.default']
         opt2 = configdata.DATA['bindings.commands']
-        options = [(opt1, {'normal': {'x': 'message-info x'}}),
-                   (opt2, {})]
+        options = [(None, opt1, {'normal': {'x': 'message-info x'}}),
+                   (None, opt2, {})]
         writer = configfiles.ConfigPyWriter(options, bindings={},
                                             commented=False)
         text = '\n'.join(writer._gen_lines())
@@ -742,7 +741,7 @@ class TestConfigPyWriter:
             name='opt', typ=configtypes.Int(), default='def',
             backends=[usertypes.Backend.QtWebEngine], raw_backends=None,
             description='Hello World')
-        options = [(opt, 'val')]
+        options = [(None, opt, 'val')]
         bindings = {'normal': {',x': 'message-info normal'},
                     'caret': {',y': 'message-info caret'}}
 
@@ -768,7 +767,7 @@ class TestConfigPyWriter:
             backends=[usertypes.Backend.QtWebEngine], raw_backends=None,
             description='All colors are beautiful!')
 
-        options = [(opt1, 'ask'), (opt2, 'rgb')]
+        options = [(None, opt1, 'ask'), (None, opt2, 'rgb')]
 
         writer = configfiles.ConfigPyWriter(options, bindings={},
                                             commented=False)
@@ -819,7 +818,7 @@ class TestConfigPyWriter:
 
     def test_defaults_work(self, confpy):
         """Get a config.py with default values and run it."""
-        options = [(opt, opt.default)
+        options = [(None, opt, opt.default)
                    for _name, opt in sorted(configdata.DATA.items())]
         bindings = dict(configdata.DATA['bindings.default'].default)
         writer = configfiles.ConfigPyWriter(options, bindings, commented=False)

From fecebd6ced10347bfe305e55ba570b0278ff168e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 21:13:01 +0100
Subject: [PATCH 512/574] Start getting test_config.py to run

---
 tests/unit/config/test_config.py | 58 ++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
index ce6e4e461..0011981b2 100644
--- a/tests/unit/config/test_config.py
+++ b/tests/unit/config/test_config.py
@@ -26,7 +26,8 @@ import pytest
 from PyQt5.QtCore import QObject
 from PyQt5.QtGui import QColor
 
-from qutebrowser.config import config, configdata, configexc, configfiles
+from qutebrowser.config import (config, configdata, configexc, configfiles,
+                                configutils)
 from qutebrowser.utils import usertypes
 from qutebrowser.misc import objects
 
@@ -303,9 +304,15 @@ class TestKeyConfig:
 class TestConfig:
 
     @pytest.fixture
-    def conf(self, config_tmpdir):
-        yaml_config = configfiles.YamlConfig()
-        return config.Config(yaml_config)
+    def conf(self, config_stub):
+        return config_stub
+
+    @pytest.fixture
+    def yaml_value(self, conf):
+        """Fixture which provides a getter for a YAML value."""
+        def getter(option):
+            return conf._yaml._values[option].get_for_url(fallback=False)
+        return getter
 
     def test_init_save_manager(self, conf, fake_save_manager):
         conf.init_save_manager(fake_save_manager)
@@ -327,10 +334,10 @@ class TestConfig:
         monkeypatch.setattr(config.objects, 'backend', objects.NoBackend())
         opt = conf.get_opt('tabs.show')
         conf._set_value(opt, 'never')
-        assert conf._values['tabs.show'] == 'never'
+        assert conf.get_obj('tabs.show') == 'never'
 
     @pytest.mark.parametrize('save_yaml', [True, False])
-    def test_unset(self, conf, qtbot, save_yaml):
+    def test_unset(self, conf, qtbot, yaml_value, save_yaml):
         name = 'tabs.show'
         conf.set_obj(name, 'never', save_yaml=True)
         assert conf.get(name) == 'never'
@@ -340,9 +347,9 @@ class TestConfig:
 
         assert conf.get(name) == 'always'
         if save_yaml:
-            assert name not in conf._yaml
+            assert yaml_value(name) is configutils.UNSET
         else:
-            assert conf._yaml[name] == 'never'
+            assert yaml_value(name) == 'never'
 
     def test_unset_never_set(self, conf, qtbot):
         name = 'tabs.show'
@@ -358,13 +365,13 @@ class TestConfig:
             conf.unset('tabs')
 
     @pytest.mark.parametrize('save_yaml', [True, False])
-    def test_clear(self, conf, qtbot, save_yaml):
+    def test_clear(self, conf, qtbot, yaml_value, save_yaml):
         name1 = 'tabs.show'
         name2 = 'content.plugins'
         conf.set_obj(name1, 'never', save_yaml=True)
         conf.set_obj(name2, True, save_yaml=True)
-        assert conf._values[name1] == 'never'
-        assert conf._values[name2] is True
+        assert conf.get_obj(name1) == 'never'
+        assert conf.get_obj(name2) is True
 
         with qtbot.waitSignals([conf.changed, conf.changed]) as blocker:
             conf.clear(save_yaml=save_yaml)
@@ -373,16 +380,16 @@ class TestConfig:
         assert options == {name1, name2}
 
         if save_yaml:
-            assert name1 not in conf._yaml
-            assert name2 not in conf._yaml
+            assert yaml_value(name1) is configutils.UNSET
+            assert yaml_value(name2) is configutils.UNSET
         else:
-            assert conf._yaml[name1] == 'never'
-            assert conf._yaml[name2] is True
+            assert yaml_value(name1) == 'never'
+            assert yaml_value(name2) is True
 
-    def test_read_yaml(self, conf):
-        conf._yaml['content.plugins'] = True
+    def test_read_yaml(self, conf, yaml_value):
+        conf._yaml.set_obj('content.plugins', True)
         conf.read_yaml()
-        assert conf._values['content.plugins'] is True
+        assert conf.get_obj('content.plugins') is True
 
     def test_get_opt_valid(self, conf):
         assert conf.get_opt('tabs.show') == configdata.DATA['tabs.show']
@@ -399,7 +406,7 @@ class TestConfig:
     def test_get_bindings(self, config_stub, conf, value):
         """Test conf.get() with bindings which have missing keys."""
         config_stub.val.aliases = {}
-        conf._values['bindings.commands'] = value
+        conf.set_obj('bindings.commands', value)
         assert conf.get('bindings.commands')['prompt'] == {}
 
     def test_get_mutable(self, conf):
@@ -497,7 +504,7 @@ class TestConfig:
 
     def test_get_obj_unknown_mutable(self, conf):
         """Make sure we don't have unknown mutable types."""
-        conf._values['aliases'] = set()  # This would never happen
+        conf.set_obj('aliases', set())  # This would never happen
         with pytest.raises(AssertionError):
             conf.get_obj('aliases')
 
@@ -509,16 +516,17 @@ class TestConfig:
         ('set_obj', True),
         ('set_str', 'true'),
     ])
-    def test_set_valid(self, conf, qtbot, save_yaml, method, value):
+    def test_set_valid(self, conf, qtbot, yaml_value,
+                       save_yaml, method, value):
         option = 'content.plugins'
         meth = getattr(conf, method)
         with qtbot.wait_signal(conf.changed):
             meth(option, value, save_yaml=save_yaml)
-        assert conf._values[option] is True
+        assert conf.get_obj(option) is True
         if save_yaml:
-            assert conf._yaml[option] is True
+            assert yaml_value(option) is True
         else:
-            assert option not in conf._yaml
+            assert yaml_value(option) is configutils.UNSET
 
     @pytest.mark.parametrize('method', ['set_obj', 'set_str'])
     def test_set_invalid(self, conf, qtbot, method):
@@ -581,7 +589,7 @@ class TestContainer:
 
     def test_setattr_option(self, config_stub, container):
         container.content.cookies.store = False
-        assert config_stub._values['content.cookies.store'] is False
+        assert config_stub.get_obj('content.cookies.store') is False
 
     def test_confapi_errors(self, container):
         configapi = types.SimpleNamespace(errors=[])

From cea664e396fedc6458842bafe1ad296733dd8d8a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 21:13:31 +0100
Subject: [PATCH 513/574] Don't emit changed in unset if unneeded

---
 qutebrowser/config/config.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 232c5d4c8..b29106a95 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -402,8 +402,9 @@ class Config(QObject):
     def unset(self, name, *, save_yaml=False, pattern=None):
         """Set the given setting back to its default."""
         self.get_opt(name)  # To check whether it exists
-        self._values[name].remove(pattern)
-        self.changed.emit(name)
+        changed = self._values[name].remove(pattern)
+        if changed:
+            self.changed.emit(name)
 
         if save_yaml:
             self._yaml.unset(name, pattern=pattern)

From 1ada821092238ed59ccb2498adaf7a2eea39f333 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 21:22:26 +0100
Subject: [PATCH 514/574] Make sure config options exist

---
 qutebrowser/config/config.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index b29106a95..cc7f2b4c3 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -328,6 +328,7 @@ class Config(QObject):
         Note that the returned values are not watched for mutation.
         If a URL is given, return the value which should be used for that URL.
         """
+        self.get_opt(name)  # To make sure it exists
         value = self._values[name].get_for_url(url)
         return self._maybe_copy(value)
 
@@ -337,6 +338,7 @@ class Config(QObject):
         This gets the overridden value for a given pattern, or
         configutils.UNSET if no such override exists.
         """
+        self.get_opt(name)  # To make sure it exists
         value = self._values[name].get_for_pattern(pattern, fallback=False)
         return self._maybe_copy(value)
 
@@ -347,6 +349,8 @@ class Config(QObject):
         Note that it's impossible to get a mutable object for an URL as we
         wouldn't know what pattern to apply.
         """
+        self.get_opt(name)  # To make sure it exists
+
         # If we allow mutation, there is a chance that prior mutations already
         # entered the mutable dictionary and thus further copies are unneeded
         # until update_mutables() is called

From 463320b599b4735223a42ac8ce436a62e9609b0f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 21:22:43 +0100
Subject: [PATCH 515/574] Make test_config.py work

---
 tests/unit/config/test_config.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
index 0011981b2..4894d1dc6 100644
--- a/tests/unit/config/test_config.py
+++ b/tests/unit/config/test_config.py
@@ -422,7 +422,7 @@ class TestConfig:
                                         'bindings.commands'])
     @pytest.mark.parametrize('mutable', [True, False])
     @pytest.mark.parametrize('mutated', [True, False])
-    def test_get_obj_mutable(self, conf, config_stub, qtbot, caplog,
+    def test_get_obj_mutable(self, conf, qtbot, caplog,
                              option, mutable, mutated):
         """Make sure mutables are handled correctly.
 
@@ -439,7 +439,7 @@ class TestConfig:
         (keyhint.blacklist).
         """
         # Setting new value
-        obj = conf.get_obj(option, mutable=mutable)
+        obj = conf.get_mutable_obj(option) if mutable else conf.get_obj(option)
         with qtbot.assert_not_emitted(conf.changed):
             if option == 'content.headers.custom':
                 old = {}
@@ -461,7 +461,6 @@ class TestConfig:
                         assert obj == new
             else:
                 assert option == 'bindings.commands'
-                config_stub.val.aliases = {}
                 old = {}
                 new = {}
                 assert obj == old
@@ -492,9 +491,9 @@ class TestConfig:
     def test_get_mutable_twice(self, conf):
         """Get a mutable value twice."""
         option = 'content.headers.custom'
-        obj = conf.get_obj(option, mutable=True)
+        obj = conf.get_mutable_obj(option)
         obj['X-Foo'] = 'fooval'
-        obj2 = conf.get_obj(option, mutable=True)
+        obj2 = conf.get_mutable_obj(option)
         obj2['X-Bar'] = 'barval'
 
         conf.update_mutables()
@@ -504,9 +503,8 @@ class TestConfig:
 
     def test_get_obj_unknown_mutable(self, conf):
         """Make sure we don't have unknown mutable types."""
-        conf.set_obj('aliases', set())  # This would never happen
         with pytest.raises(AssertionError):
-            conf.get_obj('aliases')
+            conf._maybe_copy(set())
 
     def test_get_str(self, conf):
         assert conf.get_str('content.plugins') == 'false'
@@ -534,7 +532,7 @@ class TestConfig:
         with pytest.raises(configexc.ValidationError):
             with qtbot.assert_not_emitted(conf.changed):
                 meth('content.plugins', '42')
-        assert 'content.plugins' not in conf._values
+        assert not conf._values['content.plugins']
 
     @pytest.mark.parametrize('method', ['set_obj', 'set_str'])
     def test_set_wrong_backend(self, conf, qtbot, monkeypatch, method):
@@ -543,7 +541,7 @@ class TestConfig:
         with pytest.raises(configexc.BackendError):
             with qtbot.assert_not_emitted(conf.changed):
                 meth('content.cookies.accept', 'all')
-        assert 'content.cookies.accept' not in conf._values
+        assert not conf._values['content.cookies.accept']
 
     def test_dump_userconfig(self, conf):
         conf.set_obj('content.plugins', True)

From 5978b7b35f4edac33248831d15ff4e136d67d136 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 21:31:07 +0100
Subject: [PATCH 516/574] config: Improve tests for non-existent options

---
 tests/unit/config/test_config.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
index 4894d1dc6..b9ea51e82 100644
--- a/tests/unit/config/test_config.py
+++ b/tests/unit/config/test_config.py
@@ -360,10 +360,6 @@ class TestConfig:
 
         assert conf.get(name) == 'always'
 
-    def test_unset_unknown(self, conf):
-        with pytest.raises(configexc.NoOptionError):
-            conf.unset('tabs')
-
     @pytest.mark.parametrize('save_yaml', [True, False])
     def test_clear(self, conf, qtbot, yaml_value, save_yaml):
         name1 = 'tabs.show'
@@ -394,9 +390,21 @@ class TestConfig:
     def test_get_opt_valid(self, conf):
         assert conf.get_opt('tabs.show') == configdata.DATA['tabs.show']
 
-    def test_get_opt_invalid(self, conf):
+    @pytest.mark.parametrize('code', [
+        lambda c: c.get_opt('tabs'),
+        lambda c: c.get('tabs'),
+        lambda c: c.get_obj('tabs'),
+        lambda c: c.get_obj_for_pattern('tabs', pattern=None),
+        lambda c: c.get_mutable_obj('tabs'),
+        lambda c: c.get_str('tabs'),
+
+        lambda c: c.set_obj('tabs', 42),
+        lambda c: c.set_str('tabs', '42'),
+        lambda c: c.unset('tabs'),
+    ])
+    def test_no_option_error(self, conf, code):
         with pytest.raises(configexc.NoOptionError):
-            conf.get_opt('tabs')
+            code(conf)
 
     def test_get(self, conf):
         """Test conf.get() with a QColor (where get/get_obj is different)."""

From 7fcb21573d3f555eeb8c7849608753f29886ebaa Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 08:51:47 +0100
Subject: [PATCH 517/574] Update backers file

---
 doc/backers.asciidoc | 61 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 56 insertions(+), 5 deletions(-)

diff --git a/doc/backers.asciidoc b/doc/backers.asciidoc
index 2dd6f52b3..80f46fd6e 100644
--- a/doc/backers.asciidoc
+++ b/doc/backers.asciidoc
@@ -13,47 +13,75 @@ Thanks a lot to the following people who contributed to it:
 Gold sponsors
 ~~~~~~~~~~~~~
 
-TODO
+- Iggy
+- zwitschi
+- 2x Anonymous
 
 Silver sponsors
 ~~~~~~~~~~~~~~~
 
-TODO
+- https://benary.org[benaryorg]
+- https://scratchbook.ch[Claude]
+- Martin Tournoij
+- http://supported.elsensohn.ch[Thomas Elsensohn]
+- Christian Helbling
+- Gavin Troy
+- Chris King-Parra
+- Tim Das Mool Wegener
 
 Other sponsors
 ~~~~~~~~~~~~~~
 
-TODO: people with t-shirts or higher pledge levels
-
 - 7scan
+- AMD1212
+- Alex
 - Alex Suykov
 - Alexey Zhikhartsev
 - Allan Nordhøy
 - Anirudh Sanjeev
 - Anssi Puustinen
+- Anton Grensjö
+- Aristaeus
+- Armin Fisslthaler
+- Ashley Hauck
 - Benedikt Steindorf
 - Bernardo Kuri
 - Blaise Duszynski
 - Bostan
 - Bruno Oliveira
+- BunnyApocalypse
+- Christian Kellermann
 - Colin Jacobs
 - Daniel Andersson
+- Daniel Nelson
+- Daniel P. Schmidt
+- Daniel Salby
 - Danilo
 - David Beley
 - David Hollings
+- David Keijser
 - David Parrish
 - Derin Yarsuvat
 - Dmytro Kostiuchenko
+- Eero Kari
+- Epictek
+- Eric
+- Faure Hu
+- Ferus
 - Frederik Thorøe
 - G4v4g4i
+- Granitosaurus
 - Gyula Teleki
 - H
+- Heinz Bruhin
 - Hosaka
+- Ihor Radchenko
 - Iordanis Grigoriou
 - Isaac Sandaljian
 - Jakub Podeszwik
 - Jamie Anderson
 - Jasper Woudenberg
+- Jay Kamat
 - Jens Højgaard
 - Johannes
 - John Baber-Lucero
@@ -61,9 +89,11 @@ TODO: people with t-shirts or higher pledge levels
 - Kenichiro Ito
 - Kenny Low
 - Lars Ivar Igesund
+- Leulas
 - Lucas Aride Moulin
 - Ludovic Chabant
 - Lukas Gierth
+- Magnus Lindström
 - Marulkan
 - Matthew Chun-Lum
 - Matthew Cronen
@@ -80,7 +110,10 @@ TODO: people with t-shirts or higher pledge levels
 - Peter Rice
 - Philipp Middendorf
 - Pkill9
+- PluMGMK
 - Prescott
+- ProXicT
+- Ram-Z
 - Robotichead
 - Roshless
 - Ryan Ellis
@@ -90,35 +123,53 @@ TODO: people with t-shirts or higher pledge levels
 - Sean Herman
 - Sebastian Frysztak
 - Shelby Cruver
+- Simon Désaulniers
 - SirCmpwn
 - Soham Pal
+- Stephan Jauernick
 - Stewart Webb
 - Sven Reinecke
+- Timothée Floure
 - Tom Bass
+- Tom Kirchner
 - Tomas Slusny
 - Tomasz Kramkowski
 - Tommy Thomas
+- Tuscan
+- Ulrich Pötter
 - Vasilij Schneidermann
 - Vlaaaaaaad
+- XTaran
+- Z2h-A6n
+- ayekat
 - beanieuptop
+- cee
+- craftyguy
 - demure
+- dlangevi
+- epon
 - evenorbert
 - fishss
 - gsnewmark
 - guillermohs9
+- hernani
 - hubcaps
+- jnphilipp
 - lobachevsky
 - neodarz
 - nihlaeth
 - notbenh
+- nyctea
+- ongy
 - patrick suwanvithaya
 - pyratebeard
+- p≡p foundation
 - randm_dave
 - sabreman
 - toml
 - vimja
 - wiz
-- 44 Anonymous
+- 48 Anonymous
 
 2016
 ----

From 316b4b53408ec5ee22c1d20e0128e4ee32979abd Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Feb 2018 21:32:51 +0100
Subject: [PATCH 518/574] Add new files to PERFECT_FILES

---
 scripts/dev/check_coverage.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/dev/check_coverage.py b/scripts/dev/check_coverage.py
index ea971c28c..0e79a6e02 100644
--- a/scripts/dev/check_coverage.py
+++ b/scripts/dev/check_coverage.py
@@ -143,6 +143,8 @@ PERFECT_FILES = [
      'config/configinit.py'),
     ('tests/unit/config/test_configcommands.py',
      'config/configcommands.py'),
+    ('tests/unit/config/test_configutils.py',
+     'config/configutils.py'),
 
     ('tests/unit/utils/test_qtutils.py',
      'utils/qtutils.py'),
@@ -164,6 +166,8 @@ PERFECT_FILES = [
      'utils/error.py'),
     ('tests/unit/utils/test_javascript.py',
      'utils/javascript.py'),
+    ('tests/unit/utils/test_urlmatch.py',
+     'utils/urlmatch.py'),
 
     (None,
      'completion/models/util.py'),

From ab02fcb116e6b0f0b09d30489979b2cbb6a0fd13 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 06:21:11 +0100
Subject: [PATCH 519/574] configutils.Values: Add __repr__

---
 qutebrowser/config/configutils.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/qutebrowser/config/configutils.py b/qutebrowser/config/configutils.py
index cf5569b61..e70a9326b 100644
--- a/qutebrowser/config/configutils.py
+++ b/qutebrowser/config/configutils.py
@@ -23,6 +23,8 @@
 
 import attr
 
+from qutebrowser.utils import utils
+
 
 class _UnsetObject:
 
@@ -74,6 +76,10 @@ class Values:
         self.opt = opt
         self._values = []
 
+    def __repr__(self):
+        return utils.get_repr(self, opt=self.opt, values=self._values,
+                              constructor=True)
+
     def __str__(self):
         """Get the values as human-readable string."""
         if not self:

From 50c847562f0669c6ce6f8e45e6203689eebf2590 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 06:21:25 +0100
Subject: [PATCH 520/574] configutils.Values: Make it possible to pass values

---
 qutebrowser/config/configutils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/config/configutils.py b/qutebrowser/config/configutils.py
index e70a9326b..05bebf286 100644
--- a/qutebrowser/config/configutils.py
+++ b/qutebrowser/config/configutils.py
@@ -72,9 +72,9 @@ class Values:
         opt: The Option being customized.
     """
 
-    def __init__(self, opt):
+    def __init__(self, opt, values=None):
         self.opt = opt
-        self._values = []
+        self._values = values or []
 
     def __repr__(self):
         return utils.get_repr(self, opt=self.opt, values=self._values,

From 145a21449b59d5ffa97d7cc7f6d16769fb968fdd Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 06:22:32 +0100
Subject: [PATCH 521/574] configutils: Add first tests

---
 tests/unit/config/test_configutils.py | 60 +++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 tests/unit/config/test_configutils.py

diff --git a/tests/unit/config/test_configutils.py b/tests/unit/config/test_configutils.py
new file mode 100644
index 000000000..74a85edb2
--- /dev/null
+++ b/tests/unit/config/test_configutils.py
@@ -0,0 +1,60 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+import pytest
+
+from qutebrowser.config import configutils, configdata, configtypes
+from qutebrowser.utils import urlmatch
+
+
+def test_unset_object_identity():
+    assert configutils._UnsetObject() is not configutils._UnsetObject()
+    assert configutils.UNSET is configutils.UNSET
+
+
+def test_unset_object_repr():
+    assert repr(configutils.UNSET) == '<UNSET>'
+
+
+@pytest.fixture
+def opt():
+    return configdata.Option(name='example.option', typ=configtypes.String(),
+                             default='default value', backends=None,
+                             raw_backends=None, description=None)
+
+@pytest.fixture
+def values(opt):
+    pattern = urlmatch.UrlPattern('*://www.example.com/')
+    scoped_values = [configutils.ScopedValue('global value', None),
+                     configutils.ScopedValue('example value', pattern)]
+    return configutils.Values(opt, scoped_values)
+
+
+def test_repr(opt, values):
+    expected = ("qutebrowser.config.configutils.Values(opt={!r}, "
+                "values=[ScopedValue(value='global value', pattern=None), "
+                "ScopedValue(value='example value', pattern=qutebrowser.utils."
+                "urlmatch.UrlPattern(pattern='*://www.example.com/'))])"
+                .format(opt))
+    assert repr(values) == expected
+
+
+def test_str_empty(opt):
+    values = configutils.Values(opt)
+    assert str(values) == 'example.option: <unchanged>'

From 685e3ffcfefd2e27d1151292b354a8af5c47b509 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 06:27:15 +0100
Subject: [PATCH 522/574] Fix and test UrlPattern/configutils.Values
 stringification

---
 qutebrowser/utils/urlmatch.py         |  9 ++++++---
 tests/unit/config/test_configutils.py |  8 ++++++++
 tests/unit/utils/test_urlmatch.py     | 13 +++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index c59db211b..d2f9c4fe6 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -107,6 +107,12 @@ class UrlPattern:
         # pylint: disable=protected-access
         return self._to_tuple() == other._to_tuple()
 
+    def __repr__(self):
+        return utils.get_repr(self, pattern=self._pattern, constructor=True)
+
+    def __str__(self):
+        return self._pattern
+
     def _fixup_pattern(self, pattern):
         """Make sure the given pattern is parseable by urllib.parse."""
         if pattern.startswith('*:'):  # Any scheme, but *:// is unparseable
@@ -188,9 +194,6 @@ class UrlPattern:
             raise ParseError("Ports are unsupported with {} scheme".format(
                 self._scheme))
 
-    def __repr__(self):
-        return utils.get_repr(self, pattern=self._pattern, constructor=True)
-
     def _matches_scheme(self, scheme):
         return self._scheme is None or self._scheme == scheme
 
diff --git a/tests/unit/config/test_configutils.py b/tests/unit/config/test_configutils.py
index 74a85edb2..e961948d5 100644
--- a/tests/unit/config/test_configutils.py
+++ b/tests/unit/config/test_configutils.py
@@ -55,6 +55,14 @@ def test_repr(opt, values):
     assert repr(values) == expected
 
 
+def test_str(values):
+    expected = [
+        'example.option = global value',
+        '*://www.example.com/: example.option = example value',
+    ]
+    assert str(values) == '\n'.join(expected)
+
+
 def test_str_empty(opt):
     values = configutils.Values(opt)
     assert str(values) == 'example.option: <unchanged>'
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index ce300391b..83746dcca 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -517,3 +517,16 @@ def test_equal(text1, text2, equal):
 
     assert (pat1 == pat2) == equal
     assert (hash(pat1) == hash(pat2)) == equal
+
+
+def test_repr():
+    pat = urlmatch.UrlPattern('https://www.example.com/')
+    expected = ("qutebrowser.utils.urlmatch.UrlPattern("
+                "pattern='https://www.example.com/')")
+    assert repr(pat) == expected
+
+
+def test_str():
+    text = 'https://www.example.com/'
+    pat = urlmatch.UrlPattern(text)
+    assert str(pat) == text

From 63c77a4d76e07a89aa6a6415be900aa211953e08 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 06:47:04 +0100
Subject: [PATCH 523/574] urlmatch: Fix equality with non-UrlPattern types

---
 qutebrowser/utils/urlmatch.py     | 2 ++
 tests/unit/utils/test_urlmatch.py | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index d2f9c4fe6..6bded760b 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -104,6 +104,8 @@ class UrlPattern:
         return hash(self._to_tuple())
 
     def __eq__(self, other):
+        if not isinstance(other, UrlPattern):
+            return NotImplemented
         # pylint: disable=protected-access
         return self._to_tuple() == other._to_tuple()
 
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index 83746dcca..bda8c6eb0 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -519,6 +519,10 @@ def test_equal(text1, text2, equal):
     assert (hash(pat1) == hash(pat2)) == equal
 
 
+def test_equal_string():
+    assert urlmatch.UrlPattern("<all_urls>") != '<all_urls>'
+
+
 def test_repr():
     pat = urlmatch.UrlPattern('https://www.example.com/')
     expected = ("qutebrowser.utils.urlmatch.UrlPattern("

From 19c00ff92af64e7da97dce46439a86509c6f065d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 07:11:23 +0100
Subject: [PATCH 524/574] configutils: Clean up comments

---
 qutebrowser/config/configutils.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/config/configutils.py b/qutebrowser/config/configutils.py
index 05bebf286..0d324bb47 100644
--- a/qutebrowser/config/configutils.py
+++ b/qutebrowser/config/configutils.py
@@ -114,8 +114,11 @@ class Values:
         self._values.append(scoped)
 
     def remove(self, pattern=None):
-        """Remove the value with the given pattern."""
-        # FIXME:conf Should this ignore patterns which weren't found?
+        """Remove the value with the given pattern.
+
+        If a matching pattern was removed, True is returned.
+        If no matching pattern was found, False is returned.
+        """
         old_len = len(self._values)
         self._values = [v for v in self._values if v.pattern != pattern]
         return old_len != len(self._values)
@@ -128,8 +131,6 @@ class Values:
         """Get the fallback global/default value."""
         for scoped in self._values:
             if scoped.pattern is None:
-                # It's possible that the setting is only customized from the
-                # default for a given URL.
                 return scoped.value
 
         if fallback:

From 36f3e54e1d50cdee9dc63a0be80bc551d76ce28e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 07:11:34 +0100
Subject: [PATCH 525/574] Finish configutils tests

---
 tests/unit/config/test_configutils.py | 146 +++++++++++++++++++++++++-
 1 file changed, 141 insertions(+), 5 deletions(-)

diff --git a/tests/unit/config/test_configutils.py b/tests/unit/config/test_configutils.py
index e961948d5..29305c6ed 100644
--- a/tests/unit/config/test_configutils.py
+++ b/tests/unit/config/test_configutils.py
@@ -19,6 +19,8 @@
 
 import pytest
 
+from PyQt5.QtCore import QUrl
+
 from qutebrowser.config import configutils, configdata, configtypes
 from qutebrowser.utils import urlmatch
 
@@ -39,13 +41,27 @@ def opt():
                              raw_backends=None, description=None)
 
 @pytest.fixture
-def values(opt):
-    pattern = urlmatch.UrlPattern('*://www.example.com/')
+def pattern():
+    return urlmatch.UrlPattern('*://www.example.com/')
+
+
+@pytest.fixture
+def other_pattern():
+    return urlmatch.UrlPattern('https://www.example.org/')
+
+
+@pytest.fixture
+def values(opt, pattern):
     scoped_values = [configutils.ScopedValue('global value', None),
                      configutils.ScopedValue('example value', pattern)]
     return configutils.Values(opt, scoped_values)
 
 
+@pytest.fixture
+def empty_values(opt):
+    return configutils.Values(opt)
+
+
 def test_repr(opt, values):
     expected = ("qutebrowser.config.configutils.Values(opt={!r}, "
                 "values=[ScopedValue(value='global value', pattern=None), "
@@ -63,6 +79,126 @@ def test_str(values):
     assert str(values) == '\n'.join(expected)
 
 
-def test_str_empty(opt):
-    values = configutils.Values(opt)
-    assert str(values) == 'example.option: <unchanged>'
+def test_str_empty(empty_values):
+    assert str(empty_values) == 'example.option: <unchanged>'
+
+
+def test_bool(values, empty_values):
+    assert values
+    assert not empty_values
+
+
+def test_iter(values):
+    assert list(iter(values)) == list(iter(values._values))
+
+
+def test_add_existing(values):
+    values.add('new global value')
+    assert values.get_for_url() == 'new global value'
+
+
+def test_add_new(values, other_pattern):
+    values.add('example.org value', other_pattern)
+    assert values.get_for_url() == 'global value'
+    example_com = QUrl('https://www.example.com/')
+    example_org = QUrl('https://www.example.org/')
+    assert values.get_for_url(example_com) == 'example value'
+    assert values.get_for_url(example_org) == 'example.org value'
+
+
+def test_remove_existing(values, pattern):
+    removed = values.remove(pattern)
+    assert removed
+
+    url = QUrl('https://www.example.com/')
+    assert values.get_for_url(url) == 'global value'
+
+
+def test_remove_non_existing(values, other_pattern):
+    removed = values.remove(other_pattern)
+    assert not removed
+
+    url = QUrl('https://www.example.com/')
+    assert values.get_for_url(url) == 'example value'
+
+
+def test_clear(values):
+    assert values
+    values.clear()
+    assert not values
+    assert values.get_for_url(fallback=False) is configutils.UNSET
+
+
+def test_get_matching(values):
+    url = QUrl('https://www.example.com/')
+    assert values.get_for_url(url, fallback=False) == 'example value'
+
+
+def test_get_unset(empty_values):
+    assert empty_values.get_for_url(fallback=False) is configutils.UNSET
+
+
+def test_get_no_global(empty_values, other_pattern):
+    empty_values.add('example.org value', pattern)
+    assert empty_values.get_for_url(fallback=False) is configutils.UNSET
+
+
+def test_get_unset_fallback(empty_values):
+    assert empty_values.get_for_url() == 'default value'
+
+
+def test_get_non_matching(values):
+    url = QUrl('https://www.example.ch/')
+    assert values.get_for_url(url, fallback=False) is configutils.UNSET
+
+
+def test_get_non_matching_fallback(values):
+    url = QUrl('https://www.example.ch/')
+    assert values.get_for_url(url) == 'global value'
+
+
+def test_get_multiple_matches(values):
+    """With multiple matching pattern, the last added should win."""
+    all_pattern = urlmatch.UrlPattern('*://*/')
+    values.add('new value', all_pattern)
+    url = QUrl('https://www.example.com/')
+    assert values.get_for_url(url) == 'new value'
+
+
+def test_get_matching_pattern(values, pattern):
+    assert values.get_for_pattern(pattern, fallback=False) == 'example value'
+
+
+def test_get_unset_pattern(empty_values, pattern):
+    value = empty_values.get_for_pattern(pattern, fallback=False)
+    assert value is configutils.UNSET
+
+
+def test_get_no_global_pattern(empty_values, pattern, other_pattern):
+    empty_values.add('example.org value', other_pattern)
+    value = empty_values.get_for_pattern(pattern, fallback=False)
+    assert value is configutils.UNSET
+
+
+def test_get_unset_fallback_pattern(empty_values, pattern):
+    assert empty_values.get_for_pattern(pattern) == 'default value'
+
+
+def test_get_non_matching_pattern(values, other_pattern):
+    value = values.get_for_pattern(other_pattern, fallback=False)
+    assert value is configutils.UNSET
+
+
+def test_get_non_matching_fallback_pattern(values, other_pattern):
+    assert values.get_for_pattern(other_pattern) == 'global value'
+
+
+def test_get_equivalent_patterns(empty_values):
+    """With multiple matching pattern, the last added should win."""
+    pat1 = urlmatch.UrlPattern('https://www.example.com/')
+    pat2 = urlmatch.UrlPattern('https://www.example.com')
+    empty_values.add('pat1 value', pat1)
+    empty_values.add('pat2 value', pat2)
+
+    assert empty_values.get_for_pattern(pat1) == 'pat1 value'
+    assert empty_values.get_for_pattern(pat2) == 'pat2 value'

From d511c5436d94c4d0ba71044eff268a461b12bb86 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 09:44:39 +0100
Subject: [PATCH 526/574] Remove dead config code

---
 qutebrowser/config/config.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index cc7f2b4c3..95cd5723b 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -376,8 +376,6 @@ class Config(QObject):
         opt = self.get_opt(name)
         values = self._values[name]
         value = values.get_for_pattern(pattern)
-        if value is configutils.UNSET:
-            return value
         return opt.typ.to_str(value)
 
     def set_obj(self, name, value, *, pattern=None, save_yaml=False):

From 05017c83d61150f645c6b49f3444b96bcf6bc437 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 09:44:46 +0100
Subject: [PATCH 527/574] Add more config tests

---
 tests/unit/config/test_config.py         | 36 ++++++++++++++++++++++--
 tests/unit/config/test_configcommands.py | 20 ++++++++++++-
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
index b9ea51e82..2a7e61e27 100644
--- a/tests/unit/config/test_config.py
+++ b/tests/unit/config/test_config.py
@@ -23,12 +23,12 @@ import types
 import unittest.mock
 
 import pytest
-from PyQt5.QtCore import QObject
+from PyQt5.QtCore import QObject, QUrl
 from PyQt5.QtGui import QColor
 
 from qutebrowser.config import (config, configdata, configexc, configfiles,
                                 configutils)
-from qutebrowser.utils import usertypes
+from qutebrowser.utils import usertypes, urlmatch
 from qutebrowser.misc import objects
 
 
@@ -410,6 +410,14 @@ class TestConfig:
         """Test conf.get() with a QColor (where get/get_obj is different)."""
         assert conf.get('colors.completion.category.fg') == QColor('white')
 
+    def test_get_for_url(self, conf):
+        """Test conf.get() with an URL/pattern."""
+        pattern = urlmatch.UrlPattern('*://example.com')
+        name = 'content.javascript.enabled'
+        conf.set_obj(name, False, pattern=pattern)
+        assert conf.get(name, url=QUrl('https://example.com/')) is True
+
+
     @pytest.mark.parametrize('value', [{}, {'normal': {'a': 'nop'}}])
     def test_get_bindings(self, config_stub, conf, value):
         """Test conf.get() with bindings which have missing keys."""
@@ -514,6 +522,30 @@ class TestConfig:
         with pytest.raises(AssertionError):
             conf._maybe_copy(set())
 
+    def test_copy_non_mutable(self, conf, mocker):
+        """Make sure no copies are done for non-mutable types."""
+        spy = mocker.spy(config.copy, 'deepcopy')
+        conf.get_mutable_obj('content.plugins')
+        assert not spy.called
+
+    def test_copy_mutable(self, conf, mocker):
+        """Make sure mutable types are only copied once."""
+        spy = mocker.spy(config.copy, 'deepcopy')
+        conf.get_mutable_obj('bindings.commands')
+        spy.assert_called_once()
+
+    def test_get_obj_for_pattern(self, conf):
+        pattern = urlmatch.UrlPattern('*://example.com')
+        name = 'content.javascript.enabled'
+        conf.set_obj(name, False, pattern=pattern)
+        assert conf.get_obj_for_pattern(name, pattern=pattern) is False
+
+    def test_get_obj_for_pattern_no_match(self, conf):
+        pattern = urlmatch.UrlPattern('*://example.com')
+        name = 'content.javascript.enabled'
+        value = conf.get_obj_for_pattern(name, pattern=pattern)
+        assert value is configutils.UNSET
+
     def test_get_str(self, conf):
         assert conf.get_str('content.plugins') == 'false'
 
diff --git a/tests/unit/config/test_configcommands.py b/tests/unit/config/test_configcommands.py
index 945eb2bc7..5da8d36d1 100644
--- a/tests/unit/config/test_configcommands.py
+++ b/tests/unit/config/test_configcommands.py
@@ -26,7 +26,7 @@ from PyQt5.QtCore import QUrl
 
 from qutebrowser.config import configcommands, configutils
 from qutebrowser.commands import cmdexc
-from qutebrowser.utils import usertypes
+from qutebrowser.utils import usertypes, urlmatch
 from qutebrowser.misc import objects
 
 
@@ -86,6 +86,24 @@ class TestSet:
         assert config_stub.get(option) == new_value
         assert yaml_value(option) == (configutils.UNSET if temp else new_value)
 
+    def test_set_with_pattern(self, monkeypatch, commands, config_stub):
+        monkeypatch.setattr(objects, 'backend', usertypes.Backend.QtWebKit)
+        option = 'content.javascript.enabled'
+
+        commands.set(0, option, 'false', url='*://example.com')
+        pattern = urlmatch.UrlPattern('*://example.com')
+
+        assert config_stub.get(option)
+        assert not config_stub.get_obj_for_pattern(option, pattern=pattern)
+
+    def test_set_invalid_pattern(self, monkeypatch, commands):
+        monkeypatch.setattr(objects, 'backend', usertypes.Backend.QtWebKit)
+        option = 'content.javascript.enabled'
+
+        with pytest.raises(cmdexc.CommandError,
+                           match='Error while parsing :/: No scheme given'):
+            commands.set(0, option, 'false', url=':/')
+
     @pytest.mark.parametrize('temp', [True, False])
     def test_set_temp_override(self, commands, config_stub, yaml_value, temp):
         """Invoking :set twice.

From 9c42d87e7d37aff83b7ffa1fa6ed27a664375bb5 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 11:18:17 +0100
Subject: [PATCH 528/574] Add missing configutils test

---
 tests/unit/config/test_configutils.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/unit/config/test_configutils.py b/tests/unit/config/test_configutils.py
index 29305c6ed..af90b760c 100644
--- a/tests/unit/config/test_configutils.py
+++ b/tests/unit/config/test_configutils.py
@@ -169,6 +169,10 @@ def test_get_matching_pattern(values, pattern):
     assert values.get_for_pattern(pattern, fallback=False) == 'example value'
 
 
+def test_get_pattern_none(values, pattern):
+    assert values.get_for_pattern(None, fallback=False) == 'global value'
+
+
 def test_get_unset_pattern(empty_values, pattern):
     value = empty_values.get_for_pattern(pattern, fallback=False)
     assert value is configutils.UNSET

From b9bb515b3bb618c169a3f8b822ecd76e4cee0956 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 11:40:24 +0100
Subject: [PATCH 529/574] Add missing configfiles tests

---
 tests/unit/config/test_configfiles.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index 4606bc38b..d9d030501 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -105,7 +105,13 @@ class TestYaml:
 
     @pytest.mark.parametrize('old_config', [
         None,
-        {'colors.hints.fg': {'global': 'magenta'}}
+        # Only global
+        {'colors.hints.fg': {'global': 'magenta'}},
+        # Global and for pattern
+        {'content.javascript.enabled':
+         {'global': True, 'https://example.com/': False}},
+        # Only for pattern
+        {'content.images': {'https://example.com/': False}},
     ])
     @pytest.mark.parametrize('insert', [True, False])
     def test_yaml_config(self, yaml, autoconfig, old_config, insert):
@@ -130,8 +136,16 @@ class TestYaml:
 
         print(lines)
 
-        if old_config is not None:
+        if old_config is None:
+            pass
+        elif 'colors.hints.fg' in old_config:
             assert data['colors.hints.fg'] == {'global': 'magenta'}
+        elif 'content.javascript.enabled' in old_config:
+            expected = {'global': True, 'https://example.com/': False}
+            assert data['content.javascript.enabled'] == expected
+        elif 'content.images' in old_config:
+            assert data['content.images'] == {'https://example.com/': False}
+
         if insert:
             assert data['tabs.show'] == {'global': 'never'}
 

From ae732157246d24b00c6c5fd73d8df70b3ff321b2 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 11:43:41 +0100
Subject: [PATCH 530/574] Fix lint

---
 tests/unit/config/test_config.py      | 4 +---
 tests/unit/config/test_configfiles.py | 2 +-
 tests/unit/config/test_configutils.py | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
index 2a7e61e27..66176b6ac 100644
--- a/tests/unit/config/test_config.py
+++ b/tests/unit/config/test_config.py
@@ -26,8 +26,7 @@ import pytest
 from PyQt5.QtCore import QObject, QUrl
 from PyQt5.QtGui import QColor
 
-from qutebrowser.config import (config, configdata, configexc, configfiles,
-                                configutils)
+from qutebrowser.config import config, configdata, configexc, configutils
 from qutebrowser.utils import usertypes, urlmatch
 from qutebrowser.misc import objects
 
@@ -417,7 +416,6 @@ class TestConfig:
         conf.set_obj(name, False, pattern=pattern)
         assert conf.get(name, url=QUrl('https://example.com/')) is True
 
-
     @pytest.mark.parametrize('value', [{}, {'normal': {'a': 'nop'}}])
     def test_get_bindings(self, config_stub, conf, value):
         """Test conf.get() with bindings which have missing keys."""
diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index d9d030501..d7d0b6173 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -27,7 +27,7 @@ import pytest
 from PyQt5.QtCore import QSettings
 
 from qutebrowser.config import (config, configfiles, configexc, configdata,
-                                configtypes, configutils)
+                                configtypes)
 from qutebrowser.utils import utils, usertypes
 
 
diff --git a/tests/unit/config/test_configutils.py b/tests/unit/config/test_configutils.py
index af90b760c..ef91b13ee 100644
--- a/tests/unit/config/test_configutils.py
+++ b/tests/unit/config/test_configutils.py
@@ -40,6 +40,7 @@ def opt():
                              default='default value', backends=None,
                              raw_backends=None, description=None)
 
+
 @pytest.fixture
 def pattern():
     return urlmatch.UrlPattern('*://www.example.com/')

From f2bba2e4fa2aa0ce97d46fb8c9af8905c07dd9ef Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 12:25:59 +0100
Subject: [PATCH 531/574] Fix navigation handling

---
 qutebrowser/browser/webkit/webkittab.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 2decac683..815dbd286 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -765,6 +765,9 @@ class WebKitTab(browsertab.AbstractTab):
     @pyqtSlot(usertypes.NavigationRequest)
     def _on_navigation_request(self, navigation):
         super()._on_navigation_request(navigation)
+        if not navigation.accepted:
+            return
+
         log.webview.debug("target {} override {}".format(
             self.data.open_target, self.data.override_target))
 
@@ -781,8 +784,7 @@ class WebKitTab(browsertab.AbstractTab):
             self.data.open_target = usertypes.ClickTarget.normal
             navigation.accepted = False
 
-        if (navigation.accepted and navigation.navigation_type !=
-                navigation.Type.reloaded):
+        if navigation.navigation_type != navigation.Type.reloaded:
             webkitsettings.update_for_tab(self, navigation.url)
 
     def _connect_signals(self):

From 96e8151ccef1ee4e497106678432e3025f39d6d2 Mon Sep 17 00:00:00 2001
From: Marco Zollinger <marco@freelabs.space>
Date: Tue, 20 Feb 2018 15:18:31 +0100
Subject: [PATCH 532/574] use up to date cheatsheet images from repo instead of
 qutebrowser.org

---
 README.asciidoc          | 4 ++--
 scripts/asciidoc2html.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.asciidoc b/README.asciidoc
index aed2f61e2..c141aa0c3 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -44,8 +44,8 @@ Documentation
 In addition to the topics mentioned in this README, the following documents are
 available:
 
-* https://qutebrowser.org/img/cheatsheet-big.png[Key binding cheatsheet]: +
-image:https://qutebrowser.org/img/cheatsheet-small.png["qutebrowser key binding cheatsheet",link="https://qutebrowser.org/img/cheatsheet-big.png"]
+* https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-big.png[Key binding cheatsheet]: +
+image:https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-small.png["qutebrowser key binding cheatsheet",link="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-big.png"]
 * link:doc/quickstart.asciidoc[Quick start guide]
 * https://www.shortcutfoo.com/app/dojos/qutebrowser[Free training course] to remember those key bindings
 * link:doc/faq.asciidoc[Frequently asked questions]
diff --git a/scripts/asciidoc2html.py b/scripts/asciidoc2html.py
index 1827dc2a3..c4af174b2 100755
--- a/scripts/asciidoc2html.py
+++ b/scripts/asciidoc2html.py
@@ -85,9 +85,9 @@ class AsciiDoc:
 
         # patch image links to use local copy
         replacements = [
-            ("https://qutebrowser.org/img/cheatsheet-big.png",
+            ("https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-big.png",
              "qute://help/img/cheatsheet-big.png"),
-            ("https://qutebrowser.org/img/cheatsheet-small.png",
+            ("https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-small.png",
              "qute://help/img/cheatsheet-small.png")
         ]
         asciidoc_args = ['-a', 'source-highlighter=pygments']

From b3d788feadc7a4ac93168de1a944f7d9e548dac5 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 15:46:05 +0100
Subject: [PATCH 533/574] Add YamlConfig._pop_object

---
 qutebrowser/config/configfiles.py | 57 +++++++++++++++----------------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 7a555e6a5..f9a36ea31 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -134,6 +134,29 @@ class YamlConfig(QObject):
             """.lstrip('\n')))
             utils.yaml_dump(data, f)
 
+    def _pop_object(self, yaml_data, key, typ):
+        """Get a global object from the given data."""
+        if not isinstance(yaml_data, dict):
+            desc = configexc.ConfigErrorDesc("While loading data",
+                                             "Toplevel object is not a dict")
+            raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
+
+        if key not in yaml_data:
+            desc = configexc.ConfigErrorDesc(
+                "While loading data",
+                "Toplevel object does not contain '{}' key".format(key))
+            raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
+
+        data = yaml_data.pop(key)
+
+        if not isinstance(data, typ):
+            desc = configexc.ConfigErrorDesc(
+                "While loading data",
+                "'{}' object is not a {}".format(key, typ.__name__))
+            raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
+
+        return data
+
     def load(self):
         """Load configuration from the configured YAML file."""
         try:
@@ -148,44 +171,18 @@ class YamlConfig(QObject):
             desc = configexc.ConfigErrorDesc("While parsing", e)
             raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
 
-        try:
-            yaml_data.pop('config_version')
-        except KeyError:
-            desc = configexc.ConfigErrorDesc(
-                "While loading data",
-                "Toplevel object does not contain 'config_version' key")
-            raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
-        except (TypeError, AttributeError):
-            desc = configexc.ConfigErrorDesc("While loading data",
-                                             "Toplevel object is not a dict")
-            raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
+        config_version = self._pop_object(yaml_data, 'config_version', int)
 
         settings = self._load_settings_object(yaml_data)
+
         self._dirty = False
         settings = self._handle_migrations(settings)
         self._validate(settings)
         self._build_values(settings)
 
     def _load_settings_object(self, yaml_data):
-        """Load the settings from the settings: key.
-
-        FIXME: conf migrate old settings
-        """
-        try:
-            settings_obj = yaml_data.pop('settings')
-        except KeyError:
-            desc = configexc.ConfigErrorDesc(
-                "While loading data",
-                "Toplevel object does not contain 'settings' key")
-            raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
-
-        if not isinstance(settings_obj, dict):
-            desc = configexc.ConfigErrorDesc(
-                "While loading data",
-                "'settings' object is not a dict")
-            raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
-
-        return settings_obj
+        """Load the settings from the settings: key."""
+        return self._pop_object(yaml_data, 'settings', dict)
 
     def _build_values(self, settings):
         """Build up self._values from the values in the given dict."""

From 03114ccf514db14aa2dde6cde7457a24a5311e59 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 16:14:06 +0100
Subject: [PATCH 534/574] Migrate YAML config files in old format

---
 qutebrowser/config/configfiles.py     | 22 +++++++++------
 tests/unit/config/test_configfiles.py | 40 ++++++++++++++++++++++-----
 tests/unit/config/test_configinit.py  |  8 +++---
 3 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index f9a36ea31..62e4d7970 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -80,7 +80,7 @@ class YamlConfig(QObject):
         VERSION: The current version number of the config file.
     """
 
-    VERSION = 1
+    VERSION = 2
     changed = pyqtSignal()
 
     def __init__(self, parent=None):
@@ -173,9 +173,12 @@ class YamlConfig(QObject):
 
         config_version = self._pop_object(yaml_data, 'config_version', int)
 
-        settings = self._load_settings_object(yaml_data)
-
-        self._dirty = False
+        if config_version == 1:
+            settings = self._load_legacy_settings_object(yaml_data)
+            self._mark_changed()
+        else:
+            settings = self._load_settings_object(yaml_data)
+            self._dirty = False
         settings = self._handle_migrations(settings)
         self._validate(settings)
         self._build_values(settings)
@@ -184,9 +187,15 @@ class YamlConfig(QObject):
         """Load the settings from the settings: key."""
         return self._pop_object(yaml_data, 'settings', dict)
 
+    def _load_legacy_settings_object(self, yaml_data):
+        data = self._pop_object(yaml_data, 'global', dict)
+        settings = {}
+        for name, value in data.items():
+            settings[name] = {'global': value}
+        return settings
+
     def _build_values(self, settings):
         """Build up self._values from the values in the given dict."""
-        # FIXME:conf test this
         for name, yaml_values in settings.items():
             values = configutils.Values(configdata.DATA[name])
             if 'global' in yaml_values:
@@ -200,9 +209,6 @@ class YamlConfig(QObject):
 
     def _handle_migrations(self, settings):
         """Migrate older configs to the newest format."""
-        # FIXME:conf handle per-URL settings
-        # FIXME:conf migrate from older format with global: key
-
         # Simple renamed/deleted options
         for name in list(settings):
             if name in configdata.MIGRATIONS.renamed:
diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index d7d0b6173..29314d87e 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -45,19 +45,25 @@ class AutoConfigHelper:
     def __init__(self, config_tmpdir):
         self.fobj = config_tmpdir / 'autoconfig.yml'
 
-    def write(self, values):
-        data = {'config_version': 1, 'settings': values}
+    def write_toplevel(self, data):
         with self.fobj.open('w', encoding='utf-8') as f:
             utils.yaml_dump(data, f)
 
+    def write(self, values):
+        data = {'config_version': 2, 'settings': values}
+        self.write_toplevel(data)
+
     def write_raw(self, text):
         self.fobj.write_text(text, encoding='utf-8', ensure=True)
 
-    def read(self):
+    def read_toplevel(self):
         with self.fobj.open('r', encoding='utf-8') as f:
             data = utils.yaml_load(f)
-            assert data['config_version'] == 1
-            return data['settings']
+            assert data['config_version'] == 2
+            return data
+
+    def read(self):
+        return self.read_toplevel()['settings']
 
     def read_raw(self):
         return self.fobj.read_text('utf-8')
@@ -284,9 +290,9 @@ class TestYaml:
 
     @pytest.mark.parametrize('line, text, exception', [
         ('%', 'While parsing', 'while scanning a directive'),
-        ('settings: 42\nconfig_version: 1',
+        ('settings: 42\nconfig_version: 2',
          'While loading data', "'settings' object is not a dict"),
-        ('foo: 42\nconfig_version: 1', 'While loading data',
+        ('foo: 42\nconfig_version: 2', 'While loading data',
          "Toplevel object does not contain 'settings' key"),
         ('settings: {}', 'While loading data',
          "Toplevel object does not contain 'config_version' key"),
@@ -304,6 +310,26 @@ class TestYaml:
         assert str(error.exception).splitlines()[0] == exception
         assert error.traceback is None
 
+    def test_legacy_migration(self, yaml, autoconfig, qtbot):
+        autoconfig.write_toplevel({
+            'config_version': 1,
+            'global': {'content.javascript.enabled': True},
+        })
+        with qtbot.wait_signal(yaml.changed):
+            yaml.load()
+
+        yaml._save()
+
+        data = autoconfig.read_toplevel()
+        assert data == {
+            'config_version': 2,
+            'settings': {
+                'content.javascript.enabled': {
+                    'global': True,
+                }
+            }
+        }
+
     def test_oserror(self, yaml, autoconfig):
         autoconfig.fobj.ensure()
         autoconfig.fobj.chmod(0)
diff --git a/tests/unit/config/test_configinit.py b/tests/unit/config/test_configinit.py
index 230b64a54..c139ff6b9 100644
--- a/tests/unit/config/test_configinit.py
+++ b/tests/unit/config/test_configinit.py
@@ -123,19 +123,19 @@ class TestEarlyInit:
                 'settings:',
                 '  colors.foobar:',
                 '    global: magenta',
-                'config_version: 1',
+                'config_version: 2',
             ],
             'wrong-type': [
                 'settings:',
                 '  tabs.position:',
                 '    global: true',
-                'config_version: 1',
+                'config_version: 2',
             ],
             False: [
                 'settings:',
                 '  colors.hints.fg:',
                 '    global: magenta',
-                'config_version: 1',
+                'config_version: 2',
             ],
         }
         text = '\n'.join(yaml_lines[invalid_yaml])
@@ -240,7 +240,7 @@ class TestEarlyInit:
             args.temp_settings = settings
         elif method == 'auto':
             autoconfig_file = config_tmpdir / 'autoconfig.yml'
-            lines = (["config_version: 1", "settings:"] +
+            lines = (["config_version: 2", "settings:"] +
                      ["  {}:\n    global:\n      '{}'".format(k, v)
                       for k, v in settings])
             autoconfig_file.write_text('\n'.join(lines), 'utf-8', ensure=True)

From e482c768749ef1df1cb2a12b705b38336bd58d60 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 17:08:28 +0100
Subject: [PATCH 535/574] YamlConfig: Refuse to read a newer config version

---
 qutebrowser/config/configfiles.py     |  7 ++++++-
 tests/unit/config/test_configfiles.py | 14 ++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 62e4d7970..9d76d4ee5 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -172,13 +172,18 @@ class YamlConfig(QObject):
             raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
 
         config_version = self._pop_object(yaml_data, 'config_version', int)
-
         if config_version == 1:
             settings = self._load_legacy_settings_object(yaml_data)
             self._mark_changed()
+        elif config_version > self.VERSION:
+            desc = configexc.ConfigErrorDesc(
+                "While reading",
+                "Can't read config from incompatible newer version")
+            raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
         else:
             settings = self._load_settings_object(yaml_data)
             self._dirty = False
+
         settings = self._handle_migrations(settings)
         self._validate(settings)
         self._build_values(settings)
diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index 29314d87e..eadddf39b 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -330,6 +330,20 @@ class TestYaml:
             }
         }
 
+    def test_read_newer_version(self, yaml, autoconfig):
+        autoconfig.write_toplevel({
+            'config_version': 999,
+            'settings': {},
+        })
+        with pytest.raises(configexc.ConfigFileErrors) as excinfo:
+            yaml.load()
+
+        assert len(excinfo.value.errors) == 1
+        error = excinfo.value.errors[0]
+        assert error.text == "While reading"
+        msg = "Can't read config from incompatible newer version"
+        assert error.exception == msg
+
     def test_oserror(self, yaml, autoconfig):
         autoconfig.fobj.ensure()
         autoconfig.fobj.chmod(0)

From 9685445559e557eb5ce57694a501894a4045feb9 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 17:22:11 +0100
Subject: [PATCH 536/574] Fix issues with Python 3.5

---
 qutebrowser/config/config.py         | 2 +-
 tests/unit/config/test_config.py     | 2 +-
 tests/unit/config/test_configinit.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 95cd5723b..9b90562c4 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -447,7 +447,7 @@ class Config(QObject):
             The changed config part as string.
         """
         blocks = []
-        for values in self:
+        for values in sorted(self, key=lambda v: v.opt.name):
             if values:
                 blocks.append(str(values))
 
diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
index 66176b6ac..4be4d8dec 100644
--- a/tests/unit/config/test_config.py
+++ b/tests/unit/config/test_config.py
@@ -530,7 +530,7 @@ class TestConfig:
         """Make sure mutable types are only copied once."""
         spy = mocker.spy(config.copy, 'deepcopy')
         conf.get_mutable_obj('bindings.commands')
-        spy.assert_called_once()
+        spy.assert_called_once_with(mocker.ANY)
 
     def test_get_obj_for_pattern(self, conf):
         pattern = urlmatch.UrlPattern('*://example.com')
diff --git a/tests/unit/config/test_configinit.py b/tests/unit/config/test_configinit.py
index c139ff6b9..e7d217d8e 100644
--- a/tests/unit/config/test_configinit.py
+++ b/tests/unit/config/test_configinit.py
@@ -186,8 +186,8 @@ class TestEarlyInit:
 
         if config_py and load_autoconfig and not invalid_yaml:
             expected = [
-                'colors.hints.fg = magenta',
                 'colors.hints.bg = red',
+                'colors.hints.fg = magenta',
             ]
         elif config_py:
             expected = ['colors.hints.bg = red']

From f8b1e7739da4253fd2bba3efe1d430b86eeffc4f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 17:23:24 +0100
Subject: [PATCH 537/574] Update docs

---
 doc/help/commands.asciidoc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 9580fe578..0cd16259a 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -274,7 +274,8 @@ Set all settings back to their default.
 
 [[config-cycle]]
 === config-cycle
-Syntax: +:config-cycle [*--temp*] [*--print*] 'option' ['values' ['values' ...]]+
+Syntax: +:config-cycle [*--url* 'url'] [*--temp*] [*--print*]
+             'option' ['values' ['values' ...]]+
 
 Cycle an option between multiple values.
 
@@ -283,6 +284,7 @@ Cycle an option between multiple values.
 * +'values'+: The values to cycle through.
 
 ==== optional arguments
+* +*-u*+, +*--url*+: The URL pattern to use.
 * +*-t*+, +*--temp*+: Set value temporarily until qutebrowser is closed.
 * +*-p*+, +*--print*+: Print the value after setting.
 
@@ -1110,7 +1112,7 @@ Save a session.
 
 [[set]]
 === set
-Syntax: +:set [*--temp*] [*--print*] ['option'] ['value']+
+Syntax: +:set [*--temp*] [*--print*] [*--url* 'url'] ['option'] ['value']+
 
 Set an option.
 
@@ -1123,6 +1125,7 @@ If the option name ends with '?', the value of the option is shown instead. Usin
 ==== optional arguments
 * +*-t*+, +*--temp*+: Set value temporarily until qutebrowser is closed.
 * +*-p*+, +*--print*+: Print the value after setting.
+* +*-u*+, +*--url*+: The URL pattern to use.
 
 [[set-cmd-text]]
 === set-cmd-text

From a3dfec20c18c87da8f49c991bb24c8953ce15730 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 17:55:40 +0100
Subject: [PATCH 538/574] Rename --url to --pattern

---
 doc/help/commands.asciidoc               |  8 ++++----
 qutebrowser/config/configcommands.py     | 24 +++++++++++++-----------
 tests/unit/config/test_configcommands.py |  4 ++--
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 0cd16259a..58dfaaa16 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -274,7 +274,7 @@ Set all settings back to their default.
 
 [[config-cycle]]
 === config-cycle
-Syntax: +:config-cycle [*--url* 'url'] [*--temp*] [*--print*]
+Syntax: +:config-cycle [*--pattern* 'pattern'] [*--temp*] [*--print*]
              'option' ['values' ['values' ...]]+
 
 Cycle an option between multiple values.
@@ -284,7 +284,7 @@ Cycle an option between multiple values.
 * +'values'+: The values to cycle through.
 
 ==== optional arguments
-* +*-u*+, +*--url*+: The URL pattern to use.
+* +*-u*+, +*--pattern*+: The URL pattern to use.
 * +*-t*+, +*--temp*+: Set value temporarily until qutebrowser is closed.
 * +*-p*+, +*--print*+: Print the value after setting.
 
@@ -1112,7 +1112,7 @@ Save a session.
 
 [[set]]
 === set
-Syntax: +:set [*--temp*] [*--print*] [*--url* 'url'] ['option'] ['value']+
+Syntax: +:set [*--temp*] [*--print*] [*--pattern* 'pattern'] ['option'] ['value']+
 
 Set an option.
 
@@ -1125,7 +1125,7 @@ If the option name ends with '?', the value of the option is shown instead. Usin
 ==== optional arguments
 * +*-t*+, +*--temp*+: Set value temporarily until qutebrowser is closed.
 * +*-p*+, +*--print*+: Print the value after setting.
-* +*-u*+, +*--url*+: The URL pattern to use.
+* +*-u*+, +*--pattern*+: The URL pattern to use.
 
 [[set-cmd-text]]
 === set-cmd-text
diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py
index 3e55cbd57..1c1b1c686 100644
--- a/qutebrowser/config/configcommands.py
+++ b/qutebrowser/config/configcommands.py
@@ -47,16 +47,16 @@ class ConfigCommands:
         except configexc.Error as e:
             raise cmdexc.CommandError(str(e))
 
-    def _parse_pattern(self, url):
-        """Parse an URL argument to a pattern."""
-        if url is None:
+    def _parse_pattern(self, pattern):
+        """Parse a pattern string argument to a pattern."""
+        if pattern is None:
             return None
 
         try:
-            return urlmatch.UrlPattern(url)
+            return urlmatch.UrlPattern(pattern)
         except urlmatch.ParseError as e:
             raise cmdexc.CommandError("Error while parsing {}: {}"
-                                      .format(url, str(e)))
+                                      .format(pattern, str(e)))
 
     def _print_value(self, option, pattern):
         """Print the value of the given option."""
@@ -68,8 +68,9 @@ class ConfigCommands:
     @cmdutils.argument('option', completion=configmodel.option)
     @cmdutils.argument('value', completion=configmodel.value)
     @cmdutils.argument('win_id', win_id=True)
+    @cmdutils.argument('pattern', flag='u')
     def set(self, win_id, option=None, value=None, temp=False, print_=False,
-            *, url=None):
+            *, pattern=None):
         """Set an option.
 
         If the option name ends with '?', the value of the option is shown
@@ -81,7 +82,7 @@ class ConfigCommands:
         Args:
             option: The name of the option.
             value: The value to set.
-            url: The URL pattern to use.
+            pattern: The URL pattern to use.
             temp: Set value temporarily until qutebrowser is closed.
             print_: Print the value after setting.
         """
@@ -95,7 +96,7 @@ class ConfigCommands:
             raise cmdexc.CommandError("Toggling values was moved to the "
                                       ":config-cycle command")
 
-        pattern = self._parse_pattern(url)
+        pattern = self._parse_pattern(pattern)
 
         if option.endswith('?') and option != '?':
             self._print_value(option[:-1], pattern=pattern)
@@ -177,18 +178,19 @@ class ConfigCommands:
     @cmdutils.register(instance='config-commands', star_args_optional=True)
     @cmdutils.argument('option', completion=configmodel.option)
     @cmdutils.argument('values', completion=configmodel.value)
-    def config_cycle(self, option, *values, url=None, temp=False,
+    @cmdutils.argument('pattern', flag='u')
+    def config_cycle(self, option, *values, pattern=None, temp=False,
                      print_=False):
         """Cycle an option between multiple values.
 
         Args:
             option: The name of the option.
             values: The values to cycle through.
-            url: The URL pattern to use.
+            pattern: The URL pattern to use.
             temp: Set value temporarily until qutebrowser is closed.
             print_: Print the value after setting.
         """
-        pattern = self._parse_pattern(url)
+        pattern = self._parse_pattern(pattern)
 
         with self._handle_config_error():
             opt = self._config.get_opt(option)
diff --git a/tests/unit/config/test_configcommands.py b/tests/unit/config/test_configcommands.py
index 5da8d36d1..8d48c94f2 100644
--- a/tests/unit/config/test_configcommands.py
+++ b/tests/unit/config/test_configcommands.py
@@ -90,7 +90,7 @@ class TestSet:
         monkeypatch.setattr(objects, 'backend', usertypes.Backend.QtWebKit)
         option = 'content.javascript.enabled'
 
-        commands.set(0, option, 'false', url='*://example.com')
+        commands.set(0, option, 'false', pattern='*://example.com')
         pattern = urlmatch.UrlPattern('*://example.com')
 
         assert config_stub.get(option)
@@ -102,7 +102,7 @@ class TestSet:
 
         with pytest.raises(cmdexc.CommandError,
                            match='Error while parsing :/: No scheme given'):
-            commands.set(0, option, 'false', url=':/')
+            commands.set(0, option, 'false', pattern=':/')
 
     @pytest.mark.parametrize('temp', [True, False])
     def test_set_temp_override(self, commands, config_stub, yaml_value, temp):

From 3ade923edb132e17e443ab805ba2412c20298e21 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 18:43:42 +0100
Subject: [PATCH 539/574] Add basic pattern support for config.py

---
 qutebrowser/config/configfiles.py     | 24 +++++++----
 tests/unit/config/test_configfiles.py | 62 ++++++++++++++++++++++++++-
 2 files changed, 77 insertions(+), 9 deletions(-)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 9d76d4ee5..622e116fd 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -33,7 +33,7 @@ from PyQt5.QtCore import pyqtSignal, QObject, QSettings
 
 import qutebrowser
 from qutebrowser.config import configexc, config, configdata, configutils
-from qutebrowser.utils import standarddir, utils, qtutils, log
+from qutebrowser.utils import standarddir, utils, qtutils, log, urlmatch
 
 
 # The StateConfig instance
@@ -308,6 +308,9 @@ class ConfigAPI:
         except configexc.Error as e:
             text = "While {} '{}'".format(action, name)
             self.errors.append(configexc.ConfigErrorDesc(text, e))
+        except urlmatch.ParseError as e:
+            text = "While {} '{}' and parsing pattern".format(action, name)
+            self.errors.append(configexc.ConfigErrorDesc(text, e))
 
     def finalize(self):
         """Do work which needs to be done after reading config.py."""
@@ -317,13 +320,15 @@ class ConfigAPI:
         with self._handle_error('reading', 'autoconfig.yml'):
             read_autoconfig()
 
-    def get(self, name):
+    def get(self, name, pattern=None):
         with self._handle_error('getting', name):
-            return self._config.get_mutable_obj(name)
+            urlpattern = urlmatch.UrlPattern(pattern) if pattern else None
+            return self._config.get_mutable_obj(name, pattern=urlpattern)
 
-    def set(self, name, value):
+    def set(self, name, value, pattern=None):
         with self._handle_error('setting', name):
-            self._config.set_obj(name, value)
+            urlpattern = urlmatch.UrlPattern(pattern) if pattern else None
+            self._config.set_obj(name, value, pattern=urlpattern)
 
     def bind(self, key, command, mode='normal'):
         with self._handle_error('binding', key):
@@ -401,8 +406,7 @@ class ConfigPyWriter:
 
     def _gen_options(self):
         """Generate the options part of the config."""
-        # FIXME:conf handle _pattern
-        for _pattern, opt, value in self._options:
+        for pattern, opt, value in self._options:
             if opt.name in ['bindings.commands', 'bindings.default']:
                 continue
 
@@ -421,7 +425,11 @@ class ConfigPyWriter:
                     except KeyError:
                         yield self._line("#   - {}".format(val))
 
-            yield self._line('c.{} = {!r}'.format(opt.name, value))
+            if pattern is None:
+                yield self._line('c.{} = {!r}'.format(opt.name, value))
+            else:
+                yield self._line('config.set({!r}, {!r}, {!r})'.format(
+                    opt.name, value, str(pattern)))
             yield ''
 
     def _gen_bindings(self):
diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index eadddf39b..56ed1c635 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -28,7 +28,7 @@ from PyQt5.QtCore import QSettings
 
 from qutebrowser.config import (config, configfiles, configexc, configdata,
                                 configtypes)
-from qutebrowser.utils import utils, usertypes
+from qutebrowser.utils import utils, usertypes, urlmatch
 
 
 @pytest.fixture(autouse=True)
@@ -500,16 +500,29 @@ class TestConfigPy:
     @pytest.mark.parametrize('line', [
         'c.colors.hints.bg = "red"',
         'config.set("colors.hints.bg", "red")',
+        'config.set("colors.hints.bg", "red", pattern=None)',
     ])
     def test_set(self, confpy, line):
         confpy.write(line)
         confpy.read()
         assert config.instance.get_obj('colors.hints.bg') == 'red'
 
+    def test_set_with_pattern(self, confpy):
+        option = 'content.javascript.enabled'
+        pattern = 'https://www.example.com/'
+
+        confpy.write('config.set({!r}, False, {!r})'.format(option, pattern))
+        confpy.read()
+
+        assert config.instance.get_obj(option)
+        assert not config.instance.get_obj_for_pattern(
+            option, pattern=urlmatch.UrlPattern(pattern))
+
     @pytest.mark.parametrize('set_first', [True, False])
     @pytest.mark.parametrize('get_line', [
         'c.colors.hints.fg',
         'config.get("colors.hints.fg")',
+        'config.get("colors.hints.fg", pattern=None)',
     ])
     def test_get(self, confpy, set_first, get_line):
         """Test whether getting options works correctly."""
@@ -523,6 +536,24 @@ class TestConfigPy:
             confpy.write('assert {} == "green"'.format(get_line))
         confpy.read()
 
+    def test_get_with_pattern(self, confpy):
+        """Test whether we get a matching value with a pattern."""
+        option = 'content.javascript.enabled'
+        pattern = 'https://www.example.com/'
+        config.instance.set_obj(option, False,
+                                pattern=urlmatch.UrlPattern(pattern))
+        confpy.write('assert config.get({!r})'.format(option),
+                     'assert not config.get({!r}, pattern={!r})'
+                     .format(option, pattern))
+        confpy.read()
+
+    def test_get_with_pattern_no_match(self, confpy):
+        confpy.write(
+            'val = config.get("content.images", "https://www.example.com")',
+            'assert val is True',
+        )
+        confpy.read()
+
     @pytest.mark.parametrize('line, mode', [
         ('config.bind(",a", "message-info foo")', 'normal'),
         ('config.bind(",a", "message-info foo", "prompt")', 'prompt'),
@@ -672,6 +703,21 @@ class TestConfigPy:
                     "'qt.args')")
         assert str(error.exception) == expected
 
+    @pytest.mark.parametrize('line, action', [
+        ('config.get("content.images", "://")', 'getting'),
+        ('config.set("content.images", False, "://")', 'setting'),
+    ])
+    def test_invalid_pattern(self, confpy, line, action):
+        confpy.write(line)
+
+        error = confpy.read(error=True)
+
+        assert error.text == ("While {} 'content.images' and parsing pattern"
+                              .format(action))
+        assert isinstance(error.exception, urlmatch.ParseError)
+        assert str(error.exception) == "No scheme given"
+        assert error.traceback is None
+
     def test_multiple_errors(self, confpy):
         confpy.write("c.foo = 42", "config.set('foo', 42)", "1/0")
 
@@ -862,6 +908,20 @@ class TestConfigPyWriter:
         """).lstrip()
         assert text == expected
 
+    def test_pattern(self):
+        opt = configdata.Option(
+            name='opt', typ=configtypes.BoolAsk(), default='ask',
+            backends=[usertypes.Backend.QtWebEngine], raw_backends=None,
+            description='Hello World')
+        options = [
+            (urlmatch.UrlPattern('https://www.example.com/'), opt, 'ask'),
+        ]
+        writer = configfiles.ConfigPyWriter(options=options, bindings={},
+                                            commented=False)
+        text = '\n'.join(writer._gen_lines())
+        expected = "config.set('opt', 'ask', 'https://www.example.com/')"
+        assert expected in text
+
     def test_write(self, tmpdir):
         pyfile = tmpdir / 'config.py'
         writer = configfiles.ConfigPyWriter(options=[], bindings={},

From de38566c1104646899b9677e6c50cf166296979f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 18:43:51 +0100
Subject: [PATCH 540/574] Update configuring.asciidoc with per-domain settings

---
 doc/help/configuring.asciidoc | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/doc/help/configuring.asciidoc b/doc/help/configuring.asciidoc
index bb43e1dfe..1dcbbe9a6 100644
--- a/doc/help/configuring.asciidoc
+++ b/doc/help/configuring.asciidoc
@@ -63,6 +63,10 @@ customizable.
 Using the link:commands.html#set[`:set`] command and command completion, you
 can quickly set settings interactively, for example `:set tabs.position left`.
 
+Some settings are also customizable for a given
+https://developer.chrome.com/apps/match_patterns[URL pattern] by doing e.g.
+`:set --pattern=*://example.com/ content.images false`.
+
 To get more help about a setting, use e.g. `:help tabs.position`.
 
 To bind and unbind keys, you can use the link:commands.html#bind[`:bind`] and
@@ -147,7 +151,6 @@ prefix to preserve backslashes) or a Python regex object:
 If you want to read a setting, you can use the `c` object to do so as well:
 `c.colors.tabs.even.bg = c.colors.tabs.odd.bg`.
 
-
 Using strings for setting names
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -171,6 +174,17 @@ To read a setting, use the `config.get` method:
 color = config.get('colors.completion.fg')
 ----
 
+Per-domain settings
+~~~~~~~~~~~~~~~~~~~
+
+Using `config.set`, some settings are also customizable for a given
+https://developer.chrome.com/apps/match_patterns[URL pattern]:
+
+[source,python]
+----
+config.set('content.images', False, '*://example.com/')
+----
+
 Binding keys
 ~~~~~~~~~~~~
 

From 439d51875f2ec4fcef56eafef1740e7d0c865741 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 20:54:26 +0100
Subject: [PATCH 541/574] Add config.pattern()

---
 doc/help/configuring.asciidoc         |  9 ++++++++
 qutebrowser/config/config.py          | 16 +++++++++----
 qutebrowser/config/configfiles.py     | 10 ++++++++
 tests/unit/config/test_config.py      |  6 +++++
 tests/unit/config/test_configfiles.py | 33 +++++++++++++++++++--------
 5 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/doc/help/configuring.asciidoc b/doc/help/configuring.asciidoc
index 1dcbbe9a6..266315d56 100644
--- a/doc/help/configuring.asciidoc
+++ b/doc/help/configuring.asciidoc
@@ -185,6 +185,15 @@ https://developer.chrome.com/apps/match_patterns[URL pattern]:
 config.set('content.images', False, '*://example.com/')
 ----
 
+Alternatively, you can use `with config.pattern(...) as p:` to get a shortcut
+similar to `c.` which is scoped to the given domain:
+
+[source,python]
+----
+with config.pattern('*://example.com/') as p:
+    p.content.images = False
+----
+
 Binding keys
 ~~~~~~~~~~~~
 
diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 9b90562c4..010eeb3d5 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -466,16 +466,21 @@ class ConfigContainer:
         _prefix: The __getattr__ chain leading up to this object.
         _configapi: If given, get values suitable for config.py and
                     add errors to the given ConfigAPI object.
+        _pattern: The URL pattern to be used.
     """
 
-    def __init__(self, config, configapi=None, prefix=''):
+    def __init__(self, config, configapi=None, prefix='', pattern=None):
         self._config = config
         self._prefix = prefix
         self._configapi = configapi
+        self._pattern = pattern
+        if configapi is None and pattern is not None:
+            raise TypeError("Can't use pattern without configapi!")
 
     def __repr__(self):
         return utils.get_repr(self, constructor=True, config=self._config,
-                              configapi=self._configapi, prefix=self._prefix)
+                              configapi=self._configapi, prefix=self._prefix,
+                              pattern=self._pattern)
 
     @contextlib.contextmanager
     def _handle_error(self, action, name):
@@ -503,7 +508,7 @@ class ConfigContainer:
         if configdata.is_valid_prefix(name):
             return ConfigContainer(config=self._config,
                                    configapi=self._configapi,
-                                   prefix=name)
+                                   prefix=name, pattern=self._pattern)
 
         with self._handle_error('getting', name):
             if self._configapi is None:
@@ -511,7 +516,8 @@ class ConfigContainer:
                 return self._config.get(name)
             else:
                 # access from config.py
-                return self._config.get_mutable_obj(name)
+                return self._config.get_mutable_obj(
+                    name, pattern=self._pattern)
 
     def __setattr__(self, attr, value):
         """Set the given option in the config."""
@@ -521,7 +527,7 @@ class ConfigContainer:
 
         name = self._join(attr)
         with self._handle_error('setting', name):
-            self._config.set_obj(name, value)
+            self._config.set_obj(name, value, pattern=self._pattern)
 
     def _join(self, attr):
         """Get the prefix joined with the given attribute."""
diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 622e116fd..8b16c701a 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -348,6 +348,16 @@ class ConfigAPI:
         except configexc.ConfigFileErrors as e:
             self.errors += e.errors
 
+    @contextlib.contextmanager
+    def pattern(self, pattern):
+        """Get a ConfigContainer for the given pattern."""
+        # We need to propagate the exception so we don't need to return
+        # something.
+        urlpattern = urlmatch.UrlPattern(pattern)
+        container = config.ConfigContainer(config=self._config, configapi=self,
+                                           pattern=urlpattern)
+        yield container
+
 
 class ConfigPyWriter:
 
diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
index 4be4d8dec..095bfa78d 100644
--- a/tests/unit/config/test_config.py
+++ b/tests/unit/config/test_config.py
@@ -637,6 +637,12 @@ class TestContainer:
         assert error.text == "While getting 'tabs.foobar'"
         assert str(error.exception) == "No option 'tabs.foobar'"
 
+    def test_pattern_no_configapi(self, config_stub):
+        pattern = urlmatch.UrlPattern('https://example.com/')
+        with pytest.raises(TypeError,
+                           match="Can't use pattern without configapi!"):
+            config.ConfigContainer(config_stub, pattern=pattern)
+
 
 class StyleObj(QObject):
 
diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index 56ed1c635..0e173e8ff 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -507,17 +507,29 @@ class TestConfigPy:
         confpy.read()
         assert config.instance.get_obj('colors.hints.bg') == 'red'
 
-    def test_set_with_pattern(self, confpy):
+    @pytest.mark.parametrize('template', [
+        "config.set({opt!r}, False, {pattern!r})",
+        "with config.pattern({pattern!r}) as p: p.{opt} = False",
+    ])
+    def test_set_with_pattern(self, confpy, template):
         option = 'content.javascript.enabled'
         pattern = 'https://www.example.com/'
 
-        confpy.write('config.set({!r}, False, {!r})'.format(option, pattern))
+        confpy.write(template.format(opt=option, pattern=pattern))
         confpy.read()
 
         assert config.instance.get_obj(option)
         assert not config.instance.get_obj_for_pattern(
             option, pattern=urlmatch.UrlPattern(pattern))
 
+    def test_set_context_manager_global(self, confpy):
+        """When "with config.pattern" is used, "c." should still be global."""
+        option = 'content.javascript.enabled'
+        confpy.write('with config.pattern("https://www.example.com/") as p:'
+                     '    c.{} = False'.format(option))
+        confpy.read()
+        assert not config.instance.get_obj(option)
+
     @pytest.mark.parametrize('set_first', [True, False])
     @pytest.mark.parametrize('get_line', [
         'c.colors.hints.fg',
@@ -703,20 +715,21 @@ class TestConfigPy:
                     "'qt.args')")
         assert str(error.exception) == expected
 
-    @pytest.mark.parametrize('line, action', [
-        ('config.get("content.images", "://")', 'getting'),
-        ('config.set("content.images", False, "://")', 'setting'),
+    @pytest.mark.parametrize('line, text', [
+        ('config.get("content.images", "://")',
+         "While getting 'content.images' and parsing pattern"),
+        ('config.set("content.images", False, "://")',
+         "While setting 'content.images' and parsing pattern"),
+        ('with config.pattern("://"): pass',
+         "Unhandled exception"),
     ])
-    def test_invalid_pattern(self, confpy, line, action):
+    def test_invalid_pattern(self, confpy, line, text):
         confpy.write(line)
-
         error = confpy.read(error=True)
 
-        assert error.text == ("While {} 'content.images' and parsing pattern"
-                              .format(action))
+        assert error.text == text
         assert isinstance(error.exception, urlmatch.ParseError)
         assert str(error.exception) == "No scheme given"
-        assert error.traceback is None
 
     def test_multiple_errors(self, confpy):
         confpy.write("c.foo = 42", "config.set('foo', 42)", "1/0")

From 46aeb25e7eace7c53c1e4abec982b3f9d37c7d56 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 20:55:42 +0100
Subject: [PATCH 542/574] Fix lint

---
 tests/unit/utils/test_urlmatch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index bda8c6eb0..a89913456 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -396,7 +396,7 @@ def test_ignore_missing_slashes():
 def test_trailing_dot_domain(pattern, url):
     """Both patterns should match trailing dot and non trailing dot domains.
 
-    More information about this not obvious behaviour can be found in [1].
+    More information about this not obvious behavior can be found in [1].
 
     RFC 1738 [2] specifies clearly that the <host> part of a URL is supposed to
     contain a fully qualified domain name:

From 17b235b523427fe64a6343a67f90b5c723fdd478 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 22:29:21 +0100
Subject: [PATCH 543/574] Add error handling for parsing patterns from YAML

---
 qutebrowser/config/configfiles.py     | 24 ++++++++++++++++++++++--
 tests/unit/config/test_configfiles.py |  6 ++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 8b16c701a..11e059302 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -201,17 +201,37 @@ class YamlConfig(QObject):
 
     def _build_values(self, settings):
         """Build up self._values from the values in the given dict."""
+        errors = []
         for name, yaml_values in settings.items():
+            if not isinstance(yaml_values, dict):
+                errors.append(configexc.ConfigErrorDesc(
+                    "While parsing {!r}".format(name), "value is not a dict"))
+                continue
+
             values = configutils.Values(configdata.DATA[name])
             if 'global' in yaml_values:
                 values.add(yaml_values.pop('global'))
 
-            # FIXME:conf what if yaml_values is not a dict...
             for pattern, value in yaml_values.items():
-                values.add(value, pattern)
+                if not isinstance(pattern, str):
+                    errors.append(configexc.ConfigErrorDesc(
+                        "While parsing {!r}".format(name),
+                        "pattern is not of type string"))
+                    continue
+                try:
+                    urlpattern = urlmatch.UrlPattern(pattern)
+                except urlmatch.ParseError as e:
+                    errors.append(configexc.ConfigErrorDesc(
+                        "While parsing pattern {!r} for {!r}"
+                        .format(pattern, name), e))
+                    continue
+                values.add(value, urlpattern)
 
             self._values[name] = values
 
+        if errors:
+            raise configexc.ConfigFileErrors('autoconfig.yml', errors)
+
     def _handle_migrations(self, settings):
         """Migrate older configs to the newest format."""
         # Simple renamed/deleted options
diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index 0e173e8ff..728dbb794 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -297,6 +297,12 @@ class TestYaml:
         ('settings: {}', 'While loading data',
          "Toplevel object does not contain 'config_version' key"),
         ('42', 'While loading data', "Toplevel object is not a dict"),
+        ('settings: {"content.images": 42}\nconfig_version: 2',
+         "While parsing 'content.images'", "value is not a dict"),
+        ('settings: {"content.images": {"https://": true}}\nconfig_version: 2',
+         "While parsing pattern 'https://' for 'content.images'", "Pattern without host"),
+        ('settings: {"content.images": {true: true}}\nconfig_version: 2',
+         "While parsing 'content.images'", "pattern is not of type string"),
     ])
     def test_invalid(self, yaml, autoconfig, line, text, exception):
         autoconfig.write_raw(line)

From 18848315f5b810002dcdccbec6a1e43eb15531ef Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 22:45:16 +0100
Subject: [PATCH 544/574] urlmatch: Make it possible to leave off trailing
 slash

---
 qutebrowser/utils/urlmatch.py     | 8 +++++++-
 tests/unit/utils/test_urlmatch.py | 7 +++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py
index 6bded760b..0e83c7420 100644
--- a/qutebrowser/utils/urlmatch.py
+++ b/qutebrowser/utils/urlmatch.py
@@ -141,7 +141,13 @@ class UrlPattern:
         if self._scheme == 'about' and not parsed.path.strip():
             raise ParseError("Pattern without path")
 
-        self._path = None if parsed.path == '/*' else parsed.path
+        if parsed.path == '/*':
+            self._path = None
+        elif parsed.path == '':
+            # We want to make it possible to leave off a trailing slash.
+            self._path = '/'
+        else:
+            self._path = parsed.path
 
     def _init_host(self, parsed):
         """Parse the host from the given URL.
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index a89913456..9622d7794 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -389,6 +389,13 @@ def test_ignore_missing_slashes():
     assert not pattern1.matches(url2)
 
 
+def test_trailing_slash():
+    """Contrary to Chromium, we allow to leave off a trailing slash."""
+    url = QUrl('http://www.example.com/')
+    pattern = urlmatch.UrlPattern('http://www.example.com')
+    assert pattern.matches(url)
+
+
 @pytest.mark.parametrize('pattern', ['*://example.com/*',
                                      '*://example.com./*'])
 @pytest.mark.parametrize('url', ['http://example.com/',

From 5fbd488fdf56eca8e5eaa87fe93e9137e30a0d24 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 22:45:29 +0100
Subject: [PATCH 545/574] Only change settings for main-frame navigations

---
 qutebrowser/browser/webengine/webenginetab.py | 2 +-
 qutebrowser/browser/webkit/webkittab.py       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index fdabb195a..e047c9d1e 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -875,7 +875,7 @@ class WebEngineTab(browsertab.AbstractTab):
     @pyqtSlot(usertypes.NavigationRequest)
     def _on_navigation_request(self, navigation):
         super()._on_navigation_request(navigation)
-        if navigation.accepted:
+        if navigation.accepted and navigation.is_main_frame:
             webenginesettings.update_for_tab(self, navigation.url)
 
     def _connect_signals(self):
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 815dbd286..73a2f2648 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -784,7 +784,7 @@ class WebKitTab(browsertab.AbstractTab):
             self.data.open_target = usertypes.ClickTarget.normal
             navigation.accepted = False
 
-        if navigation.navigation_type != navigation.Type.reloaded:
+        if navigation.is_main_frame:
             webkitsettings.update_for_tab(self, navigation.url)
 
     def _connect_signals(self):

From 6c5876a494fbd6de4eb50f0e96acf9eab39af716 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 23:08:09 +0100
Subject: [PATCH 546/574] Fix tests broken by urlmatch trailing slash change

---
 tests/unit/config/test_config.py      | 4 ++--
 tests/unit/config/test_configutils.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
index 095bfa78d..46559bffa 100644
--- a/tests/unit/config/test_config.py
+++ b/tests/unit/config/test_config.py
@@ -411,10 +411,10 @@ class TestConfig:
 
     def test_get_for_url(self, conf):
         """Test conf.get() with an URL/pattern."""
-        pattern = urlmatch.UrlPattern('*://example.com')
+        pattern = urlmatch.UrlPattern('*://example.com/')
         name = 'content.javascript.enabled'
         conf.set_obj(name, False, pattern=pattern)
-        assert conf.get(name, url=QUrl('https://example.com/')) is True
+        assert conf.get(name, url=QUrl('https://example.com/')) is False
 
     @pytest.mark.parametrize('value', [{}, {'normal': {'a': 'nop'}}])
     def test_get_bindings(self, config_stub, conf, value):
diff --git a/tests/unit/config/test_configutils.py b/tests/unit/config/test_configutils.py
index ef91b13ee..0793b8271 100644
--- a/tests/unit/config/test_configutils.py
+++ b/tests/unit/config/test_configutils.py
@@ -201,7 +201,7 @@ def test_get_non_matching_fallback_pattern(values, other_pattern):
 def test_get_equivalent_patterns(empty_values):
     """With multiple matching pattern, the last added should win."""
     pat1 = urlmatch.UrlPattern('https://www.example.com/')
-    pat2 = urlmatch.UrlPattern('https://www.example.com')
+    pat2 = urlmatch.UrlPattern('*://www.example.com/')
     empty_values.add('pat1 value', pat1)
     empty_values.add('pat2 value', pat2)
 

From 0d4e20c39529a3ec180870e1f7662efca1724845 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 23:21:24 +0100
Subject: [PATCH 547/574] Whitelist config options which support URL patterns

---
 doc/help/settings.asciidoc               | 40 ++++++++++++++++++++++++
 qutebrowser/config/config.py             |  1 +
 qutebrowser/config/configdata.py         |  8 +++--
 qutebrowser/config/configdata.yml        | 20 ++++++++++++
 qutebrowser/config/configexc.py          |  9 ++++++
 qutebrowser/config/configutils.py        | 10 ++++++
 qutebrowser/config/websettings.py        |  8 ++---
 scripts/dev/src2asciidoc.py              |  2 ++
 tests/unit/config/test_config.py         |  8 +++++
 tests/unit/config/test_configcommands.py | 10 ++++++
 tests/unit/config/test_configexc.py      |  6 ++++
 tests/unit/config/test_configutils.py    |  3 +-
 12 files changed, 117 insertions(+), 8 deletions(-)

diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 3826e6e84..eebdc5072 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -1447,6 +1447,8 @@ Default:
 Enable support for the HTML 5 web application cache feature.
 An application cache acts like an HTTP cache in some sense. For documents that use the application cache via JavaScript, the loader engine will first ask the application cache for the contents, before hitting the network.
 
+This setting supports URL patterns.
+
 Type: <<types,Bool>>
 
 Default: +pass:[true]+
@@ -1524,6 +1526,8 @@ This setting is only available with the QtWebKit backend.
 === content.dns_prefetch
 Try to pre-fetch DNS entries to speed up browsing.
 
+This setting supports URL patterns.
+
 Type: <<types,Bool>>
 
 Default: +pass:[true]+
@@ -1535,6 +1539,8 @@ This setting is only available with the QtWebKit backend.
 Expand each subframe to its contents.
 This will flatten all the frames to become one scrollable page.
 
+This setting supports URL patterns.
+
 Type: <<types,Bool>>
 
 Default: +pass:[false]+
@@ -1651,6 +1657,8 @@ Default:
 === content.hyperlink_auditing
 Enable hyperlink auditing (`<a ping>`).
 
+This setting supports URL patterns.
+
 Type: <<types,Bool>>
 
 Default: +pass:[false]+
@@ -1659,6 +1667,8 @@ Default: +pass:[false]+
 === content.images
 Load images automatically in web pages.
 
+This setting supports URL patterns.
+
 Type: <<types,Bool>>
 
 Default: +pass:[true]+
@@ -1676,6 +1686,8 @@ Default: +pass:[true]+
 Allow JavaScript to read from or write to the clipboard.
 With QtWebEngine, writing the clipboard as response to a user interaction is always allowed.
 
+This setting supports URL patterns.
+
 Type: <<types,Bool>>
 
 Default: +pass:[false]+
@@ -1684,6 +1696,8 @@ Default: +pass:[false]+
 === content.javascript.can_close_tabs
 Allow JavaScript to close tabs.
 
+This setting supports URL patterns.
+
 Type: <<types,Bool>>
 
 Default: +pass:[false]+
@@ -1694,6 +1708,8 @@ This setting is only available with the QtWebKit backend.
 === content.javascript.can_open_tabs_automatically
 Allow JavaScript to open new tabs without user interaction.
 
+This setting supports URL patterns.
+
 Type: <<types,Bool>>
 
 Default: +pass:[false]+
@@ -1702,6 +1718,8 @@ Default: +pass:[false]+
 === content.javascript.enabled
 Enable JavaScript.
 
+This setting supports URL patterns.
+
 Type: <<types,Bool>>
 
 Default: +pass:[true]+
@@ -1741,6 +1759,8 @@ Default: +pass:[true]+
 === content.local_content_can_access_file_urls
 Allow locally loaded documents to access other local URLs.
 
+This setting supports URL patterns.
+
 Type: <<types,Bool>>
 
 Default: +pass:[true]+
@@ -1749,6 +1769,8 @@ Default: +pass:[true]+
 === content.local_content_can_access_remote_urls
 Allow locally loaded documents to access remote URLs.
 
+This setting supports URL patterns.
+
 Type: <<types,Bool>>
 
 Default: +pass:[false]+
@@ -1757,6 +1779,8 @@ Default: +pass:[false]+
 === content.local_storage
 Enable support for HTML 5 local storage and Web SQL.
 
+This setting supports URL patterns.
+
 Type: <<types,Bool>>
 
 Default: +pass:[true]+
@@ -1817,6 +1841,8 @@ This setting is only available with the QtWebKit backend.
 === content.plugins
 Enable plugins in Web pages.
 
+This setting supports URL patterns.
+
 Type: <<types,Bool>>
 
 Default: +pass:[false]+
@@ -1825,6 +1851,8 @@ Default: +pass:[false]+
 === content.print_element_backgrounds
 Draw the background color and images also when the page is printed.
 
+This setting supports URL patterns.
+
 Type: <<types,Bool>>
 
 Default: +pass:[true]+
@@ -1889,6 +1917,8 @@ Default: empty
 === content.webgl
 Enable WebGL.
 
+This setting supports URL patterns.
+
 Type: <<types,Bool>>
 
 Default: +pass:[true]+
@@ -1906,6 +1936,8 @@ Default: +pass:[false]+
 Monitor load requests for cross-site scripting attempts.
 Suspicious scripts will be blocked and reported in the inspector's JavaScript console. Enabling this feature might have an impact on performance.
 
+This setting supports URL patterns.
+
 Type: <<types,Bool>>
 
 Default: +pass:[false]+
@@ -2379,6 +2411,8 @@ Default: +pass:[false]+
 === input.links_included_in_focus_chain
 Include hyperlinks in the keyboard focus chain when tabbing.
 
+This setting supports URL patterns.
+
 Type: <<types,Bool>>
 
 Default: +pass:[true]+
@@ -2406,6 +2440,8 @@ Default: +pass:[false]+
 Enable spatial navigation.
 Spatial navigation consists in the ability to navigate between focusable elements in a Web page, such as hyperlinks and form controls, by using Left, Right, Up and Down arrow keys. For example, if the user presses the Right key, heuristics determine whether there is an element he might be trying to reach towards the right and which element he probably wants.
 
+This setting supports URL patterns.
+
 Type: <<types,Bool>>
 
 Default: +pass:[false]+
@@ -2550,6 +2586,8 @@ Default: +pass:[false]+
 Enable smooth scrolling for web pages.
 Note smooth scrolling does not work with the `:scroll-px` command.
 
+This setting supports URL patterns.
+
 Type: <<types,Bool>>
 
 Default: +pass:[false]+
@@ -3137,6 +3175,8 @@ Default: +pass:[512]+
 === zoom.text_only
 Apply the zoom factor on a frame only to the text or to all content.
 
+This setting supports URL patterns.
+
 Type: <<types,Bool>>
 
 Default: +pass:[false]+
diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 010eeb3d5..33e04a90d 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -280,6 +280,7 @@ class Config(QObject):
                 raise configexc.BackendError(opt.name, objects.backend)
 
         opt.typ.to_py(value)  # for validation
+
         self._values[opt.name].add(opt.typ.from_obj(value), pattern)
 
         self.changed.emit(opt.name)
diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py
index 3e0a6d8b1..52ad123e1 100644
--- a/qutebrowser/config/configdata.py
+++ b/qutebrowser/config/configdata.py
@@ -48,6 +48,7 @@ class Option:
     backends = attr.ib()
     raw_backends = attr.ib()
     description = attr.ib()
+    supports_pattern = attr.ib(default=False)
     restart = attr.ib(default=False)
 
 
@@ -197,7 +198,8 @@ def _read_yaml(yaml_data):
     migrations = Migrations()
     data = utils.yaml_load(yaml_data)
 
-    keys = {'type', 'default', 'desc', 'backend', 'restart'}
+    keys = {'type', 'default', 'desc', 'backend', 'restart',
+            'supports_pattern'}
 
     for name, option in data.items():
         if set(option.keys()) == {'renamed'}:
@@ -223,7 +225,9 @@ def _read_yaml(yaml_data):
             backends=_parse_yaml_backends(name, backends),
             raw_backends=backends if isinstance(backends, dict) else None,
             description=option['desc'],
-            restart=option.get('restart', False))
+            restart=option.get('restart', False),
+            supports_pattern=option.get('supports_pattern', False),
+        )
 
     # Make sure no key shadows another.
     for key1 in parsed:
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 72450978b..2228bc1b4 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -240,6 +240,7 @@ content.cache.appcache:
   default: true
   type: Bool
   backend: QtWebKit
+  supports_pattern: true
   desc: >-
     Enable support for the HTML 5 web application cache feature.
 
@@ -298,12 +299,14 @@ content.dns_prefetch:
   default: true
   type: Bool
   backend: QtWebKit
+  supports_pattern: true
   desc: Try to pre-fetch DNS entries to speed up browsing.
 
 content.frame_flattening:
   default: false
   type: Bool
   backend: QtWebKit
+  supports_pattern: true
   desc: >-
     Expand each subframe to its contents.
 
@@ -459,12 +462,14 @@ content.host_blocking.whitelist:
 content.hyperlink_auditing:
   default: false
   type: Bool
+  supports_pattern: true
   desc: Enable hyperlink auditing (`<a ping>`).
 
 content.images:
   default: true
   type: Bool
   desc: Load images automatically in web pages.
+  supports_pattern: true
 
 content.javascript.alert:
   default: true
@@ -474,6 +479,7 @@ content.javascript.alert:
 content.javascript.can_access_clipboard:
   default: false
   type: Bool
+  supports_pattern: true
   desc: >-
     Allow JavaScript to read from or write to the clipboard.
 
@@ -484,16 +490,19 @@ content.javascript.can_close_tabs:
   default: false
   type: Bool
   backend: QtWebKit
+  supports_pattern: true
   desc: Allow JavaScript to close tabs.
 
 content.javascript.can_open_tabs_automatically:
   default: false
   type: Bool
+  supports_pattern: true
   desc: Allow JavaScript to open new tabs without user interaction.
 
 content.javascript.enabled:
   default: true
   type: Bool
+  supports_pattern: true
   desc: Enable JavaScript.
 
 content.javascript.log:
@@ -536,16 +545,19 @@ content.javascript.prompt:
 content.local_content_can_access_remote_urls:
   default: false
   type: Bool
+  supports_pattern: true
   desc: Allow locally loaded documents to access remote URLs.
 
 content.local_content_can_access_file_urls:
   default: true
   type: Bool
+  supports_pattern: true
   desc: Allow locally loaded documents to access other local URLs.
 
 content.local_storage:
   default: true
   type: Bool
+  supports_pattern: true
   desc: Enable support for HTML 5 local storage and Web SQL.
 
 content.media_capture:
@@ -583,6 +595,7 @@ content.pdfjs:
 content.plugins:
   default: false
   type: Bool
+  supports_pattern: true
   desc: Enable plugins in Web pages.
 
 content.print_element_backgrounds:
@@ -591,6 +604,7 @@ content.print_element_backgrounds:
   backend:
     QtWebKit: true
     QtWebEngine: Qt 5.8
+  supports_pattern: true
   desc: >-
     Draw the background color and images also when the page is printed.
 
@@ -631,11 +645,13 @@ content.user_stylesheets:
 content.webgl:
   default: true
   type: Bool
+  supports_pattern: true
   desc: Enable WebGL.
 
 content.xss_auditing:
   type: Bool
   default: false
+  supports_pattern: true
   desc: >-
     Monitor load requests for cross-site scripting attempts.
 
@@ -978,6 +994,7 @@ input.insert_mode.plugins:
 input.links_included_in_focus_chain:
   default: true
   type: Bool
+  supports_pattern: true
   desc: Include hyperlinks in the keyboard focus chain when tabbing.
 
 input.partial_timeout:
@@ -1003,6 +1020,7 @@ input.rocker_gestures:
 input.spatial_navigation:
   default: false
   type: Bool
+  supports_pattern: true
   desc: >-
     Enable spatial navigation.
 
@@ -1083,6 +1101,7 @@ scrolling.bar:
 scrolling.smooth:
   type: Bool
   default: false
+  supports_pattern: true
   desc: >-
     Enable smooth scrolling for web pages.
 
@@ -1557,6 +1576,7 @@ zoom.text_only:
   type: Bool
   default: false
   backend: QtWebKit
+  supports_pattern: true
   desc: Apply the zoom factor on a frame only to the text or to all content.
 
 ## colors
diff --git a/qutebrowser/config/configexc.py b/qutebrowser/config/configexc.py
index 2067878b9..e08bec913 100644
--- a/qutebrowser/config/configexc.py
+++ b/qutebrowser/config/configexc.py
@@ -40,6 +40,15 @@ class BackendError(Error):
                          "backend!".format(name, backend.name))
 
 
+class NoPatternError(Error):
+
+    """Raised when the given setting does not support URL patterns."""
+
+    def __init__(self, name):
+        super().__init__("The {} setting does not support URL patterns!"
+                         .format(name))
+
+
 class ValidationError(Error):
 
     """Raised when a value for a config type was invalid.
diff --git a/qutebrowser/config/configutils.py b/qutebrowser/config/configutils.py
index 0d324bb47..96fc0f02d 100644
--- a/qutebrowser/config/configutils.py
+++ b/qutebrowser/config/configutils.py
@@ -24,6 +24,7 @@
 import attr
 
 from qutebrowser.utils import utils
+from qutebrowser.config import configexc
 
 
 class _UnsetObject:
@@ -107,8 +108,14 @@ class Values:
         """Check whether this value is customized."""
         return bool(self._values)
 
+    def _check_pattern_support(self, arg):
+        """Make sure patterns are supported if one was given."""
+        if arg is not None and not self.opt.supports_pattern:
+            raise configexc.NoPatternError(self.opt.name)
+
     def add(self, value, pattern=None):
         """Add a value with the given pattern to the list of values."""
+        self._check_pattern_support(pattern)
         self.remove(pattern)
         scoped = ScopedValue(value, pattern)
         self._values.append(scoped)
@@ -119,6 +126,7 @@ class Values:
         If a matching pattern was removed, True is returned.
         If no matching pattern was found, False is returned.
         """
+        self._check_pattern_support(pattern)
         old_len = len(self._values)
         self._values = [v for v in self._values if v.pattern != pattern]
         return old_len != len(self._values)
@@ -146,6 +154,7 @@ class Values:
           With fallback=True, the global/default setting is returned.
           With fallback=False, UNSET is returned.
         """
+        self._check_pattern_support(url)
         if url is not None:
             for scoped in reversed(self._values):
                 if scoped.pattern is not None and scoped.pattern.matches(url):
@@ -165,6 +174,7 @@ class Values:
           With fallback=True, the global/default setting is returned.
           With fallback=False, UNSET is returned.
         """
+        self._check_pattern_support(pattern)
         if pattern is not None:
             for scoped in reversed(self._values):
                 if scoped.pattern == pattern:
diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py
index 0f057d865..eb6c2ce49 100644
--- a/qutebrowser/config/websettings.py
+++ b/qutebrowser/config/websettings.py
@@ -225,8 +225,9 @@ def update_for_tab(mappings, tab, url):
     for values in config.instance:
         if values.opt.name not in mappings:
             continue
+        if not values.opt.supports_pattern:
+            continue
 
-        # FIXME:conf handle settings != None with global/static setters
         mapping = mappings[values.opt.name]
 
         value = values.get_for_url(url, fallback=False)
@@ -237,10 +238,7 @@ def update_for_tab(mappings, tab, url):
         settings = tab._widget.settings()  # pylint: disable=protected-access
 
         if value is configutils.UNSET:
-            try:
-                mapping.unset(settings=settings)
-            except NotImplementedError:
-                pass
+            mapping.unset(settings=settings)
         else:
             mapping.set(value, settings=settings)
 
diff --git a/scripts/dev/src2asciidoc.py b/scripts/dev/src2asciidoc.py
index 6307e3a5c..5fab901fc 100755
--- a/scripts/dev/src2asciidoc.py
+++ b/scripts/dev/src2asciidoc.py
@@ -419,6 +419,8 @@ def _generate_setting_option(f, opt):
     f.write(opt.description + "\n")
     if opt.restart:
         f.write("This setting requires a restart.\n")
+    if opt.supports_pattern:
+        f.write("\nThis setting supports URL patterns.\n")
     f.write("\n")
     typ = opt.typ.get_name().replace(',', '&#44;')
     f.write('Type: <<types,{typ}>>\n'.format(typ=typ))
diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
index 46559bffa..8a33cd393 100644
--- a/tests/unit/config/test_config.py
+++ b/tests/unit/config/test_config.py
@@ -581,6 +581,14 @@ class TestConfig:
                 meth('content.cookies.accept', 'all')
         assert not conf._values['content.cookies.accept']
 
+    @pytest.mark.parametrize('method', ['set_obj', 'set_str'])
+    def test_set_no_pattern(self, conf, method, qtbot):
+        meth = getattr(conf, method)
+        pattern = urlmatch.UrlPattern('https://www.example.com/')
+        with pytest.raises(configexc.NoPatternError):
+            with qtbot.assert_not_emitted(conf.changed):
+                meth('colors.statusbar.normal.bg', '#abcdef', pattern=pattern)
+
     def test_dump_userconfig(self, conf):
         conf.set_obj('content.plugins', True)
         conf.set_obj('content.headers.custom', {'X-Foo': 'bar'})
diff --git a/tests/unit/config/test_configcommands.py b/tests/unit/config/test_configcommands.py
index 8d48c94f2..27075e869 100644
--- a/tests/unit/config/test_configcommands.py
+++ b/tests/unit/config/test_configcommands.py
@@ -104,6 +104,16 @@ class TestSet:
                            match='Error while parsing :/: No scheme given'):
             commands.set(0, option, 'false', pattern=':/')
 
+    def test_set_no_pattern(self, monkeypatch, commands):
+        """Run ':set --pattern=*://* colors.statusbar.normal.bg #abcdef.
+
+        Should show an error as patterns are unsupported.
+        """
+        with pytest.raises(cmdexc.CommandError,
+                           match='does not support URL patterns'):
+            commands.set(0, 'colors.statusbar.normal.bg', '#abcdef',
+                         pattern='*://*')
+
     @pytest.mark.parametrize('temp', [True, False])
     def test_set_temp_override(self, commands, config_stub, yaml_value, temp):
         """Invoking :set twice.
diff --git a/tests/unit/config/test_configexc.py b/tests/unit/config/test_configexc.py
index 87f3abb6a..c41e02b4c 100644
--- a/tests/unit/config/test_configexc.py
+++ b/tests/unit/config/test_configexc.py
@@ -54,6 +54,12 @@ def test_backend_error():
     assert str(e) == expected
 
 
+def test_no_pattern_error():
+    e = configexc.NoPatternError('foo')
+    expected = "The foo setting does not support URL patterns!"
+    assert str(e) == expected
+
+
 def test_desc_with_text():
     """Test ConfigErrorDesc.with_text."""
     old = configexc.ConfigErrorDesc("Error text", Exception("Exception text"))
diff --git a/tests/unit/config/test_configutils.py b/tests/unit/config/test_configutils.py
index 0793b8271..587a0bd68 100644
--- a/tests/unit/config/test_configutils.py
+++ b/tests/unit/config/test_configutils.py
@@ -38,7 +38,8 @@ def test_unset_object_repr():
 def opt():
     return configdata.Option(name='example.option', typ=configtypes.String(),
                              default='default value', backends=None,
-                             raw_backends=None, description=None)
+                             raw_backends=None, description=None,
+                             supports_pattern=True)
 
 
 @pytest.fixture

From ea6a5de374ebf0083f70b5b563bd460b03f01d3a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 20 Feb 2018 23:28:11 +0100
Subject: [PATCH 548/574] Update FIXMEs

---
 tests/unit/utils/test_urlmatch.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index 9622d7794..9cad6033b 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -55,8 +55,8 @@ from qutebrowser.utils import urlmatch
     ("http:// /", "Pattern without host"),
 
     # Chromium: PARSE_ERROR_EMPTY_PATH
-    # FIXME: should we allow this or not?
-    # ("http://bar", "URLPattern::"),
+    # We deviate from Chromium and allow this for ease of use
+    # ("http://bar", "..."),
 
     # Chromium: PARSE_ERROR_INVALID_HOST
     ("http://\0www/", "May not contain NUL byte"),
@@ -94,7 +94,7 @@ def test_invalid_patterns(pattern, error):
     ("http://foo:1234/bar", 1234),
     ("http://*.foo:1234/", 1234),
     ("http://*.foo:1234/bar", 1234),
-    # FIXME Why is this valid in Chromium?
+    # https://bugs.chromium.org/p/chromium/issues/detail?id=812543
     # ("http://:1234/", 1234),
     ("http://foo:*/", None),
     ("file://foo:1234/bar", None),

From cfeeb7460b12a3aa930e1ceb0b4f39ee12f2dd86 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 21 Feb 2018 09:14:49 +0100
Subject: [PATCH 549/574] Add docstrings to ConfigAPI

---
 qutebrowser/config/configfiles.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 11e059302..ba43e5015 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -319,6 +319,7 @@ class ConfigAPI:
 
     @contextlib.contextmanager
     def _handle_error(self, action, name):
+        """Catch config-related exceptions and save them in self.errors."""
         try:
             yield
         except configexc.ConfigFileErrors as e:
@@ -337,24 +338,29 @@ class ConfigAPI:
         self._config.update_mutables()
 
     def load_autoconfig(self):
+        """Load the autoconfig.yml file which is used for :set/:bind/etc."""
         with self._handle_error('reading', 'autoconfig.yml'):
             read_autoconfig()
 
     def get(self, name, pattern=None):
+        """Get a setting value from the config, optionally with a pattern."""
         with self._handle_error('getting', name):
             urlpattern = urlmatch.UrlPattern(pattern) if pattern else None
             return self._config.get_mutable_obj(name, pattern=urlpattern)
 
     def set(self, name, value, pattern=None):
+        """Set a setting value in the config, optionally with a pattern."""
         with self._handle_error('setting', name):
             urlpattern = urlmatch.UrlPattern(pattern) if pattern else None
             self._config.set_obj(name, value, pattern=urlpattern)
 
     def bind(self, key, command, mode='normal'):
+        """Bind a key to a command, with an optional key mode."""
         with self._handle_error('binding', key):
             self._keyconfig.bind(key, command, mode=mode)
 
     def unbind(self, key, mode='normal'):
+        """Unbind a key from a command, with an optional key mode."""
         with self._handle_error('unbinding', key):
             self._keyconfig.unbind(key, mode=mode)
 

From 13bd4dd05dde3c11332f51db912ca73340e4f28d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 21 Feb 2018 10:49:42 +0100
Subject: [PATCH 550/574] Clean up version.pastebin_url in pbclient fixture

---
 tests/unit/utils/test_version.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py
index eff67dcd8..2f6aa648f 100644
--- a/tests/unit/utils/test_version.py
+++ b/tests/unit/utils/test_version.py
@@ -957,7 +957,8 @@ def test_opengl_vendor():
 def pbclient(stubs):
     http_stub = stubs.HTTPPostStub()
     client = pastebin.PastebinClient(http_stub)
-    return client
+    yield client
+    version.pastebin_url = None
 
 
 def test_pastebin_version(pbclient, message_mock, monkeypatch, qtbot):
@@ -973,8 +974,6 @@ def test_pastebin_version(pbclient, message_mock, monkeypatch, qtbot):
     assert msg.text == "Version url test yanked to clipboard."
     assert version.pastebin_url == "test"
 
-    version.pastebin_url = None
-
 
 def test_pastebin_version_twice(pbclient, monkeypatch):
     """Test whether calling pastebin_version twice sends no data."""
@@ -993,8 +992,6 @@ def test_pastebin_version_twice(pbclient, monkeypatch):
     assert pbclient.data is None
     assert version.pastebin_url == "test2"
 
-    version.pastebin_url = None
-
 
 def test_pastebin_version_error(pbclient, caplog, message_mock, monkeypatch):
     """Test version.pastebin_version() with errors."""

From ada15510a7d325cb949b9b38c4fe08a304b37e22 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 21 Feb 2018 11:07:55 +0100
Subject: [PATCH 551/574] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 66d22ddca..2f1a1f1db 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -67,6 +67,7 @@ Changed
   input modes (input/passthrough) per tab.
 - More performance improvements when opening/closing many tabs.
 - The `:version` page now has a button to pastebin the information.
+- Replacements like `{url}` can now be replaced as `{{url}}`.
 
 Fixed
 ~~~~~

From 5c4277aac81228713f3c4582ece7be9bc3cd35d9 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 22 Feb 2018 07:33:46 +0100
Subject: [PATCH 552/574] Add some default keybindings for toggling scripts

Those follow the following pattern:

1) "t" for 'toggle"
2) "s" for "scripts", upper-casing ("S") to make the toggle permanent
3) "h" for host, "H" for host with subdomains, "u" for the exact URL
---
 doc/help/settings.asciidoc        | 6 ++++++
 qutebrowser/commands/runners.py   | 1 +
 qutebrowser/config/configdata.yml | 6 ++++++
 3 files changed, 13 insertions(+)

diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index eebdc5072..a9e7becd2 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -582,8 +582,14 @@ Default:
 * +pass:[sk]+: +pass:[set-cmd-text -s :bind]+
 * +pass:[sl]+: +pass:[set-cmd-text -s :set -t]+
 * +pass:[ss]+: +pass:[set-cmd-text -s :set]+
+* +pass:[tSH]+: +pass:[config-cycle -p -u *://*.{url:host}/* content.javascript.enabled ;; reload]+
+* +pass:[tSh]+: +pass:[config-cycle -p -u *://{url:host}/* content.javascript.enabled ;; reload]+
+* +pass:[tSu]+: +pass:[config-cycle -p -u {url} content.javascript.enabled ;; reload]+
 * +pass:[th]+: +pass:[back -t]+
 * +pass:[tl]+: +pass:[forward -t]+
+* +pass:[tsH]+: +pass:[config-cycle -p -t -u *://*.{url:host}/* content.javascript.enabled ;; reload]+
+* +pass:[tsh]+: +pass:[config-cycle -p -t -u *://{url:host}/* content.javascript.enabled ;; reload]+
+* +pass:[tsu]+: +pass:[config-cycle -p -t -u {url} content.javascript.enabled ;; reload]+
 * +pass:[u]+: +pass:[undo]+
 * +pass:[v]+: +pass:[enter-mode caret]+
 * +pass:[wB]+: +pass:[set-cmd-text -s :bookmark-load -w]+
diff --git a/qutebrowser/commands/runners.py b/qutebrowser/commands/runners.py
index 16c790eca..0932a8b89 100644
--- a/qutebrowser/commands/runners.py
+++ b/qutebrowser/commands/runners.py
@@ -63,6 +63,7 @@ def replace_variables(win_id, arglist):
             QUrl.FullyEncoded | QUrl.RemovePassword),
         'url:pretty': lambda: _current_url(tabbed_browser).toString(
             QUrl.DecodeReserved | QUrl.RemovePassword),
+        'url:host': lambda: _current_url(tabbed_browser).host(),
         'clipboard': utils.get_clipboard,
         'primary': lambda: utils.get_clipboard(selection=True),
     }
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 2228bc1b4..d23682db8 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -2329,6 +2329,12 @@ bindings.default:
       <Ctrl-p>: tab-pin
       q: record-macro
       "@": run-macro
+      tsh: config-cycle -p -t -u *://{url:host}/* content.javascript.enabled ;; reload
+      tSh: config-cycle -p -u *://{url:host}/* content.javascript.enabled ;; reload
+      tsH: config-cycle -p -t -u *://*.{url:host}/* content.javascript.enabled ;; reload
+      tSH: config-cycle -p -u *://*.{url:host}/* content.javascript.enabled ;; reload
+      tsu: config-cycle -p -t -u {url} content.javascript.enabled ;; reload
+      tSu: config-cycle -p -u {url} content.javascript.enabled ;; reload
     insert:
       <Ctrl-E>: open-editor
       <Shift-Ins>: insert-text {primary}

From eb4c806ddb4d88b7221c27d77aa3934268371af8 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 22 Feb 2018 08:04:23 +0100
Subject: [PATCH 553/574] Add URL pattern to settings output

---
 qutebrowser/config/configcommands.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py
index 1c1b1c686..fb8bb9fe5 100644
--- a/qutebrowser/config/configcommands.py
+++ b/qutebrowser/config/configcommands.py
@@ -62,7 +62,11 @@ class ConfigCommands:
         """Print the value of the given option."""
         with self._handle_config_error():
             value = self._config.get_str(option, pattern=pattern)
-        message.info("{} = {}".format(option, value))
+
+        text = "{} = {}".format(option, value)
+        if pattern is not None:
+            text += " for {}".format(pattern)
+        message.info(text)
 
     @cmdutils.register(instance='config-commands')
     @cmdutils.argument('option', completion=configmodel.option)

From 7ecbae765d8718d7ece0ba78cbef7542c115036f Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Thu, 22 Feb 2018 16:42:07 -0500
Subject: [PATCH 554/574] Use baseNode over anchorNode in follow-selected

baseNode isn't documented anywhere that I can find, but it seems to be
getting us what anchorNode used to get us.
---
 qutebrowser/javascript/webelem.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index d635de412..eb6ce2790 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -331,13 +331,13 @@ window._qutebrowser.webelem = (function() {
 
     // Function for returning a selection to python (so we can click it)
     funcs.find_selected_link = () => {
-        const elem = window.getSelection().anchorNode;
+        const elem = window.getSelection().baseNode;
         if (elem) {
             return serialize_elem(elem.parentNode);
         }
 
         const serialized_frame_elem = run_frames((frame) => {
-            const node = frame.window.getSelection().anchorNode;
+            const node = frame.window.getSelection().baseNode;
             if (node) {
                 return serialize_elem(node.parentNode, frame);
             }

From 49ead32f1379c5fffe24dba083c980a2de732cf8 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 23 Feb 2018 06:31:49 +0100
Subject: [PATCH 555/574] Update urlmatch tests for Chromium changes

See:
https://chromium.googlesource.com/chromium/src/+/0ab1294c92dfab538b185f0f25f44f6491a49759%5E%21/
https://bugs.chromium.org/p/chromium/issues/detail?id=812543
---
 tests/unit/utils/test_urlmatch.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index 9cad6033b..cb4e41767 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -53,6 +53,7 @@ from qutebrowser.utils import urlmatch
     ("http://", "Pattern without host"),
     ("http:///", "Pattern without host"),
     ("http:// /", "Pattern without host"),
+    ("http://:1234/", "Pattern without host"),
 
     # Chromium: PARSE_ERROR_EMPTY_PATH
     # We deviate from Chromium and allow this for ease of use
@@ -94,8 +95,8 @@ def test_invalid_patterns(pattern, error):
     ("http://foo:1234/bar", 1234),
     ("http://*.foo:1234/", 1234),
     ("http://*.foo:1234/bar", 1234),
-    # https://bugs.chromium.org/p/chromium/issues/detail?id=812543
-    # ("http://:1234/", 1234),
+    ("http://*:1234/", 1234),
+    ("http://*:*/", None),
     ("http://foo:*/", None),
     ("file://foo:1234/bar", None),
 
@@ -253,7 +254,7 @@ class TestMatchChromeUrls:
 
 class TestMatchAnything:
 
-    @pytest.fixture(params=['*://*/*', '<all_urls>'])
+    @pytest.fixture(params=['*://*/*', '*://*:*/*', '<all_urls>'])
     def up(self, request):
         return urlmatch.UrlPattern(request.param)
 

From 3956f81e730463adcba05d92d0043155609aa422 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 23 Feb 2018 09:51:28 +0100
Subject: [PATCH 556/574] Refactor websettings

This refactors the whole web(kit|engine|) settings mess a bit so there's a
Web(Kit|Engine)Settings object for (non-static) settings set on a
QWeb(Engine)Settings object in Qt. Everything else is set on module-level a bit
less declaratively.

The whole inheritance mess is gone, and we can now also construct a
Web(Kit|Engine)Settings object for a given tab.

Fixes #2701
---
 qutebrowser/browser/browsertab.py             |   1 +
 .../browser/webengine/webenginesettings.py    | 389 ++++++++----------
 qutebrowser/browser/webengine/webenginetab.py |   4 +-
 qutebrowser/browser/webkit/webkitsettings.py  | 269 ++++++------
 qutebrowser/browser/webkit/webkittab.py       |   4 +-
 qutebrowser/config/websettings.py             | 260 +++---------
 .../webengine/test_webenginesettings.py       |   7 +-
 7 files changed, 375 insertions(+), 559 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 4fa65eee0..3fb700420 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -675,6 +675,7 @@ class AbstractTab(QWidget):
         self.printing._widget = widget
         self.action._widget = widget
         self.elements._widget = widget
+        self.settings._settings = widget.settings()
 
         self._install_event_filter()
         self.zoom.set_default()
diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
index 18516c719..7d8d14dc6 100644
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -17,9 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
-# We get various "abstract but not overridden" warnings
-# pylint: disable=abstract-method
-
 """Bridge from QWebEngineSettings to our own settings.
 
 Module attributes:
@@ -36,7 +33,7 @@ from PyQt5.QtWebEngineWidgets import (QWebEngineSettings, QWebEngineProfile,
 
 from qutebrowser.browser import shared
 from qutebrowser.browser.webengine import spell
-from qutebrowser.config import config, websettings
+from qutebrowser.config import config, websettings, configutils
 from qutebrowser.utils import (utils, standarddir, javascript, qtutils,
                                message, log, objreg)
 
@@ -44,116 +41,135 @@ from qutebrowser.utils import (utils, standarddir, javascript, qtutils,
 default_profile = None
 # The QWebEngineProfile used for private (off-the-record) windows
 private_profile = None
+# The global WebEngineSettings object
+global_settings = None
 
 
-class Base(websettings.Base):
+class _SettingsWrapper:
 
-    """Base settings class with appropriate _get_global_settings."""
+    """Expose a QWebEngineSettings interface which acts on all profiles."""
 
-    def _get_global_settings(self):
-        return [default_profile.settings(), private_profile.settings()]
+    def __init__(self):
+        self._settings = [default_profile.settings(),
+                          private_profile.settings()]
+
+    def setAttribute(self, *args, **kwargs):
+        for settings in self._settings:
+            settings.setAttribute(*args, **kwargs)
+
+    def setFontFamily(self, *args, **kwargs):
+        for settings in self._settings:
+            settings.setFontFamily(*args, **kwargs)
+
+    def setFontSize(self, *args, **kwargs):
+        for settings in self._settings:
+            settings.setFontSize(*args, **kwargs)
+
+    def setDefaultTextEncoding(self, *args, **kwargs):
+        for settings in self._settings:
+            settings.setDefaultTextEncoding(*args, **kwargs)
 
 
-class Attribute(Base, websettings.Attribute):
+class WebEngineSettings(websettings.AbstractSettings):
 
-    """A setting set via QWebEngineSettings::setAttribute."""
+    """A wrapper for the config for QWebEngineSettings."""
 
-    ENUM_BASE = QWebEngineSettings
+    _ATTRIBUTES = {
+        'content.xss_auditing':
+            QWebEngineSettings.XSSAuditingEnabled,
+        'content.images':
+            QWebEngineSettings.AutoLoadImages,
+        'content.javascript.enabled':
+            QWebEngineSettings.JavascriptEnabled,
+        'content.javascript.can_open_tabs_automatically':
+            QWebEngineSettings.JavascriptCanOpenWindows,
+        'content.javascript.can_access_clipboard':
+            QWebEngineSettings.JavascriptCanAccessClipboard,
+        'content.plugins':
+            QWebEngineSettings.PluginsEnabled,
+        'content.hyperlink_auditing':
+            QWebEngineSettings.HyperlinkAuditingEnabled,
+        'content.local_content_can_access_remote_urls':
+            QWebEngineSettings.LocalContentCanAccessRemoteUrls,
+        'content.local_content_can_access_file_urls':
+            QWebEngineSettings.LocalContentCanAccessFileUrls,
+        'content.webgl':
+            QWebEngineSettings.WebGLEnabled,
+        'content.local_storage':
+            QWebEngineSettings.LocalStorageEnabled,
 
+        'input.spatial_navigation':
+            QWebEngineSettings.SpatialNavigationEnabled,
+        'input.links_included_in_focus_chain':
+            QWebEngineSettings.LinksIncludedInFocusChain,
 
-class Setter(Base, websettings.Setter):
+        'scrolling.smooth':
+            QWebEngineSettings.ScrollAnimatorEnabled,
 
-    """A setting set via a QWebEngineSettings setter method."""
+        # Missing QtWebEngine attributes:
+        # - ScreenCaptureEnabled
+        # - Accelerated2dCanvasEnabled
+        # - AutoLoadIconsForPage
+        # - TouchIconsEnabled
+        # - FocusOnNavigationEnabled (5.8)
+        # - AllowRunningInsecureContent (5.8)
+    }
 
-    pass
+    _FONT_SIZES = {
+        'fonts.web.size.minimum':
+            QWebEngineSettings.MinimumFontSize,
+        'fonts.web.size.minimum_logical':
+            QWebEngineSettings.MinimumLogicalFontSize,
+        'fonts.web.size.default':
+            QWebEngineSettings.DefaultFontSize,
+        'fonts.web.size.default_fixed':
+            QWebEngineSettings.DefaultFixedFontSize,
+    }
 
+    _FONT_FAMILIES = {
+        'fonts.web.family.standard': QWebEngineSettings.StandardFont,
+        'fonts.web.family.fixed': QWebEngineSettings.FixedFont,
+        'fonts.web.family.serif': QWebEngineSettings.SerifFont,
+        'fonts.web.family.sans_serif': QWebEngineSettings.SansSerifFont,
+        'fonts.web.family.cursive': QWebEngineSettings.CursiveFont,
+        'fonts.web.family.fantasy': QWebEngineSettings.FantasyFont,
 
-class FontFamilySetter(Base, websettings.FontFamilySetter):
+        # Missing QtWebEngine fonts:
+        # - PictographFont
+    }
 
-    """A setter for a font family.
+    # Mapping from WebEngineSettings::initDefaults in
+    # qtwebengine/src/core/web_engine_settings.cpp
+    _FONT_TO_QFONT = {
+        QWebEngineSettings.StandardFont: QFont.Serif,
+        QWebEngineSettings.FixedFont: QFont.Monospace,
+        QWebEngineSettings.SerifFont: QFont.Serif,
+        QWebEngineSettings.SansSerifFont: QFont.SansSerif,
+        QWebEngineSettings.CursiveFont: QFont.Cursive,
+        QWebEngineSettings.FantasyFont: QFont.Fantasy,
+    }
 
-    Gets the default value from QFont.
-    """
-
-    def __init__(self, font):
-        # Mapping from WebEngineSettings::initDefaults in
-        # qtwebengine/src/core/web_engine_settings.cpp
-        font_to_qfont = {
-            QWebEngineSettings.StandardFont: QFont.Serif,
-            QWebEngineSettings.FixedFont: QFont.Monospace,
-            QWebEngineSettings.SerifFont: QFont.Serif,
-            QWebEngineSettings.SansSerifFont: QFont.SansSerif,
-            QWebEngineSettings.CursiveFont: QFont.Cursive,
-            QWebEngineSettings.FantasyFont: QFont.Fantasy,
+    def __init__(self, settings):
+        super().__init__(settings)
+        # Attributes which don't exist in all Qt versions.
+        new_attributes = {
+            # Qt 5.8
+            'content.print_element_backgrounds': 'PrintElementBackgrounds',
         }
-        super().__init__(setter=QWebEngineSettings.setFontFamily, font=font,
-                         qfont=font_to_qfont[font])
+        for name, attribute in new_attributes.items():
+            try:
+                value = getattr(QWebEngineSettings, attribute)
+            except AttributeError:
+                continue
 
+            self._ATTRIBUTES[name] = value
 
-class DefaultProfileSetter(websettings.Base):
-
-    """A setting set on the QWebEngineProfile."""
-
-    def __init__(self, setter, converter=None, default=websettings.UNSET):
-        super().__init__(default)
-        self._setter = setter
-        self._converter = converter
-
-    def __repr__(self):
-        return utils.get_repr(self, setter=self._setter, constructor=True)
-
-    def _set(self, value, settings=None):
-        if settings is not None:
-            raise ValueError("'settings' may not be set with "
-                             "DefaultProfileSetters!")
-
-        setter = getattr(default_profile, self._setter)
-        if self._converter is not None:
-            value = self._converter(value)
-
-        setter(value)
-
-
-class PersistentCookiePolicy(DefaultProfileSetter):
-
-    """The content.cookies.store setting is different from other settings."""
-
-    def __init__(self):
-        super().__init__('setPersistentCookiesPolicy')
-
-    def _set(self, value, settings=None):
-        if settings is not None:
-            raise ValueError("'settings' may not be set with "
-                             "PersistentCookiePolicy!")
-        setter = getattr(QWebEngineProfile.defaultProfile(), self._setter)
-        setter(
-            QWebEngineProfile.AllowPersistentCookies if value else
-            QWebEngineProfile.NoPersistentCookies
-        )
-
-
-class DictionaryLanguageSetter(DefaultProfileSetter):
-
-    """Sets paths to dictionary files based on language codes."""
-
-    def __init__(self):
-        super().__init__('setSpellCheckLanguages', default=[])
-
-    def _find_installed(self, code):
-        local_filename = spell.local_filename(code)
-        if not local_filename:
-            message.warning(
-                "Language {} is not installed - see scripts/dictcli.py "
-                "in qutebrowser's sources".format(code))
-        return local_filename
-
-    def _set(self, value, settings=None):
-        if settings is not None:
-            raise ValueError("'settings' may not be set with "
-                             "DictionaryLanguageSetter!")
-        filenames = [self._find_installed(code) for code in value]
-        log.config.debug("Found dicts: {}".format(filenames))
-        super()._set([f for f in filenames if f], settings)
+    def set_attribute(self, name, value):
+        attribute = self._ATTRIBUTES[name]
+        if value is configutils.UNSET:
+            self._settings.resetAttribute(attribute)
+        else:
+            self._settings.setAttribute(attribute, value)
 
 
 def _init_stylesheet(profile):
@@ -210,9 +226,47 @@ def _set_http_headers(profile):
         profile.setHttpAcceptLanguage(accept_language)
 
 
+def _set_http_cache_size(profile):
+    """Initialize the HTTP cache size for the given profile."""
+    size = config.val.content.cache.size
+    if size is None:
+        size = 0
+    else:
+        size = qtutils.check_overflow(size, 'int', fatal=False)
+
+    # 0: automatically managed by QtWebEngine
+    profile.setHttpCacheMaximumSize(size)
+
+
+def _set_persistent_cookie_policy(profile):
+    """Set the HTTP Cookie size for the given profile."""
+    if config.val.content.cookies.store:
+        value = QWebEngineProfile.AllowPersistentCookies
+    else:
+        value = QWebEngineProfile.NoPersistentCookies
+    profile.setPersistentCookiesPolicy(value)
+
+
+def _set_dictionary_language(profile):
+    filenames = []
+    for code in config.val.spellcheck.languages or []:
+        local_filename = spell.local_filename(code)
+        if not local_filename:
+            message.warning(
+                "Language {} is not installed - see scripts/dictcli.py "
+                "in qutebrowser's sources".format(code))
+            continue
+
+        filenames.append(local_filename)
+
+    log.config.debug("Found dicts: {}".format(filenames))
+    profile.setSpellCheckLanguages(filenames)
+
+
 def _update_settings(option):
     """Update global settings when qwebsettings changed."""
-    websettings.update_mappings(MAPPINGS, option)
+    global_settings.update_setting(option)
+
     if option in ['scrolling.bar', 'content.user_stylesheets']:
         _init_stylesheet(default_profile)
         _init_stylesheet(private_profile)
@@ -221,27 +275,46 @@ def _update_settings(option):
                     'content.headers.accept_language']:
         _set_http_headers(default_profile)
         _set_http_headers(private_profile)
+    elif option == 'content.cache.size':
+        _set_http_cache_size(default_profile)
+        _set_http_cache_size(private_profile)
+    elif (option == 'content.cookies.store' and
+          # https://bugreports.qt.io/browse/QTBUG-58650
+          qtutils.version_check('5.9', compiled=False)):
+        _set_persistent_cookie_policy(default_profile)
+        # We're not touching the private profile's cookie policy.
+    elif option == 'spellcheck.languages' and qtutils.version_check('5.8'):
+        _set_dictionary_language(default_profile)
+        _set_dictionary_language(private_profile)
+
+
+def _init_profile(profile):
+    """Init the given profile."""
+    _init_stylesheet(profile)
+    _set_http_headers(profile)
+    _set_http_cache_size(profile)
+    profile.settings().setAttribute(
+        QWebEngineSettings.FullScreenSupportEnabled, True)
+    if qtutils.version_check('5.8'):
+        profile.setSpellCheckEnabled(True)
+        _set_dictionary_language(profile)
 
 
 def _init_profiles():
     """Init the two used QWebEngineProfiles."""
     global default_profile, private_profile
+
     default_profile = QWebEngineProfile.defaultProfile()
     default_profile.setCachePath(
         os.path.join(standarddir.cache(), 'webengine'))
     default_profile.setPersistentStoragePath(
         os.path.join(standarddir.data(), 'webengine'))
-    _init_stylesheet(default_profile)
-    _set_http_headers(default_profile)
+    _init_profile(default_profile)
+    _set_persistent_cookie_policy(default_profile)
 
     private_profile = QWebEngineProfile()
     assert private_profile.isOffTheRecord()
-    _init_stylesheet(private_profile)
-    _set_http_headers(private_profile)
-
-    if qtutils.version_check('5.8'):
-        default_profile.setSpellCheckEnabled(True)
-        private_profile.setSpellCheckEnabled(True)
+    _init_profile(private_profile)
 
 
 def inject_userscripts():
@@ -287,115 +360,13 @@ def init(args):
         os.environ['QTWEBENGINE_REMOTE_DEBUGGING'] = str(utils.random_port())
 
     _init_profiles()
-
-    # We need to do this here as a WORKAROUND for
-    # https://bugreports.qt.io/browse/QTBUG-58650
-    if not qtutils.version_check('5.9', compiled=False):
-        PersistentCookiePolicy().set(config.val.content.cookies.store)
-    Attribute(QWebEngineSettings.FullScreenSupportEnabled).set(True)
-
-    websettings.init_mappings(MAPPINGS)
     config.instance.changed.connect(_update_settings)
 
-
-def update_for_tab(tab, url):
-    websettings.update_for_tab(MAPPINGS, tab, url)
+    global global_settings
+    global_settings = WebEngineSettings(_SettingsWrapper())
+    global_settings.init_settings()
 
 
 def shutdown():
     # FIXME:qtwebengine do we need to do something for a clean shutdown here?
     pass
-
-
-# Missing QtWebEngine attributes:
-# - ScreenCaptureEnabled
-# - Accelerated2dCanvasEnabled
-# - AutoLoadIconsForPage
-# - TouchIconsEnabled
-# - FocusOnNavigationEnabled (5.8)
-# - AllowRunningInsecureContent (5.8)
-#
-# Missing QtWebEngine fonts:
-# - PictographFont
-
-
-MAPPINGS = {
-    'content.images':
-        Attribute(QWebEngineSettings.AutoLoadImages),
-    'content.javascript.enabled':
-        Attribute(QWebEngineSettings.JavascriptEnabled),
-    'content.javascript.can_open_tabs_automatically':
-        Attribute(QWebEngineSettings.JavascriptCanOpenWindows),
-    'content.javascript.can_access_clipboard':
-        Attribute(QWebEngineSettings.JavascriptCanAccessClipboard),
-    'content.plugins':
-        Attribute(QWebEngineSettings.PluginsEnabled),
-    'content.hyperlink_auditing':
-        Attribute(QWebEngineSettings.HyperlinkAuditingEnabled),
-    'content.local_content_can_access_remote_urls':
-        Attribute(QWebEngineSettings.LocalContentCanAccessRemoteUrls),
-    'content.local_content_can_access_file_urls':
-        Attribute(QWebEngineSettings.LocalContentCanAccessFileUrls),
-    'content.webgl':
-        Attribute(QWebEngineSettings.WebGLEnabled),
-    'content.local_storage':
-        Attribute(QWebEngineSettings.LocalStorageEnabled),
-    'content.cache.size':
-        # 0: automatically managed by QtWebEngine
-        DefaultProfileSetter('setHttpCacheMaximumSize', default=0,
-                             converter=lambda val:
-                             qtutils.check_overflow(val, 'int', fatal=False)),
-    'content.xss_auditing':
-        Attribute(QWebEngineSettings.XSSAuditingEnabled),
-    'content.default_encoding':
-        Setter(QWebEngineSettings.setDefaultTextEncoding),
-
-    'input.spatial_navigation':
-        Attribute(QWebEngineSettings.SpatialNavigationEnabled),
-    'input.links_included_in_focus_chain':
-        Attribute(QWebEngineSettings.LinksIncludedInFocusChain),
-
-    'fonts.web.family.standard':
-        FontFamilySetter(QWebEngineSettings.StandardFont),
-    'fonts.web.family.fixed':
-        FontFamilySetter(QWebEngineSettings.FixedFont),
-    'fonts.web.family.serif':
-        FontFamilySetter(QWebEngineSettings.SerifFont),
-    'fonts.web.family.sans_serif':
-        FontFamilySetter(QWebEngineSettings.SansSerifFont),
-    'fonts.web.family.cursive':
-        FontFamilySetter(QWebEngineSettings.CursiveFont),
-    'fonts.web.family.fantasy':
-        FontFamilySetter(QWebEngineSettings.FantasyFont),
-    'fonts.web.size.minimum':
-        Setter(QWebEngineSettings.setFontSize,
-               args=[QWebEngineSettings.MinimumFontSize]),
-    'fonts.web.size.minimum_logical':
-        Setter(QWebEngineSettings.setFontSize,
-               args=[QWebEngineSettings.MinimumLogicalFontSize]),
-    'fonts.web.size.default':
-        Setter(QWebEngineSettings.setFontSize,
-               args=[QWebEngineSettings.DefaultFontSize]),
-    'fonts.web.size.default_fixed':
-        Setter(QWebEngineSettings.setFontSize,
-               args=[QWebEngineSettings.DefaultFixedFontSize]),
-
-    'scrolling.smooth':
-        Attribute(QWebEngineSettings.ScrollAnimatorEnabled),
-}
-
-try:
-    MAPPINGS['content.print_element_backgrounds'] = Attribute(
-        QWebEngineSettings.PrintElementBackgrounds)
-except AttributeError:
-    # Added in Qt 5.8
-    pass
-
-
-if qtutils.version_check('5.8'):
-    MAPPINGS['spellcheck.languages'] = DictionaryLanguageSetter()
-
-
-if qtutils.version_check('5.9', compiled=False):
-    # https://bugreports.qt.io/browse/QTBUG-58650
-    MAPPINGS['content.cookies.store'] = PersistentCookiePolicy()
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index e047c9d1e..828fe9e56 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -604,6 +604,8 @@ class WebEngineTab(browsertab.AbstractTab):
         self.printing = WebEnginePrinting()
         self.elements = WebEngineElements(tab=self)
         self.action = WebEngineAction(tab=self)
+        # We're assigning settings in _set_widget
+        self.settings = webenginesettings.WebEngineSettings(settings=None)
         self._set_widget(widget)
         self._connect_signals()
         self.backend = usertypes.Backend.QtWebEngine
@@ -876,7 +878,7 @@ class WebEngineTab(browsertab.AbstractTab):
     def _on_navigation_request(self, navigation):
         super()._on_navigation_request(navigation)
         if navigation.accepted and navigation.is_main_frame:
-            webenginesettings.update_for_tab(self, navigation.url)
+            self.settings.update_for_url(navigation.url)
 
     def _connect_signals(self):
         view = self._widget
diff --git a/qutebrowser/browser/webkit/webkitsettings.py b/qutebrowser/browser/webkit/webkitsettings.py
index 976432418..6ba15f62a 100644
--- a/qutebrowser/browser/webkit/webkitsettings.py
+++ b/qutebrowser/browser/webkit/webkitsettings.py
@@ -17,9 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
-# We get various "abstract but not overridden" warnings
-# pylint: disable=abstract-method
-
 """Bridge from QWebSettings to our own settings.
 
 Module attributes:
@@ -32,94 +29,142 @@ import os.path
 from PyQt5.QtGui import QFont
 from PyQt5.QtWebKit import QWebSettings
 
-from qutebrowser.config import config, websettings
+from qutebrowser.config import config, websettings, configutils
 from qutebrowser.utils import standarddir, urlutils
 from qutebrowser.browser import shared
 
 
-class Base(websettings.Base):
-
-    """Base settings class with appropriate _get_global_settings."""
-
-    def _get_global_settings(self):
-        return [QWebSettings.globalSettings()]
+# The global WebKitSettings object
+global_settings = None
 
 
-class Attribute(Base, websettings.Attribute):
+class WebKitSettings(websettings.AbstractSettings):
 
-    """A setting set via QWebSettings::setAttribute."""
+    """A wrapper for the config for QWebSettings."""
 
-    ENUM_BASE = QWebSettings
+    _ATTRIBUTES = {
+        'content.images':
+            [QWebSettings.AutoLoadImages],
+        'content.javascript.enabled':
+            [QWebSettings.JavascriptEnabled],
+        'content.javascript.can_open_tabs_automatically':
+            [QWebSettings.JavascriptCanOpenWindows],
+        'content.javascript.can_close_tabs':
+            [QWebSettings.JavascriptCanCloseWindows],
+        'content.javascript.can_access_clipboard':
+            [QWebSettings.JavascriptCanAccessClipboard],
+        'content.plugins':
+            [QWebSettings.PluginsEnabled],
+        'content.webgl':
+            [QWebSettings.WebGLEnabled],
+        'content.hyperlink_auditing':
+            [QWebSettings.HyperlinkAuditingEnabled],
+        'content.local_content_can_access_remote_urls':
+            [QWebSettings.LocalContentCanAccessRemoteUrls],
+        'content.local_content_can_access_file_urls':
+            [QWebSettings.LocalContentCanAccessFileUrls],
+        'content.dns_prefetch':
+            [QWebSettings.DnsPrefetchEnabled],
+        'content.frame_flattening':
+            [QWebSettings.FrameFlatteningEnabled],
+        'content.cache.appcache':
+            [QWebSettings.OfflineWebApplicationCacheEnabled],
+        'content.local_storage':
+            [QWebSettings.LocalStorageEnabled,
+             QWebSettings.OfflineStorageDatabaseEnabled],
+        'content.developer_extras':
+            [QWebSettings.DeveloperExtrasEnabled],
+        'content.print_element_backgrounds':
+            [QWebSettings.PrintElementBackgrounds],
+        'content.xss_auditing':
+            [QWebSettings.XSSAuditingEnabled],
+
+        'input.spatial_navigation':
+            [QWebSettings.SpatialNavigationEnabled],
+        'input.links_included_in_focus_chain':
+            [QWebSettings.LinksIncludedInFocusChain],
+
+        'zoom.text_only':
+            [QWebSettings.ZoomTextOnly],
+        'scrolling.smooth':
+            [QWebSettings.ScrollAnimatorEnabled],
+    }
+
+    _FONT_SIZES = {
+        'fonts.web.size.minimum':
+            QWebSettings.MinimumFontSize,
+        'fonts.web.size.minimum_logical':
+            QWebSettings.MinimumLogicalFontSize,
+        'fonts.web.size.default':
+            QWebSettings.DefaultFontSize,
+        'fonts.web.size.default_fixed':
+            QWebSettings.DefaultFixedFontSize,
+    }
+
+    _FONT_FAMILIES = {
+        'fonts.web.family.standard': QWebSettings.StandardFont,
+        'fonts.web.family.fixed': QWebSettings.FixedFont,
+        'fonts.web.family.serif': QWebSettings.SerifFont,
+        'fonts.web.family.sans_serif': QWebSettings.SansSerifFont,
+        'fonts.web.family.cursive': QWebSettings.CursiveFont,
+        'fonts.web.family.fantasy': QWebSettings.FantasyFont,
+    }
+
+    # Mapping from QWebSettings::QWebSettings() in
+    # qtwebkit/Source/WebKit/qt/Api/qwebsettings.cpp
+    _FONT_TO_QFONT = {
+        QWebSettings.StandardFont: QFont.Serif,
+        QWebSettings.FixedFont: QFont.Monospace,
+        QWebSettings.SerifFont: QFont.Serif,
+        QWebSettings.SansSerifFont: QFont.SansSerif,
+        QWebSettings.CursiveFont: QFont.Cursive,
+        QWebSettings.FantasyFont: QFont.Fantasy,
+    }
+
+    def set_attribute(self, name, value):
+        for attribute in self._ATTRIBUTES[name]:
+            if value is configutils.UNSET:
+                self._settings.resetAttribute(attribute)
+            else:
+                self._settings.setAttribute(attribute, value)
 
 
-class Setter(Base, websettings.Setter):
-
-    """A setting set via a QWebSettings setter method."""
-
-    pass
+def _set_user_stylesheet(settings):
+    """Set the generated user-stylesheet."""
+    stylesheet = shared.get_user_stylesheet().encode('utf-8')
+    url = urlutils.data_url('text/css;charset=utf-8', stylesheet)
+    settings.setUserStyleSheetUrl(url)
 
 
-class StaticSetter(Base, websettings.StaticSetter):
-
-    """A setting set via a static QWebSettings setter method."""
-
-    pass
-
-
-class FontFamilySetter(Base, websettings.FontFamilySetter):
-
-    """A setter for a font family.
-
-    Gets the default value from QFont.
-    """
-
-    def __init__(self, font):
-        # Mapping from QWebSettings::QWebSettings() in
-        # qtwebkit/Source/WebKit/qt/Api/qwebsettings.cpp
-        font_to_qfont = {
-            QWebSettings.StandardFont: QFont.Serif,
-            QWebSettings.FixedFont: QFont.Monospace,
-            QWebSettings.SerifFont: QFont.Serif,
-            QWebSettings.SansSerifFont: QFont.SansSerif,
-            QWebSettings.CursiveFont: QFont.Cursive,
-            QWebSettings.FantasyFont: QFont.Fantasy,
-        }
-        super().__init__(setter=QWebSettings.setFontFamily, font=font,
-                         qfont=font_to_qfont[font])
-
-
-class CookiePolicy(Base):
-
-    """The ThirdPartyCookiePolicy setting is different from other settings."""
-
-    MAPPING = {
+def _set_cookie_accept_policy(settings):
+    """Update the content.cookies.accept setting."""
+    mapping = {
         'all': QWebSettings.AlwaysAllowThirdPartyCookies,
         'no-3rdparty': QWebSettings.AlwaysBlockThirdPartyCookies,
         'never': QWebSettings.AlwaysBlockThirdPartyCookies,
         'no-unknown-3rdparty': QWebSettings.AllowThirdPartyWithExistingCookies,
     }
-
-    def _set(self, value, settings=None):
-        for obj in self._get_settings(settings):
-            obj.setThirdPartyCookiePolicy(self.MAPPING[value])
+    value = config.val.content.cookies.accept
+    settings.setThirdPartyCookiePolicy(mapping[value])
 
 
-def _set_user_stylesheet():
-    """Set the generated user-stylesheet."""
-    stylesheet = shared.get_user_stylesheet().encode('utf-8')
-    url = urlutils.data_url('text/css;charset=utf-8', stylesheet)
-    QWebSettings.globalSettings().setUserStyleSheetUrl(url)
+def _set_cache_maximum_pages(settings):
+    """Update the content.cache.maximum_pages setting."""
+    value = config.val.content.cache.maximum_pages
+    settings.setMaximumPagesInCache(value)
 
 
 def _update_settings(option):
     """Update global settings when qwebsettings changed."""
+    global_settings.update_setting(option)
+
+    settings = QWebSettings.globalSettings()
     if option in ['scrollbar.hide', 'content.user_stylesheets']:
-        _set_user_stylesheet()
-    websettings.update_mappings(MAPPINGS, option)
-
-
-def update_for_tab(tab, url):
-    websettings.update_for_tab(MAPPINGS, tab, url)
+        _set_user_stylesheet(settings)
+    elif option == 'content.cookies.accept':
+        _set_cookie_accept_policy(settings)
+    elif option == 'content.cache.maximum_pages':
+        _set_cache_maximum_pages(settings)
 
 
 def init(_args):
@@ -135,92 +180,20 @@ def init(_args):
     QWebSettings.setOfflineStoragePath(
         os.path.join(data_path, 'offline-storage'))
 
-    websettings.init_mappings(MAPPINGS)
-    _set_user_stylesheet()
+    settings = QWebSettings.globalSettings()
+    _set_user_stylesheet(settings)
+    _set_cookie_accept_policy(settings)
+    _set_cache_maximum_pages(settings)
+
     config.instance.changed.connect(_update_settings)
 
+    global global_settings
+    global_settings = WebKitSettings(QWebSettings.globalSettings())
+    global_settings.init_settings()
+
 
 def shutdown():
     """Disable storage so removing tmpdir will work."""
     QWebSettings.setIconDatabasePath('')
     QWebSettings.setOfflineWebApplicationCachePath('')
     QWebSettings.globalSettings().setLocalStoragePath('')
-
-
-MAPPINGS = {
-    'content.images':
-        Attribute(QWebSettings.AutoLoadImages),
-    'content.javascript.enabled':
-        Attribute(QWebSettings.JavascriptEnabled),
-    'content.javascript.can_open_tabs_automatically':
-        Attribute(QWebSettings.JavascriptCanOpenWindows),
-    'content.javascript.can_close_tabs':
-        Attribute(QWebSettings.JavascriptCanCloseWindows),
-    'content.javascript.can_access_clipboard':
-        Attribute(QWebSettings.JavascriptCanAccessClipboard),
-    'content.plugins':
-        Attribute(QWebSettings.PluginsEnabled),
-    'content.webgl':
-        Attribute(QWebSettings.WebGLEnabled),
-    'content.hyperlink_auditing':
-        Attribute(QWebSettings.HyperlinkAuditingEnabled),
-    'content.local_content_can_access_remote_urls':
-        Attribute(QWebSettings.LocalContentCanAccessRemoteUrls),
-    'content.local_content_can_access_file_urls':
-        Attribute(QWebSettings.LocalContentCanAccessFileUrls),
-    'content.cookies.accept':
-        CookiePolicy(),
-    'content.dns_prefetch':
-        Attribute(QWebSettings.DnsPrefetchEnabled),
-    'content.frame_flattening':
-        Attribute(QWebSettings.FrameFlatteningEnabled),
-    'content.cache.appcache':
-        Attribute(QWebSettings.OfflineWebApplicationCacheEnabled),
-    'content.local_storage':
-        Attribute(QWebSettings.LocalStorageEnabled,
-                  QWebSettings.OfflineStorageDatabaseEnabled),
-    'content.cache.maximum_pages':
-        StaticSetter(QWebSettings.setMaximumPagesInCache),
-    'content.developer_extras':
-        Attribute(QWebSettings.DeveloperExtrasEnabled),
-    'content.print_element_backgrounds':
-        Attribute(QWebSettings.PrintElementBackgrounds),
-    'content.xss_auditing':
-        Attribute(QWebSettings.XSSAuditingEnabled),
-    'content.default_encoding':
-        Setter(QWebSettings.setDefaultTextEncoding),
-    # content.user_stylesheets is handled separately
-
-    'input.spatial_navigation':
-        Attribute(QWebSettings.SpatialNavigationEnabled),
-    'input.links_included_in_focus_chain':
-        Attribute(QWebSettings.LinksIncludedInFocusChain),
-
-    'fonts.web.family.standard':
-        FontFamilySetter(QWebSettings.StandardFont),
-    'fonts.web.family.fixed':
-        FontFamilySetter(QWebSettings.FixedFont),
-    'fonts.web.family.serif':
-        FontFamilySetter(QWebSettings.SerifFont),
-    'fonts.web.family.sans_serif':
-        FontFamilySetter(QWebSettings.SansSerifFont),
-    'fonts.web.family.cursive':
-        FontFamilySetter(QWebSettings.CursiveFont),
-    'fonts.web.family.fantasy':
-        FontFamilySetter(QWebSettings.FantasyFont),
-    'fonts.web.size.minimum':
-        Setter(QWebSettings.setFontSize, args=[QWebSettings.MinimumFontSize]),
-    'fonts.web.size.minimum_logical':
-        Setter(QWebSettings.setFontSize,
-               args=[QWebSettings.MinimumLogicalFontSize]),
-    'fonts.web.size.default':
-        Setter(QWebSettings.setFontSize, args=[QWebSettings.DefaultFontSize]),
-    'fonts.web.size.default_fixed':
-        Setter(QWebSettings.setFontSize,
-               args=[QWebSettings.DefaultFixedFontSize]),
-
-    'zoom.text_only':
-        Attribute(QWebSettings.ZoomTextOnly),
-    'scrolling.smooth':
-        Attribute(QWebSettings.ScrollAnimatorEnabled),
-}
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 73a2f2648..5184550cd 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -645,6 +645,8 @@ class WebKitTab(browsertab.AbstractTab):
         self.printing = WebKitPrinting()
         self.elements = WebKitElements(tab=self)
         self.action = WebKitAction(tab=self)
+        # We're assigning settings in _set_widget
+        self.settings = webkitsettings.WebKitSettings(settings=None)
         self._set_widget(widget)
         self._connect_signals()
         self.backend = usertypes.Backend.QtWebKit
@@ -785,7 +787,7 @@ class WebKitTab(browsertab.AbstractTab):
             navigation.accepted = False
 
         if navigation.is_main_frame:
-            webkitsettings.update_for_tab(self, navigation.url)
+            self.settings.update_for_url(navigation.url)
 
     def _connect_signals(self):
         view = self._widget
diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py
index eb6c2ce49..98d5339fe 100644
--- a/qutebrowser/config/websettings.py
+++ b/qutebrowser/config/websettings.py
@@ -17,230 +17,96 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
-# We get various "abstract but not overridden" warnings
-# pylint: disable=abstract-method
-
 """Bridge from QWeb(Engine)Settings to our own settings."""
 
 from PyQt5.QtGui import QFont
 
 from qutebrowser.config import config, configutils
-from qutebrowser.utils import log, utils, debug, usertypes
+from qutebrowser.utils import log, usertypes
 from qutebrowser.misc import objects
 
 UNSET = object()
 
 
-class Base:
+class AbstractSettings:
 
-    """Base class for QWeb(Engine)Settings wrappers."""
+    """Abstract base class for settings set via QWeb(Engine)Settings."""
 
-    def __init__(self, default=UNSET):
-        self._default = default
+    _ATTRIBUTES = None
+    _FONT_SIZES = None
+    _FONT_FAMILIES = None
+    _FONT_TO_QFONT = None
 
-    def _get_global_settings(self):
-        """Get a list of global QWeb(Engine)Settings to use."""
+    def __init__(self, settings):
+        self._settings = settings
+
+    def set_attribute(self, name, value):
+        """Set the given QWebSettings/QWebEngineSettings attribute.
+
+        If the value is configutils.UNSET, the value is reset instead.
+        """
         raise NotImplementedError
 
-    def _get_settings(self, settings):
-        """Get a list of QWeb(Engine)Settings objects to use.
+    def set_font_size(self, name, value):
+        """Set the given QWebSettings/QWebEngineSettings font size."""
+        assert value is not configutils.UNSET
+        self._settings.setFontSize(self._FONT_SIZES[name], value)
 
-        Args:
-            settings: The QWeb(Engine)Settings instance to use, or None to use
-                      the global instance.
+    def set_font_family(self, name, value):
+        """Set the given QWebSettings/QWebEngineSettings font family.
 
-        Return:
-            A list of QWeb(Engine)Settings objects. The first one should be
-            used for reading.
-        """
-        if settings is None:
-            return self._get_global_settings()
-        else:
-            return [settings]
-
-    def set(self, value, settings=None):
-        """Set the value of this setting.
-
-        Args:
-            value: The value to set, or None to restore the default.
-            settings: The QWeb(Engine)Settings instance to use, or None to use
-                      the global instance.
+        With None (the default), QFont is used to get the default font for the
+        family.
         """
+        assert value is not configutils.UNSET
         if value is None:
-            self.set_default(settings=settings)
-        else:
-            self._set(value, settings=settings)
+            font = QFont()
+            font.setStyleHint(self._FONT_TO_QFONT[self._FONT_FAMILIES[name]])
+            value = font.defaultFamily()
 
-    def set_default(self, settings=None):
-        """Set the default value for this setting.
+        self._settings.setFontFamily(self._FONT_FAMILIES[name], value)
 
-        Not implemented for most settings.
+    def set_default_text_encoding(self, encoding):
+        """Set the default text encoding to use."""
+        assert encoding is not configutils.UNSET
+        self._settings.setDefaultTextEncoding(encoding)
+
+    def _update_setting(self, setting, value):
+        """Update the given setting/value.
+
+        Unknown settings are ignored.
         """
-        if self._default is UNSET:
-            raise ValueError("No default set for {!r}".format(self))
-        else:
-            self._set(self._default, settings=settings)
+        if setting in self._ATTRIBUTES:
+            self.set_attribute(setting, value)
+        elif setting in self._FONT_SIZES:
+            self.set_font_size(setting, value)
+        elif setting in self._FONT_FAMILIES:
+            self.set_font_family(setting, value)
+        elif setting == 'content.default_encoding':
+            self.set_default_text_encoding(value)
 
-    def _set(self, value, settings):
-        """Inner function to set the value of this setting.
+    def update_setting(self, setting):
+        """Update the given setting."""
+        value = config.instance.get(setting)
+        self._update_setting(setting, value)
 
-        Must be overridden by subclasses.
+    def update_for_url(self, url):
+        """Update settings customized for the given tab."""
+        for values in config.instance:
+            if not values.opt.supports_pattern:
+                continue
 
-        Args:
-            value: The value to set.
-            settings: The QWeb(Engine)Settings instance to use, or None to use
-                      the global instance.
-        """
-        raise NotImplementedError
+            value = values.get_for_url(url, fallback=False)
+            log.config.debug("Updating for {}: {} = {}".format(
+                url.toDisplayString(), values.opt.name, value))
 
-    def unset(self, settings=None):
-        """Unset a customized setting.
+            self._update_setting(values.opt.name, value)
 
-        Must be overridden by subclasses.
-        """
-        raise NotImplementedError
-
-
-class Attribute(Base):
-
-    """A setting set via QWeb(Engine)Settings::setAttribute.
-
-    Attributes:
-        self._attributes: A list of QWeb(Engine)Settings::WebAttribute members.
-    """
-
-    ENUM_BASE = None
-
-    def __init__(self, *attributes, default=UNSET):
-        super().__init__(default=default)
-        self._attributes = list(attributes)
-
-    def __repr__(self):
-        attributes = [debug.qenum_key(self.ENUM_BASE, attr)
-                      for attr in self._attributes]
-        return utils.get_repr(self, attributes=attributes, constructor=True)
-
-    def _set(self, value, settings=None):
-        for obj in self._get_settings(settings):
-            for attribute in self._attributes:
-                obj.setAttribute(attribute, value)
-
-    def unset(self, settings=None):
-        for obj in self._get_settings(settings):
-            for attribute in self._attributes:
-                obj.resetAttribute(attribute)
-
-
-class Setter(Base):
-
-    """A setting set via a QWeb(Engine)Settings setter method.
-
-    This will pass the QWeb(Engine)Settings instance ("self") as first argument
-    to the methods, so self._setter is the *unbound* method.
-
-    Attributes:
-        _setter: The unbound QWeb(Engine)Settings method to set this value.
-        _args: An iterable of the arguments to pass to the setter (before the
-               value).
-        _unpack: Whether to unpack args (True) or pass them directly (False).
-    """
-
-    def __init__(self, setter, args=(), unpack=False, default=UNSET):
-        super().__init__(default=default)
-        self._setter = setter
-        self._args = args
-        self._unpack = unpack
-
-    def __repr__(self):
-        return utils.get_repr(self, setter=self._setter, args=self._args,
-                              unpack=self._unpack, constructor=True)
-
-    def _set(self, value, settings=None):
-        for obj in self._get_settings(settings):
-            args = [obj]
-            args.extend(self._args)
-            if self._unpack:
-                args.extend(value)
-            else:
-                args.append(value)
-            self._setter(*args)
-
-
-class StaticSetter(Setter):
-
-    """A setting set via a static QWeb(Engine)Settings method.
-
-    self._setter is the *bound* method.
-    """
-
-    def _set(self, value, settings=None):
-        if settings is not None:
-            raise ValueError("'settings' may not be set with StaticSetters!")
-        args = list(self._args)
-        if self._unpack:
-            args.extend(value)
-        else:
-            args.append(value)
-        self._setter(*args)
-
-
-class FontFamilySetter(Setter):
-
-    """A setter for a font family.
-
-    Gets the default value from QFont.
-    """
-
-    def __init__(self, setter, font, qfont):
-        super().__init__(setter=setter, args=[font])
-        self._qfont = qfont
-
-    def set_default(self, settings=None):
-        font = QFont()
-        font.setStyleHint(self._qfont)
-        value = font.defaultFamily()
-        self._set(value, settings=settings)
-
-
-def init_mappings(mappings):
-    """Initialize all settings based on a settings mapping."""
-    for option, mapping in mappings.items():
-        value = config.instance.get(option)
-        log.config.vdebug("Setting {} to {!r}".format(option, value))
-        mapping.set(value)
-
-
-def update_mappings(mappings, option):
-    """Update global settings when QWeb(Engine)Settings changed."""
-    try:
-        mapping = mappings[option]
-    except KeyError:
-        return
-    value = config.instance.get(option)
-    mapping.set(value)
-
-
-def update_for_tab(mappings, tab, url):
-    """Update settings customized for the given tab."""
-    for values in config.instance:
-        if values.opt.name not in mappings:
-            continue
-        if not values.opt.supports_pattern:
-            continue
-
-        mapping = mappings[values.opt.name]
-
-        value = values.get_for_url(url, fallback=False)
-        log.config.debug("Updating for {}: {} = {}".format(
-            url.toDisplayString(), values.opt.name, value))
-
-        # FIXME:conf have a proper API for this.
-        settings = tab._widget.settings()  # pylint: disable=protected-access
-
-        if value is configutils.UNSET:
-            mapping.unset(settings=settings)
-        else:
-            mapping.set(value, settings=settings)
+    def init_settings(self):
+        """Set all supported settings correctly."""
+        for setting in (list(self._ATTRIBUTES) + list(self._FONT_SIZES) +
+                        list(self._FONT_FAMILIES)):
+            self.update_setting(setting)
 
 
 def init(args):
diff --git a/tests/unit/browser/webengine/test_webenginesettings.py b/tests/unit/browser/webengine/test_webenginesettings.py
index 995dec44a..1fbe38f00 100644
--- a/tests/unit/browser/webengine/test_webenginesettings.py
+++ b/tests/unit/browser/webengine/test_webenginesettings.py
@@ -32,7 +32,8 @@ def init_profiles(qapp, config_stub, cache_tmpdir, data_tmpdir):
 def test_big_cache_size(config_stub):
     """Make sure a too big cache size is handled correctly."""
     config_stub.val.content.cache.size = 2 ** 63 - 1
-    webenginesettings._update_settings('content.cache.size')
+    profile = webenginesettings.default_profile
 
-    size = webenginesettings.default_profile.httpCacheMaximumSize()
-    assert size == 2 ** 31 - 1
+    webenginesettings._set_http_cache_size(profile)
+
+    assert profile.httpCacheMaximumSize() == 2 ** 31 - 1

From 98b2b67b8b9e28308dc858e7e81687eb48b75a58 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 23 Feb 2018 15:08:07 +0100
Subject: [PATCH 557/574] Add tests for per-URL JavaScript settings

---
 tests/end2end/data/javascript/enabled.html      | 16 ++++++++++++++++
 tests/end2end/data/javascript/localstorage.html |  2 ++
 tests/end2end/features/javascript.feature       | 16 ++++++++++++++++
 tests/end2end/fixtures/webserver_sub.py         |  1 +
 4 files changed, 35 insertions(+)
 create mode 100644 tests/end2end/data/javascript/enabled.html

diff --git a/tests/end2end/data/javascript/enabled.html b/tests/end2end/data/javascript/enabled.html
new file mode 100644
index 000000000..a25f02566
--- /dev/null
+++ b/tests/end2end/data/javascript/enabled.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+  <head>
+      <script type="text/javascript">
+          function check_enabled() {
+              const elem = document.getElementById("status");
+              elem.innerHTML = "enabled";
+              console.log("JavaScript is enabled");
+          }
+      </script>
+  </head>
+  <body onload="check_enabled()">
+    <p>JavaScript is <span id="status">disabled</span></p>
+    <noscript>noscript tag</noscript>
+  </body>
+</html>
diff --git a/tests/end2end/data/javascript/localstorage.html b/tests/end2end/data/javascript/localstorage.html
index 28a11f24f..12c17bbc9 100644
--- a/tests/end2end/data/javascript/localstorage.html
+++ b/tests/end2end/data/javascript/localstorage.html
@@ -7,8 +7,10 @@
               try {
                   localStorage.qute_test = "foo";
                   elem.innerHTML = "working";
+                  console.log("local storage is working");
               } catch (e) {
                   elem.innerHTML = "not working";
+                  console.log("local storage is not working");
               }
           }
       </script>
diff --git a/tests/end2end/features/javascript.feature b/tests/end2end/features/javascript.feature
index c74811b4b..8428306cb 100644
--- a/tests/end2end/features/javascript.feature
+++ b/tests/end2end/features/javascript.feature
@@ -151,3 +151,19 @@ Feature: Javascript stuff
         And I run :greasemonkey-reload
         And I open data/hints/iframe.html
         Then the javascript message "Script is running on /data/hints/html/wrapped.html" should not be logged
+
+    Scenario: Per-URL localstorage setting
+        When I set content.local_storage to false
+        And I run :set -u http://localhost:*/data2/* content.local_storage true
+        And I open data/javascript/localstorage.html
+        And I wait for "[*] local storage is not working" in the log
+        And I open data2/javascript/localstorage.html
+        Then the javascript message "local storage is working" should be logged
+
+    Scenario: Per-URL JavaScript setting
+        When I set content.javascript.enabled to false
+        And I run :set -u http://localhost:*/data2/* content.javascript.enabled true
+        And I open data2/javascript/enabled.html
+        And I wait for "[*] JavaScript is enabled" in the log
+        And I open data/javascript/enabled.html
+        Then the page should contain the plaintext "JavaScript is disabled"
diff --git a/tests/end2end/fixtures/webserver_sub.py b/tests/end2end/fixtures/webserver_sub.py
index 4ec4619f7..75c080c34 100644
--- a/tests/end2end/fixtures/webserver_sub.py
+++ b/tests/end2end/fixtures/webserver_sub.py
@@ -48,6 +48,7 @@ def root():
 
 
 @app.route('/data/<path:path>')
+@app.route('/data2/<path:path>')  # for per-URL settings
 def send_data(path):
     """Send a given data file to qutebrowser.
 

From fc6a0dbe646722f6321aff685a60241c16e6b55b Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 23 Feb 2018 17:29:17 +0100
Subject: [PATCH 558/574] Show a simple error page on loading errors without JS

We can't tell what exactly the error is, but it's surely better than nothing.
---
 qutebrowser/browser/webengine/webenginetab.py | 27 ++++++++++---------
 qutebrowser/config/websettings.py             |  4 +++
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 828fe9e56..ce57e498e 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -730,6 +730,15 @@ class WebEngineTab(browsertab.AbstractTab):
         self.send_event(press_evt)
         self.send_event(release_evt)
 
+    def _show_error_page(self, url, error):
+        """Show an error page in the tab."""
+        url_string = url.toDisplayString()
+        error_page = jinja.render(
+            'error.html',
+            title="Error loading page: {}".format(url_string),
+            url=url_string, error=error)
+        self.set_html(error_page)
+
     @pyqtSlot()
     def _on_history_trigger(self):
         try:
@@ -778,13 +787,7 @@ class WebEngineTab(browsertab.AbstractTab):
                 sip.assign(authenticator, QAuthenticator())
                 # pylint: enable=no-member, useless-suppression
             except AttributeError:
-                url_string = url.toDisplayString()
-                error_page = jinja.render(
-                    'error.html',
-                    title="Error loading page: {}".format(url_string),
-                    url=url_string, error="Proxy authentication required",
-                    icon='')
-                self.set_html(error_page)
+                self._show_error_page(url, "Proxy authentication required")
 
     @pyqtSlot(QUrl, 'QAuthenticator*')
     def _on_authentication_required(self, url, authenticator):
@@ -804,12 +807,7 @@ class WebEngineTab(browsertab.AbstractTab):
             except AttributeError:
                 # WORKAROUND for
                 # https://www.riverbankcomputing.com/pipermail/pyqt/2016-December/038400.html
-                url_string = url.toDisplayString()
-                error_page = jinja.render(
-                    'error.html',
-                    title="Error loading page: {}".format(url_string),
-                    url=url_string, error="Authentication required")
-                self.set_html(error_page)
+                self._show_error_page(url, "Authentication required")
 
     @pyqtSlot('QWebEngineFullScreenRequest')
     def _on_fullscreen_requested(self, request):
@@ -873,6 +871,9 @@ class WebEngineTab(browsertab.AbstractTab):
         """
         if not ok:
             self._load_finished_fake.emit(False)
+            if not self.settings.test_attribute('content.javascript.enabled'):
+                # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66643
+                self._show_error_page(self.url(), error="")
 
     @pyqtSlot(usertypes.NavigationRequest)
     def _on_navigation_request(self, navigation):
diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py
index 98d5339fe..86f70ab69 100644
--- a/qutebrowser/config/websettings.py
+++ b/qutebrowser/config/websettings.py
@@ -47,6 +47,10 @@ class AbstractSettings:
         """
         raise NotImplementedError
 
+    def test_attribute(self, name):
+        """Get the value for the given attribute."""
+        return self._settings.testAttribute(self._ATTRIBUTES[name])
+
     def set_font_size(self, name, value):
         """Set the given QWebSettings/QWebEngineSettings font size."""
         assert value is not configutils.UNSET

From 75b65e2f11eda1d26e38c1c585a2445edf097662 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 23 Feb 2018 17:59:12 +0100
Subject: [PATCH 559/574] Simplify attribute handling in
 Web(Kit|Engine)Settings

Let's just have lists in _ATTRIBUTES for WebEngineSettings as well, that allows
us to share some more code.
---
 .../browser/webengine/webenginesettings.py    | 37 ++++++++-----------
 qutebrowser/browser/webkit/webkitsettings.py  |  7 ----
 qutebrowser/config/websettings.py             |  6 ++-
 3 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
index 7d8d14dc6..93f1b4494 100644
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -76,35 +76,35 @@ class WebEngineSettings(websettings.AbstractSettings):
 
     _ATTRIBUTES = {
         'content.xss_auditing':
-            QWebEngineSettings.XSSAuditingEnabled,
+            [QWebEngineSettings.XSSAuditingEnabled],
         'content.images':
-            QWebEngineSettings.AutoLoadImages,
+            [QWebEngineSettings.AutoLoadImages],
         'content.javascript.enabled':
-            QWebEngineSettings.JavascriptEnabled,
+            [QWebEngineSettings.JavascriptEnabled],
         'content.javascript.can_open_tabs_automatically':
-            QWebEngineSettings.JavascriptCanOpenWindows,
+            [QWebEngineSettings.JavascriptCanOpenWindows],
         'content.javascript.can_access_clipboard':
-            QWebEngineSettings.JavascriptCanAccessClipboard,
+            [QWebEngineSettings.JavascriptCanAccessClipboard],
         'content.plugins':
-            QWebEngineSettings.PluginsEnabled,
+            [QWebEngineSettings.PluginsEnabled],
         'content.hyperlink_auditing':
-            QWebEngineSettings.HyperlinkAuditingEnabled,
+            [QWebEngineSettings.HyperlinkAuditingEnabled],
         'content.local_content_can_access_remote_urls':
-            QWebEngineSettings.LocalContentCanAccessRemoteUrls,
+            [QWebEngineSettings.LocalContentCanAccessRemoteUrls],
         'content.local_content_can_access_file_urls':
-            QWebEngineSettings.LocalContentCanAccessFileUrls,
+            [QWebEngineSettings.LocalContentCanAccessFileUrls],
         'content.webgl':
-            QWebEngineSettings.WebGLEnabled,
+            [QWebEngineSettings.WebGLEnabled],
         'content.local_storage':
-            QWebEngineSettings.LocalStorageEnabled,
+            [QWebEngineSettings.LocalStorageEnabled],
 
         'input.spatial_navigation':
-            QWebEngineSettings.SpatialNavigationEnabled,
+            [QWebEngineSettings.SpatialNavigationEnabled],
         'input.links_included_in_focus_chain':
-            QWebEngineSettings.LinksIncludedInFocusChain,
+            [QWebEngineSettings.LinksIncludedInFocusChain],
 
         'scrolling.smooth':
-            QWebEngineSettings.ScrollAnimatorEnabled,
+            [QWebEngineSettings.ScrollAnimatorEnabled],
 
         # Missing QtWebEngine attributes:
         # - ScreenCaptureEnabled
@@ -162,14 +162,7 @@ class WebEngineSettings(websettings.AbstractSettings):
             except AttributeError:
                 continue
 
-            self._ATTRIBUTES[name] = value
-
-    def set_attribute(self, name, value):
-        attribute = self._ATTRIBUTES[name]
-        if value is configutils.UNSET:
-            self._settings.resetAttribute(attribute)
-        else:
-            self._settings.setAttribute(attribute, value)
+            self._ATTRIBUTES[name] = [value]
 
 
 def _init_stylesheet(profile):
diff --git a/qutebrowser/browser/webkit/webkitsettings.py b/qutebrowser/browser/webkit/webkitsettings.py
index 6ba15f62a..d8cbfbb2e 100644
--- a/qutebrowser/browser/webkit/webkitsettings.py
+++ b/qutebrowser/browser/webkit/webkitsettings.py
@@ -121,13 +121,6 @@ class WebKitSettings(websettings.AbstractSettings):
         QWebSettings.FantasyFont: QFont.Fantasy,
     }
 
-    def set_attribute(self, name, value):
-        for attribute in self._ATTRIBUTES[name]:
-            if value is configutils.UNSET:
-                self._settings.resetAttribute(attribute)
-            else:
-                self._settings.setAttribute(attribute, value)
-
 
 def _set_user_stylesheet(settings):
     """Set the generated user-stylesheet."""
diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py
index 86f70ab69..20b59c90c 100644
--- a/qutebrowser/config/websettings.py
+++ b/qutebrowser/config/websettings.py
@@ -45,7 +45,11 @@ class AbstractSettings:
 
         If the value is configutils.UNSET, the value is reset instead.
         """
-        raise NotImplementedError
+        for attribute in self._ATTRIBUTES[name]:
+            if value is configutils.UNSET:
+                self._settings.resetAttribute(attribute)
+            else:
+                self._settings.setAttribute(attribute, value)
 
     def test_attribute(self, name):
         """Get the value for the given attribute."""

From 2c96446bb9dfffa9fa6894c75bd3127743904104 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 23 Feb 2018 18:11:33 +0100
Subject: [PATCH 560/574] Track which settings changed for a URL

This is currently only used so only changed settings are logged, but will used
for more in the next commit.
---
 .../browser/webengine/webenginesettings.py    | 17 ++++-
 qutebrowser/config/websettings.py             | 76 +++++++++++++++----
 2 files changed, 77 insertions(+), 16 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
index 93f1b4494..a4ca69856 100644
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -47,7 +47,10 @@ global_settings = None
 
 class _SettingsWrapper:
 
-    """Expose a QWebEngineSettings interface which acts on all profiles."""
+    """Expose a QWebEngineSettings interface which acts on all profiles.
+
+    For read operations, the default profile value is always used.
+    """
 
     def __init__(self):
         self._settings = [default_profile.settings(),
@@ -69,6 +72,18 @@ class _SettingsWrapper:
         for settings in self._settings:
             settings.setDefaultTextEncoding(*args, **kwargs)
 
+    def testAttribute(self, *args, **kwargs):
+        return self._settings[0].testAttribute(*args, **kwargs)
+
+    def fontSize(self, *args, **kwargs):
+        return self._settings[0].fontSize(*args, **kwargs)
+
+    def fontFamily(self, *args, **kwargs):
+        return self._settings[0].fontFamily(*args, **kwargs)
+
+    def defaultTextEncoding(self, *args, **kwargs):
+        return self._settings[0].defaultTextEncoding(*args, **kwargs)
+
 
 class WebEngineSettings(websettings.AbstractSettings):
 
diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py
index 20b59c90c..dcfc11036 100644
--- a/qutebrowser/config/websettings.py
+++ b/qutebrowser/config/websettings.py
@@ -44,54 +44,91 @@ class AbstractSettings:
         """Set the given QWebSettings/QWebEngineSettings attribute.
 
         If the value is configutils.UNSET, the value is reset instead.
+
+        Return:
+            True if there was a change, False otherwise.
         """
+        old_value = self.test_attribute(name)
+
         for attribute in self._ATTRIBUTES[name]:
             if value is configutils.UNSET:
                 self._settings.resetAttribute(attribute)
+                new_value = self.test_attribute(name)
             else:
                 self._settings.setAttribute(attribute, value)
+                new_value = value
+
+        return old_value != new_value
 
     def test_attribute(self, name):
-        """Get the value for the given attribute."""
-        return self._settings.testAttribute(self._ATTRIBUTES[name])
+        """Get the value for the given attribute.
+
+        If the setting resolves to a list of attributes, only the first
+        attribute is tested.
+        """
+        return self._settings.testAttribute(self._ATTRIBUTES[name][0])
 
     def set_font_size(self, name, value):
-        """Set the given QWebSettings/QWebEngineSettings font size."""
+        """Set the given QWebSettings/QWebEngineSettings font size.
+
+        Return:
+            True if there was a change, False otherwise.
+        """
         assert value is not configutils.UNSET
-        self._settings.setFontSize(self._FONT_SIZES[name], value)
+        family = self._FONT_SIZES[name]
+        old_value = self._settings.fontSize(family)
+        self._settings.setFontSize(family, value)
+        return old_value != value
 
     def set_font_family(self, name, value):
         """Set the given QWebSettings/QWebEngineSettings font family.
 
         With None (the default), QFont is used to get the default font for the
         family.
+
+        Return:
+            True if there was a change, False otherwise.
         """
         assert value is not configutils.UNSET
+        family = self._FONT_FAMILIES[name]
         if value is None:
             font = QFont()
-            font.setStyleHint(self._FONT_TO_QFONT[self._FONT_FAMILIES[name]])
+            font.setStyleHint(self._FONT_TO_QFONT[family])
             value = font.defaultFamily()
 
-        self._settings.setFontFamily(self._FONT_FAMILIES[name], value)
+        old_value = self._settings.fontFamily(family)
+        self._settings.setFontFamily(family, value)
+
+        return value != old_value
 
     def set_default_text_encoding(self, encoding):
-        """Set the default text encoding to use."""
+        """Set the default text encoding to use.
+
+        Return:
+            True if there was a change, False otherwise.
+        """
         assert encoding is not configutils.UNSET
+        old_value = self._settings.defaultTextEncoding()
         self._settings.setDefaultTextEncoding(encoding)
+        return old_value != encoding
 
     def _update_setting(self, setting, value):
         """Update the given setting/value.
 
         Unknown settings are ignored.
+
+        Return:
+            True if there was a change, False otherwise.
         """
         if setting in self._ATTRIBUTES:
-            self.set_attribute(setting, value)
+            return self.set_attribute(setting, value)
         elif setting in self._FONT_SIZES:
-            self.set_font_size(setting, value)
+            return self.set_font_size(setting, value)
         elif setting in self._FONT_FAMILIES:
-            self.set_font_family(setting, value)
+            return self.set_font_family(setting, value)
         elif setting == 'content.default_encoding':
-            self.set_default_text_encoding(value)
+            return self.set_default_text_encoding(value)
+        return False
 
     def update_setting(self, setting):
         """Update the given setting."""
@@ -99,16 +136,25 @@ class AbstractSettings:
         self._update_setting(setting, value)
 
     def update_for_url(self, url):
-        """Update settings customized for the given tab."""
+        """Update settings customized for the given tab.
+
+        Return:
+            A list of settings which actually changed.
+        """
+        changed_settings = []
         for values in config.instance:
             if not values.opt.supports_pattern:
                 continue
 
             value = values.get_for_url(url, fallback=False)
-            log.config.debug("Updating for {}: {} = {}".format(
-                url.toDisplayString(), values.opt.name, value))
 
-            self._update_setting(values.opt.name, value)
+            changed = self._update_setting(values.opt.name, value)
+            if changed:
+                log.config.debug("Changed for {}: {} = {}".format(
+                    url.toDisplayString(), values.opt.name, value))
+                changed_settings.append(values.opt.name)
+
+        return changed_settings
 
     def init_settings(self):
         """Set all supported settings correctly."""

From 820ffed07f11cbfe9966261a62e71236d41595d1 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Fri, 23 Feb 2018 18:06:57 -0500
Subject: [PATCH 561/574] Remove test blacklists for 5.10

---
 tests/end2end/features/search.feature | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/end2end/features/search.feature b/tests/end2end/features/search.feature
index ae3f07999..458b86d60 100644
--- a/tests/end2end/features/search.feature
+++ b/tests/end2end/features/search.feature
@@ -225,15 +225,11 @@ Feature: Searching on a page
         Then the following tabs should be open:
             - data/search.html (active)
 
-    # Following a link selected via JS doesn't work in Qt 5.10 anymore.
-    @qt!=5.10
     Scenario: Follow a manually selected link
         When I run :jseval --file (testdata)/search_select.js
         And I run :follow-selected
         Then data/hello.txt should be loaded
 
-    # Following a link selected via JS doesn't work in Qt 5.10 anymore.
-    @qt!=5.10
     Scenario: Follow a manually selected link in a new tab
         When I run :window-only
         And I run :jseval --file (testdata)/search_select.js

From 08bc55995b756908c9feeb04640c4b7cbfc1f6eb Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 24 Feb 2018 18:25:02 +0100
Subject: [PATCH 562/574] First attempt at reloading pages after setting
 changes

---
 qutebrowser/browser/webengine/webenginetab.py | 23 +++++++++++++++----
 qutebrowser/config/websettings.py             |  6 ++---
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index ce57e498e..32a17916b 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -26,7 +26,7 @@ import html as html_utils
 
 import sip
 from PyQt5.QtCore import (pyqtSignal, pyqtSlot, Qt, QEvent, QPoint, QPointF,
-                          QUrl)
+                          QUrl, QTimer)
 from PyQt5.QtGui import QKeyEvent
 from PyQt5.QtNetwork import QAuthenticator
 from PyQt5.QtWidgets import QApplication
@@ -612,6 +612,7 @@ class WebEngineTab(browsertab.AbstractTab):
         self._init_js()
         self._child_event_filter = None
         self._saved_zoom = None
+        self._reload_url = None
 
     def _init_js(self):
         js_code = '\n'.join([
@@ -871,15 +872,27 @@ class WebEngineTab(browsertab.AbstractTab):
         """
         if not ok:
             self._load_finished_fake.emit(False)
-            if not self.settings.test_attribute('content.javascript.enabled'):
-                # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66643
-                self._show_error_page(self.url(), error="")
+
+    @pyqtSlot(bool)
+    def _on_load_finished(self, ok):
+        super()._on_load_finished(ok)
+        if not ok and not self.settings.test_attribute('content.javascript.enabled'):
+            # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66643
+            self._show_error_page(self.url(), error="")
+        elif ok and self._reload_url is not None:
+            # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66656
+            QTimer.singleShot(100, lambda url=self._reload_url:
+                              self.openurl(url))
+            self._reload_url = None
 
     @pyqtSlot(usertypes.NavigationRequest)
     def _on_navigation_request(self, navigation):
         super()._on_navigation_request(navigation)
         if navigation.accepted and navigation.is_main_frame:
-            self.settings.update_for_url(navigation.url)
+            changed = self.settings.update_for_url(navigation.url)
+            if changed & {'content.plugins', 'content.javascript.enabled'}:
+                navigation.accepted = False
+                self._reload_url = navigation.url
 
     def _connect_signals(self):
         view = self._widget
diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py
index dcfc11036..517c3dd3c 100644
--- a/qutebrowser/config/websettings.py
+++ b/qutebrowser/config/websettings.py
@@ -139,9 +139,9 @@ class AbstractSettings:
         """Update settings customized for the given tab.
 
         Return:
-            A list of settings which actually changed.
+            A set of settings which actually changed.
         """
-        changed_settings = []
+        changed_settings = set()
         for values in config.instance:
             if not values.opt.supports_pattern:
                 continue
@@ -152,7 +152,7 @@ class AbstractSettings:
             if changed:
                 log.config.debug("Changed for {}: {} = {}".format(
                     url.toDisplayString(), values.opt.name, value))
-                changed_settings.append(values.opt.name)
+                changed_settings.add(values.opt.name)
 
         return changed_settings
 

From bfb3a6594f0cecd21dfda0a9d89b52113d905d22 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 24 Feb 2018 23:06:18 +0100
Subject: [PATCH 563/574] Try using tab.reload() on setting changes instead

---
 qutebrowser/browser/webengine/webenginetab.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 32a17916b..73e6ec18d 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -879,10 +879,16 @@ class WebEngineTab(browsertab.AbstractTab):
         if not ok and not self.settings.test_attribute('content.javascript.enabled'):
             # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66643
             self._show_error_page(self.url(), error="")
-        elif ok and self._reload_url is not None:
+
+    @pyqtSlot(QUrl)
+    def _on_url_changed(self, url):
+        super()._on_url_changed(url)
+        if self._reload_url is not None:
             # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66656
-            QTimer.singleShot(100, lambda url=self._reload_url:
-                              self.openurl(url))
+            log.config.debug(
+                "Reloading {} on {} because of config change".format(
+                    self._reload_url.toDisplayString(), url.toDisplayString()))
+            self.reload()
             self._reload_url = None
 
     @pyqtSlot(usertypes.NavigationRequest)
@@ -891,7 +897,6 @@ class WebEngineTab(browsertab.AbstractTab):
         if navigation.accepted and navigation.is_main_frame:
             changed = self.settings.update_for_url(navigation.url)
             if changed & {'content.plugins', 'content.javascript.enabled'}:
-                navigation.accepted = False
                 self._reload_url = navigation.url
 
     def _connect_signals(self):

From 638e8806048c6a66eb080ea5aa082f9bbd639a9a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 24 Feb 2018 23:17:35 +0100
Subject: [PATCH 564/574] Improve workaround for missing error pages

---
 qutebrowser/browser/webengine/webenginetab.py | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 73e6ec18d..130a18c30 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -22,6 +22,7 @@
 import math
 import functools
 import sys
+import re
 import html as html_utils
 
 import sip
@@ -873,12 +874,27 @@ class WebEngineTab(browsertab.AbstractTab):
         if not ok:
             self._load_finished_fake.emit(False)
 
+    def _error_page_workaround(self, html):
+        """Check if we're displaying a Chromium error page.
+
+        This gets only called if we got loadFinished(False) without JavaScript,
+        so we can display at least some error page.
+
+        WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66643
+        Needs to check the page content as a WORKAROUND for
+        https://bugreports.qt.io/browse/QTBUG-66661
+        """
+        match = re.search(r'"errorCode":"([^"]*)"', html)
+        if match is None:
+            return
+        self._show_error_page(self.url(), error=match.group(1))
+
     @pyqtSlot(bool)
     def _on_load_finished(self, ok):
+        """Display a static error page if JavaScript is disabled."""
         super()._on_load_finished(ok)
         if not ok and not self.settings.test_attribute('content.javascript.enabled'):
-            # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66643
-            self._show_error_page(self.url(), error="")
+            self.dump_async(self._error_page_workaround)
 
     @pyqtSlot(QUrl)
     def _on_url_changed(self, url):

From 65a62b67a5aec4de8cf5f43dc8ae3647f69ee996 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 25 Feb 2018 14:43:30 +0100
Subject: [PATCH 565/574] Go back to using tab.openurl on config changes

This seems to work most reliably at the moment...
---
 qutebrowser/browser/webengine/webenginetab.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 130a18c30..c3f493ba1 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -895,16 +895,12 @@ class WebEngineTab(browsertab.AbstractTab):
         super()._on_load_finished(ok)
         if not ok and not self.settings.test_attribute('content.javascript.enabled'):
             self.dump_async(self._error_page_workaround)
-
-    @pyqtSlot(QUrl)
-    def _on_url_changed(self, url):
-        super()._on_url_changed(url)
-        if self._reload_url is not None:
+        if ok and self._reload_url is not None:
             # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66656
             log.config.debug(
-                "Reloading {} on {} because of config change".format(
-                    self._reload_url.toDisplayString(), url.toDisplayString()))
-            self.reload()
+                "Reloading {} because of config change".format(
+                    self._reload_url.toDisplayString()))
+            QTimer.singleShot(100, lambda url=self._reload_url: self.openurl(url))
             self._reload_url = None
 
     @pyqtSlot(usertypes.NavigationRequest)

From eade305965b68627d4313e0664979692a7025994 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 25 Feb 2018 15:02:38 +0100
Subject: [PATCH 566/574] Add a predicted_navigation signal

This is emitted when we know that we're going to visit some URL, but Qt doesn't
know yet. This way, we can change the settings early, and since we know which
settings have actually changed, prevent a change needing a reload in
_on_navigation_request.
---
 qutebrowser/browser/browsertab.py             |  7 ++++++-
 qutebrowser/browser/webengine/webenginetab.py | 10 +++++++++-
 qutebrowser/browser/webkit/webkittab.py       |  3 ++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 3fb700420..bc1b6cb5c 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -616,6 +616,7 @@ class AbstractTab(QWidget):
                                      process terminated.
                                      arg 0: A TerminationStatus member.
                                      arg 1: The exit code.
+        predicted_navigation: Emitted before we tell Qt to open a URL.
     """
 
     window_close_requested = pyqtSignal()
@@ -633,6 +634,7 @@ class AbstractTab(QWidget):
     add_history_item = pyqtSignal(QUrl, QUrl, str)  # url, requested url, title
     fullscreen_requested = pyqtSignal(bool)
     renderer_process_terminated = pyqtSignal(TerminationStatus, int)
+    predicted_navigation = pyqtSignal(QUrl)
 
     def __init__(self, *, win_id, mode_manager, private, parent=None):
         self.private = private
@@ -663,6 +665,9 @@ class AbstractTab(QWidget):
         objreg.register('hintmanager', hintmanager, scope='tab',
                         window=self.win_id, tab=self.tab_id)
 
+        self.predicted_navigation.connect(
+            lambda url: self.title_changed.emit(url.toDisplayString()))
+
     def _set_widget(self, widget):
         # pylint: disable=protected-access
         self._widget = widget
@@ -811,7 +816,7 @@ class AbstractTab(QWidget):
 
     def _openurl_prepare(self, url):
         qtutils.ensure_valid(url)
-        self.title_changed.emit(url.toDisplayString())
+        self.predicted_navigation.emit(url)
 
     def openurl(self, url):
         raise NotImplementedError
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index c3f493ba1..4fcb6d279 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -471,7 +471,8 @@ class WebEngineHistory(browsertab.AbstractHistory):
         return self._history.itemAt(i)
 
     def _go_to_item(self, item):
-        return self._history.goToItem(item)
+        self._tab.predicted_navigation.emit(item.url())
+        self._history.goToItem(item)
 
     def serialize(self):
         if not qtutils.version_check('5.9', compiled=False):
@@ -903,6 +904,11 @@ class WebEngineTab(browsertab.AbstractTab):
             QTimer.singleShot(100, lambda url=self._reload_url: self.openurl(url))
             self._reload_url = None
 
+    @pyqtSlot(QUrl)
+    def _on_predicted_navigation(self, url):
+        """If we know we're going to visit an URL soon, change the settings."""
+        self.settings.update_for_url(url)
+
     @pyqtSlot(usertypes.NavigationRequest)
     def _on_navigation_request(self, navigation):
         super()._on_navigation_request(navigation)
@@ -946,5 +952,7 @@ class WebEngineTab(browsertab.AbstractTab):
             page.loadFinished.connect(self._restore_zoom)
             page.loadFinished.connect(self._on_load_finished)
 
+        self.predicted_navigation.connect(self._on_predicted_navigation)
+
     def event_target(self):
         return self._widget.focusProxy()
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 5184550cd..7af0b474d 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -518,7 +518,8 @@ class WebKitHistory(browsertab.AbstractHistory):
         return self._history.itemAt(i)
 
     def _go_to_item(self, item):
-        return self._history.goToItem(item)
+        self._tab.predicted_navigation.emit(item.url())
+        self._history.goToItem(item)
 
     def serialize(self):
         return qtutils.serialize(self._history)

From 97e00ba4b529e0791d6a306478f693ae3b12775b Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 25 Feb 2018 15:03:30 +0100
Subject: [PATCH 567/574] Only reload after setting changes when needed

Apparently, things work fine with Type.link_clicked even if we don't emit
predicted_navigation there...
---
 qutebrowser/browser/webengine/webenginetab.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 4fcb6d279..be7929510 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -914,7 +914,9 @@ class WebEngineTab(browsertab.AbstractTab):
         super()._on_navigation_request(navigation)
         if navigation.accepted and navigation.is_main_frame:
             changed = self.settings.update_for_url(navigation.url)
-            if changed & {'content.plugins', 'content.javascript.enabled'}:
+            if (changed & {'content.plugins', 'content.javascript.enabled'} and
+                    navigation.navigation_type != navigation.Type.link_clicked):
+                # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66656
                 self._reload_url = navigation.url
 
     def _connect_signals(self):

From d44ff5ba01bea65444b96a05eb5252a39b99824f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 25 Feb 2018 15:53:01 +0100
Subject: [PATCH 568/574] Don't load the URL immediately on :undo

On some pages like Qt's Gerrit, Indiegogo or Telegram Web, this caused a crash
with QtWebEngine and Qt 5.10.1 in
QtWebEngineCore::WebContentsAdapter::webContents().

I'm not sure what causes the crash exactly, but I'm guessing it's some kind of
race condition between loading the URL initially and deserializing the history,
which both ends up loading the URL.

Since restoring the history means we end up on the given URL anyways, let's just
not open the URL beforehand, which seems to fix this.

Fixes #3619.
---
 doc/changelog.asciidoc                  | 1 +
 qutebrowser/mainwindow/tabbedbrowser.py | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 2f1a1f1db..13636f3b2 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -76,6 +76,7 @@ Fixed
 - QtWebEngine: Hinting and scrolling now works properly on special
   `view-source:` pages.
 - QtWebEngine: Scroll positions are now restored correctly from sessions.
+- QtWebEngine: Crash with Qt 5.10.1 when using :undo on some tabs.
 - QtWebKit: `:view-source` now displays a valid URL.
 - URLs containing ampersands and other special chars are now shown
   correctly when filtering them in the completion.
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 8cee35524..299a5fb08 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -378,12 +378,10 @@ class TabbedBrowser(tabwidget.TabWidget):
 
         for entry in reversed(self._undo_stack.pop()):
             if use_current_tab:
-                self.openurl(entry.url, newtab=False)
                 newtab = self.widget(0)
                 use_current_tab = False
             else:
-                newtab = self.tabopen(entry.url, background=False,
-                                      idx=entry.index)
+                newtab = self.tabopen(background=False, idx=entry.index)
 
             newtab.history.deserialize(entry.history)
             self.set_tab_pinned(newtab, entry.pinned)

From a32d74e9830d476f14dae086b81601df38d91144 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 25 Feb 2018 16:08:15 +0100
Subject: [PATCH 569/574] Fix lint

---
 qutebrowser/browser/webengine/webenginesettings.py |  2 +-
 qutebrowser/browser/webengine/webenginetab.py      | 12 ++++++++----
 qutebrowser/browser/webkit/webkitsettings.py       |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
index a4ca69856..2b9ae55e2 100644
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -33,7 +33,7 @@ from PyQt5.QtWebEngineWidgets import (QWebEngineSettings, QWebEngineProfile,
 
 from qutebrowser.browser import shared
 from qutebrowser.browser.webengine import spell
-from qutebrowser.config import config, websettings, configutils
+from qutebrowser.config import config, websettings
 from qutebrowser.utils import (utils, standarddir, javascript, qtutils,
                                message, log, objreg)
 
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index be7929510..ab0b866ca 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -894,14 +894,17 @@ class WebEngineTab(browsertab.AbstractTab):
     def _on_load_finished(self, ok):
         """Display a static error page if JavaScript is disabled."""
         super()._on_load_finished(ok)
-        if not ok and not self.settings.test_attribute('content.javascript.enabled'):
+        js_enabled = self.settings.test_attribute('content.javascript.enabled')
+        if not ok and not js_enabled:
             self.dump_async(self._error_page_workaround)
+
         if ok and self._reload_url is not None:
             # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66656
             log.config.debug(
                 "Reloading {} because of config change".format(
                     self._reload_url.toDisplayString()))
-            QTimer.singleShot(100, lambda url=self._reload_url: self.openurl(url))
+            QTimer.singleShot(100, lambda url=self._reload_url:
+                              self.openurl(url))
             self._reload_url = None
 
     @pyqtSlot(QUrl)
@@ -914,8 +917,9 @@ class WebEngineTab(browsertab.AbstractTab):
         super()._on_navigation_request(navigation)
         if navigation.accepted and navigation.is_main_frame:
             changed = self.settings.update_for_url(navigation.url)
-            if (changed & {'content.plugins', 'content.javascript.enabled'} and
-                    navigation.navigation_type != navigation.Type.link_clicked):
+            needs_reload = {'content.plugins', 'content.javascript.enabled'}
+            if (changed & needs_reload and navigation.navigation_type !=
+                    navigation.Type.link_clicked):
                 # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66656
                 self._reload_url = navigation.url
 
diff --git a/qutebrowser/browser/webkit/webkitsettings.py b/qutebrowser/browser/webkit/webkitsettings.py
index d8cbfbb2e..9b120e514 100644
--- a/qutebrowser/browser/webkit/webkitsettings.py
+++ b/qutebrowser/browser/webkit/webkitsettings.py
@@ -29,7 +29,7 @@ import os.path
 from PyQt5.QtGui import QFont
 from PyQt5.QtWebKit import QWebSettings
 
-from qutebrowser.config import config, websettings, configutils
+from qutebrowser.config import config, websettings
 from qutebrowser.utils import standarddir, urlutils
 from qutebrowser.browser import shared
 

From 4c147b77c1bb8586705d6d2550c468827e7d47cb Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 25 Feb 2018 16:35:02 +0100
Subject: [PATCH 570/574] Add a test for the error page workaround

---
 qutebrowser/browser/webengine/webenginetab.py | 1 +
 tests/end2end/features/javascript.feature     | 6 ++++++
 tests/end2end/fixtures/webserver.py           | 1 +
 tests/end2end/fixtures/webserver_sub.py       | 8 ++++++++
 4 files changed, 16 insertions(+)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index ab0b866ca..e66ed50c1 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -735,6 +735,7 @@ class WebEngineTab(browsertab.AbstractTab):
 
     def _show_error_page(self, url, error):
         """Show an error page in the tab."""
+        log.misc.debug("Showing error page for {}".format(error))
         url_string = url.toDisplayString()
         error_page = jinja.render(
             'error.html',
diff --git a/tests/end2end/features/javascript.feature b/tests/end2end/features/javascript.feature
index 8428306cb..392a291b5 100644
--- a/tests/end2end/features/javascript.feature
+++ b/tests/end2end/features/javascript.feature
@@ -167,3 +167,9 @@ Feature: Javascript stuff
         And I wait for "[*] JavaScript is enabled" in the log
         And I open data/javascript/enabled.html
         Then the page should contain the plaintext "JavaScript is disabled"
+
+    @qtwebkit_skip
+    Scenario: Error pages without JS enabled
+        When I set content.javascript.enabled to false
+        And I open 500
+        Then "Showing error page for* 500" should be logged
diff --git a/tests/end2end/fixtures/webserver.py b/tests/end2end/fixtures/webserver.py
index 2beb6fb95..46065b6c8 100644
--- a/tests/end2end/fixtures/webserver.py
+++ b/tests/end2end/fixtures/webserver.py
@@ -79,6 +79,7 @@ class Request(testprocess.Line):
             '/cookies/set': [http.client.FOUND],
 
             '/500-inline': [http.client.INTERNAL_SERVER_ERROR],
+            '/500': [http.client.INTERNAL_SERVER_ERROR],
         }
         for i in range(15):
             path_to_statuses['/redirect/{}'.format(i)] = [http.client.FOUND]
diff --git a/tests/end2end/fixtures/webserver_sub.py b/tests/end2end/fixtures/webserver_sub.py
index 75c080c34..1bd9e8a66 100644
--- a/tests/end2end/fixtures/webserver_sub.py
+++ b/tests/end2end/fixtures/webserver_sub.py
@@ -179,6 +179,14 @@ def internal_error_attachment():
     return response
 
 
+@app.route('/500')
+def internal_error():
+    """A normal 500 error."""
+    r = flask.make_response()
+    r.status_code = 500
+    return r
+
+
 @app.route('/cookies')
 def view_cookies():
     """Show cookies."""

From abf4d10d5bbac543c19817b533bea569aa00fec2 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 25 Feb 2018 19:33:27 +0100
Subject: [PATCH 571/574] Add a test for :set -p with a pattern

---
 tests/unit/config/test_configcommands.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/tests/unit/config/test_configcommands.py b/tests/unit/config/test_configcommands.py
index 27075e869..cafc1ac31 100644
--- a/tests/unit/config/test_configcommands.py
+++ b/tests/unit/config/test_configcommands.py
@@ -130,17 +130,26 @@ class TestSet:
         assert config_stub.val.url.auto_search == 'never'
         assert yaml_value('url.auto_search') == 'dns'
 
-    def test_set_print(self, config_stub, commands, message_mock):
-        """Run ':set -p url.auto_search never'.
+    @pytest.mark.parametrize('pattern', [None, '*://example.com'])
+    def test_set_print(self, config_stub, commands, message_mock, pattern):
+        """Run ':set -p [-u *://example.com] content.javascript.enabled false'.
 
         Should set show the value.
         """
-        assert config_stub.val.url.auto_search == 'naive'
-        commands.set(0, 'url.auto_search', 'dns', print_=True)
+        assert config_stub.val.content.javascript.enabled
+        commands.set(0, 'content.javascript.enabled', 'false', print_=True,
+                     pattern=pattern)
 
-        assert config_stub.val.url.auto_search == 'dns'
+        value = config_stub.get_obj_for_pattern(
+            'content.javascript.enabled',
+            pattern=None if pattern is None else urlmatch.UrlPattern(pattern))
+        assert not value
+
+        expected = 'content.javascript.enabled = false'
+        if pattern is not None:
+            expected += ' for {}'.format(pattern)
         msg = message_mock.getmsg(usertypes.MessageLevel.info)
-        assert msg.text == 'url.auto_search = dns'
+        assert msg.text == expected
 
     def test_set_invalid_option(self, commands):
         """Run ':set foo bar'.

From ba88fc43e05d2aa692cf132ffe5df6239933aa75 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 25 Feb 2018 19:40:38 +0100
Subject: [PATCH 572/574] Stabilize error page test

---
 tests/end2end/features/javascript.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/end2end/features/javascript.feature b/tests/end2end/features/javascript.feature
index 392a291b5..401487747 100644
--- a/tests/end2end/features/javascript.feature
+++ b/tests/end2end/features/javascript.feature
@@ -171,5 +171,5 @@ Feature: Javascript stuff
     @qtwebkit_skip
     Scenario: Error pages without JS enabled
         When I set content.javascript.enabled to false
-        And I open 500
+        And I open 500 without waiting
         Then "Showing error page for* 500" should be logged

From a98466336ecd6e0af1650ba735287d019f8be142 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 25 Feb 2018 19:58:23 +0100
Subject: [PATCH 573/574] Update changelog

---
 doc/changelog.asciidoc | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 13636f3b2..0d49416e0 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -21,6 +21,17 @@ v1.2.0 (unreleased)
 Added
 ~~~~~
 
+- Initial implementation of per-domain settings:
+  * `:set` and `:config-cycle` now have a `-u`/`--pattern` argument taking a
+    https://developer.chrome.com/extensions/match_patterns[URL match pattern]
+    for supported settings.
+  * `config.set` in `config.py` now takes a third argument which is the pattern.
+  * New `with config.pattern('...') as p:` context manager for `config.py` to
+    use the shorthand syntax with a pattern.
+  * New `tsh` keybinding to toggle scripts for the current host. With a capital
+    `S`, the toggle is saved. With a capital `H`, subdomains are included.
+  * New `tsu` keybinding to toggle scripts for the current URL. With a capital
+    `S`, the toggle is saved.
 - QtWebEngine: Caret/visual mode is now supported.
 - QtWebEngine: Authentication via ~/.netrc is now supported.
 - A new `qute://bindings` page, opened by `:bind`, shows all keybindings.

From 3df066c6948fa3cbc645b4ad200f3b7b5a0af903 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 25 Feb 2018 21:10:35 +0100
Subject: [PATCH 574/574] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 0d49416e0..e85d9a188 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -88,6 +88,7 @@ Fixed
   `view-source:` pages.
 - QtWebEngine: Scroll positions are now restored correctly from sessions.
 - QtWebEngine: Crash with Qt 5.10.1 when using :undo on some tabs.
+- QtWebEngine: `:follow-selected` should now work in more cases with Qt > 5.10.
 - QtWebKit: `:view-source` now displays a valid URL.
 - URLs containing ampersands and other special chars are now shown
   correctly when filtering them in the completion.