From bedfd47f055860776bf81e6a5b52bd698252f957 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Wed, 27 Jan 2021 18:14:24 +0100
Subject: Use commands for 'S.' bindings

---
 doc/help/commands.asciidoc        |  3 ++-
 doc/help/settings.asciidoc        | 10 +++++-----
 qutebrowser/browser/commands.py   |  5 ++++-
 qutebrowser/config/configdata.yml | 10 +++++-----
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 18ff44553..014dab2df 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -214,11 +214,12 @@ Delete a bookmark.
 
 [[bookmark-list]]
 === bookmark-list
-Syntax: +:bookmark-list [*--tab*] [*--bg*] [*--window*]+
+Syntax: +:bookmark-list [*--jump*] [*--tab*] [*--bg*] [*--window*]+
 
 Show all bookmarks/quickmarks.
 
 ==== optional arguments
+* +*-j*+, +*--jump*+: Jump to the "bookmarks" header.
 * +*-t*+, +*--tab*+: Open in a new tab.
 * +*-b*+, +*--bg*+: Open in a background tab.
 * +*-w*+, +*--window*+: Open in a new window.
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index d0b1579d7..ccfc6f6ed 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -616,10 +616,10 @@ Default:
 * +pass:[PP]+: +pass:[open -t -- {primary}]+
 * +pass:[Pp]+: +pass:[open -t -- {clipboard}]+
 * +pass:[R]+: +pass:[reload -f]+
-* +pass:[Sb]+: +pass:[open qute://bookmarks#bookmarks]+
-* +pass:[Sh]+: +pass:[open qute://history]+
-* +pass:[Sq]+: +pass:[open qute://bookmarks]+
-* +pass:[Ss]+: +pass:[open qute://settings]+
+* +pass:[Sb]+: +pass:[bookmark-list --jump]+
+* +pass:[Sh]+: +pass:[history]+
+* +pass:[Sq]+: +pass:[bookmark-list]+
+* +pass:[Ss]+: +pass:[set]+
 * +pass:[T]+: +pass:[tab-focus]+
 * +pass:[U]+: +pass:[undo -w]+
 * +pass:[V]+: +pass:[mode-enter caret ;; selection-toggle --line]+
@@ -1891,7 +1891,7 @@ Default: +pass:[false]+
 [[completion.web_history.exclude]]
 === completion.web_history.exclude
 A list of patterns which should not be shown in the history.
-This only affects the completion. Matching URLs are still saved in the history (and visible on the qute://history page), but hidden in the completion.
+This only affects the completion. Matching URLs are still saved in the history (and visible on the `:history` page), but hidden in the completion.
 Changing this setting will cause the completion history to be regenerated on the next start, which will take a short while.
 
 This setting requires a restart.
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 8779e4cf3..dc0664238 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1283,15 +1283,18 @@ class CommandDispatcher:
         message.info("Removed bookmark {}".format(url))
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
-    def bookmark_list(self, tab=True, bg=False, window=False):
+    def bookmark_list(self, jump=False, tab=True, bg=False, window=False):
         """Show all bookmarks/quickmarks.
 
         Args:
             tab: Open in a new tab.
             bg: Open in a background tab.
             window: Open in a new window.
+            jump: Jump to the "bookmarks" header.
         """
         url = QUrl('qute://bookmarks/')
+        if jump:
+            url.setFragment('bookmarks')
         self._open(url, tab, bg, window)
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index b0c9462e5..0b84292a3 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -1088,7 +1088,7 @@ completion.web_history.exclude:
     A list of patterns which should not be shown in the history.
 
     This only affects the completion. Matching URLs are still saved in the
-    history (and visible on the qute://history page), but hidden in the
+    history (and visible on the `:history` page), but hidden in the
     completion.
 
     Changing this setting will cause the completion history to be regenerated
@@ -3369,10 +3369,10 @@ bindings.default:
       <Ctrl-h>: home
       <Ctrl-s>: stop
       <Ctrl-Alt-p>: print
-      Ss: open qute://settings
-      Sb: open qute://bookmarks#bookmarks
-      Sq: open qute://bookmarks
-      Sh: open qute://history
+      Ss: set
+      Sb: bookmark-list --jump
+      Sq: bookmark-list
+      Sh: history
       <Return>: selection-follow
       <Ctrl-Return>: selection-follow -t
       .: repeat-command
-- 
cgit v1.2.3-54-g00ecf