From ae1c8653d6b64f106f7212edbcbb5dca78261912 Mon Sep 17 00:00:00 2001
From: Felix Van der Jeugt <felix.vanderjeugt@gmail.com>
Date: Tue, 1 Aug 2017 16:32:49 +0200
Subject: [PATCH] back to master for now, allow history

---
 config/qutebrowser/keys.conf        | 10 ++--------
 config/qutebrowser/qutebrowser.conf |  6 ++----
 local/bin/qutebrowser               |  6 +++---
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/config/qutebrowser/keys.conf b/config/qutebrowser/keys.conf
index 075b55c..e3a31dc 100644
--- a/config/qutebrowser/keys.conf
+++ b/config/qutebrowser/keys.conf
@@ -49,20 +49,14 @@ leave-mode
 clear-keychain ;; search ;; fullscreen --leave
     <escape>
 
-set-cmd-text -s :goto
-    o
-
 set-cmd-text -s :open
-    gh
+    o
 
 set-cmd-text :goto {url}
     go
 
-set-cmd-text -s :goto -t
-    O
-
 set-cmd-text -s :open -t
-    gH
+    O
 
 set-cmd-text :goto -t {url}
     gO
diff --git a/config/qutebrowser/qutebrowser.conf b/config/qutebrowser/qutebrowser.conf
index d823ab0..22f7aac 100644
--- a/config/qutebrowser/qutebrowser.conf
+++ b/config/qutebrowser/qutebrowser.conf
@@ -381,8 +381,6 @@ user-agent =
 #     The proxy to use.
 #     In addition to the listed values, you can use a `socks://...` or
 #     `http://...` URL.
-#     This setting only works with Qt 5.8 or newer when using the
-#     QtWebEngine backend.
 #         system: Use the system wide proxy.
 #         none: Don't use any proxy
 #     Default: system
@@ -457,8 +455,8 @@ cmd-history-max-items = 100
 # web-history-max-items (Int):
 #     How many URLs to show in the web history.
 #     0: no history / -1: unlimited
-#     Default: 1000
-web-history-max-items = 1000
+#     Default: -1
+web-history-max-items = -1
 
 # quick-complete (Bool):
 #     Whether to move on to the next part when there's only one possible
diff --git a/local/bin/qutebrowser b/local/bin/qutebrowser
index ab1a257..ed0ab57 100755
--- a/local/bin/qutebrowser
+++ b/local/bin/qutebrowser
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
-# EASY-INSTALL-ENTRY-SCRIPT: 'qutebrowser==0.10.1','gui_scripts','qutebrowser'
-__requires__ = 'qutebrowser==0.10.1'
+# EASY-INSTALL-ENTRY-SCRIPT: 'qutebrowser==0.11.0','gui_scripts','qutebrowser'
+__requires__ = 'qutebrowser==0.11.0'
 import re
 import sys
 from pkg_resources import load_entry_point
@@ -8,5 +8,5 @@ from pkg_resources import load_entry_point
 if __name__ == '__main__':
     sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
     sys.exit(
-        load_entry_point('qutebrowser==0.10.1', 'gui_scripts', 'qutebrowser')()
+        load_entry_point('qutebrowser==0.11.0', 'gui_scripts', 'qutebrowser')()
     )