From f3c1cf7a24db1792059cff6f2c0f13dcf203802c Mon Sep 17 00:00:00 2001
From: Samir Benmendil <me@rmz.io>
Date: Thu, 15 Sep 2016 13:16:12 +0100
Subject: [PATCH] qutebrowser: update config/bindings

---
 qutebrowser/keys.conf        | 13 ++++++-------
 qutebrowser/quickmarks       |  1 -
 qutebrowser/qutebrowser.conf | 33 ++++++++++++++++++---------------
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/qutebrowser/keys.conf b/qutebrowser/keys.conf
index 534a729..2ef0f35 100644
--- a/qutebrowser/keys.conf
+++ b/qutebrowser/keys.conf
@@ -27,8 +27,7 @@
 #
 # For simple keys (no `<>`-signs), a capital letter means the key is pressed
 # with Shift. For special keys (with `<>`-signs), you need to explicitly add
-# `Shift-` to match a key pressed with shift.  You can bind multiple commands
-# by separating them with `;;`.
+# `Shift-` to match a key pressed with shift.
 #
 # Note that default keybindings are always bound, and need to be explicitly
 # unbound if you wish to remove them:
@@ -287,7 +286,7 @@ set-cmd-text -s :set
 set-cmd-text -s :set -t
     sl
 
-set-cmd-text -s :set keybind
+set-cmd-text -s :bind
     sk
 
 zoom-out
@@ -532,8 +531,8 @@ completion-item-focus prev-category
 # bind special keys.
 # Useful hidden commands to map in this section:
 #  * `prompt-accept`: Confirm the entered value.
-#  * `prompt-yes`: Answer yes to a yes/no question.
-#  * `prompt-no`: Answer no to a yes/no question.
+#  * `prompt-accept yes`: Answer yes to a yes/no question.
+#  * `prompt-accept no`: Answer no to a yes/no question.
 
 prompt-accept
     <return>
@@ -543,10 +542,10 @@ prompt-accept
     <enter>
     <shift-enter>
 
-prompt-yes
+prompt-accept yes
     y
 
-prompt-no
+prompt-accept no
     n
 
 prompt-open-download
diff --git a/qutebrowser/quickmarks b/qutebrowser/quickmarks
index 8b13789..e69de29 100644
--- a/qutebrowser/quickmarks
+++ b/qutebrowser/quickmarks
@@ -1 +0,0 @@
-
diff --git a/qutebrowser/qutebrowser.conf b/qutebrowser/qutebrowser.conf
index 7eb7f85..f577b87 100644
--- a/qutebrowser/qutebrowser.conf
+++ b/qutebrowser/qutebrowser.conf
@@ -38,6 +38,11 @@
 #     The default page(s) to open at the start, separated by commas.
 #     Default: https://duckduckgo.com
 #
+# yank-ignored-url-parameters (List of String):
+#     The URL parameters to strip with :yank url, separated by commas.
+#     Default:
+#     ref,utm_source,utm_medium,utm_campaign,utm_term,utm_content
+#
 # default-page (FuzzyUrl):
 #     The page to open if :open -t/-b/-w is used without URL. Use
 #     `about:blank` for a blank page.
@@ -160,6 +165,7 @@
 #     Default: path,query
 ignore-case = smart
 startpage = https://duckduckgo.com/?t=chakra
+yank-ignored-url-parameters = ref,utm_source,utm_medium,utm_campaign,utm_term,utm_content
 default-page = ${startpage}
 auto-search = naive
 auto-save-config = true
@@ -235,7 +241,7 @@ url-incdec-segments = path,query
 #     User stylesheet to use (absolute filename, filename relative to
 #     the config directory or CSS string). Will expand environment
 #     variables.
-#     Default: ::-webkit-scrollbar { width: 0px; height: 0px; }
+#     Default: html > ::-webkit-scrollbar { width: 0px; height: 0px; }
 #
 # css-media-type (String):
 #     Set the CSS media type.
@@ -372,10 +378,12 @@ custom-headers =
 [completion]
 # Options related to completion and command history.
 #
-# auto-open (Bool):
-#     Automatically open completion when typing.
-#     Valid values: true, false
-#     Default: true
+# show (String):
+#     When to show the autocompletion window.
+#         always: Whenever a completion is available.
+#         auto: Whenever a completion is requested.
+#         never: Never.
+#     Default: always
 #
 # download-path-suggestion (String):
 #     What to display in the download filename input.
@@ -388,11 +396,6 @@ custom-headers =
 #     How to format timestamps (e.g. for history)
 #     Default: %Y-%m-%d
 #
-# show (Bool):
-#     Whether to show the autocompletion window.
-#     Valid values: true, false
-#     Default: true
-#
 # height (PercOrInt):
 #     The height of the completion, in px or as percentage of the
 #     window.
@@ -427,10 +430,9 @@ custom-headers =
 # scrollbar-padding (Int):
 #     Padding of scrollbar handle in completion window (in px).
 #     Default: 2
-auto-open = true
+show = always
 download-path-suggestion = path
 timestamp-format = %Y-%m-%d
-show = true
 height = 150
 cmd-history-max-items = 100
 web-history-max-items = 1000
@@ -793,8 +795,9 @@ cache-size = 52428800
 #     Valid values: true, false, ask
 #     Default: ask
 #
-# javascript-can-open-windows (Bool):
-#     Whether JavaScript programs can open new windows.
+# javascript-can-open-windows-automatically (Bool):
+#     Whether JavaScript programs can open new windows without user
+#     interaction.
 #     Valid values: true, false
 #     Default: false
 #
@@ -881,7 +884,7 @@ css-regions = true
 hyperlink-auditing = false
 geolocation = ask
 notifications = ask
-javascript-can-open-windows = false
+javascript-can-open-windows-automatically = false
 javascript-can-close-windows = false
 javascript-can-access-clipboard = false
 ignore-javascript-prompt = false
-- 
2.48.1