back to master for now, allow history

This commit is contained in:
Felix Van der Jeugt 2017-08-01 16:32:49 +02:00
parent b31fb6439a
commit ae1c8653d6
No known key found for this signature in database
GPG Key ID: 58B209295023754D
3 changed files with 7 additions and 15 deletions

View File

@ -49,20 +49,14 @@ leave-mode
clear-keychain ;; search ;; fullscreen --leave clear-keychain ;; search ;; fullscreen --leave
<escape> <escape>
set-cmd-text -s :goto
o
set-cmd-text -s :open set-cmd-text -s :open
gh o
set-cmd-text :goto {url} set-cmd-text :goto {url}
go go
set-cmd-text -s :goto -t
O
set-cmd-text -s :open -t set-cmd-text -s :open -t
gH O
set-cmd-text :goto -t {url} set-cmd-text :goto -t {url}
gO gO

View File

@ -381,8 +381,6 @@ user-agent =
# The proxy to use. # The proxy to use.
# In addition to the listed values, you can use a `socks://...` or # In addition to the listed values, you can use a `socks://...` or
# `http://...` URL. # `http://...` URL.
# This setting only works with Qt 5.8 or newer when using the
# QtWebEngine backend.
# system: Use the system wide proxy. # system: Use the system wide proxy.
# none: Don't use any proxy # none: Don't use any proxy
# Default: system # Default: system
@ -457,8 +455,8 @@ cmd-history-max-items = 100
# web-history-max-items (Int): # web-history-max-items (Int):
# How many URLs to show in the web history. # How many URLs to show in the web history.
# 0: no history / -1: unlimited # 0: no history / -1: unlimited
# Default: 1000 # Default: -1
web-history-max-items = 1000 web-history-max-items = -1
# quick-complete (Bool): # quick-complete (Bool):
# Whether to move on to the next part when there's only one possible # Whether to move on to the next part when there's only one possible

View File

@ -1,6 +1,6 @@
#!/usr/bin/python3 #!/usr/bin/python3
# EASY-INSTALL-ENTRY-SCRIPT: 'qutebrowser==0.10.1','gui_scripts','qutebrowser' # EASY-INSTALL-ENTRY-SCRIPT: 'qutebrowser==0.11.0','gui_scripts','qutebrowser'
__requires__ = 'qutebrowser==0.10.1' __requires__ = 'qutebrowser==0.11.0'
import re import re
import sys import sys
from pkg_resources import load_entry_point from pkg_resources import load_entry_point
@ -8,5 +8,5 @@ from pkg_resources import load_entry_point
if __name__ == '__main__': if __name__ == '__main__':
sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
sys.exit( sys.exit(
load_entry_point('qutebrowser==0.10.1', 'gui_scripts', 'qutebrowser')() load_entry_point('qutebrowser==0.11.0', 'gui_scripts', 'qutebrowser')()
) )