Show all leave-mode bindings in statusbar in passthrough mode

Fixes qutebrowser#4921
fmiqbal · Jul 19, 2019 · 898544b · 898544b
1 parent 81a5ada
commit 898544b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git 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.8.0 (unreleased)
+-------------------
+
+Changed
+~~~~~~~
+
+- The statusbar text for passthrough mode now shows all configured bindings to
+  leave the mode, not only one.
+
 v1.7.0 (2019-07-18)
 -------------------
 

diff --git a/qutebrowser/mainwindow/statusbar/bar.py b/qutebrowser/mainwindow/statusbar/bar.py
@@ -308,7 +308,7 @@ def _set_mode_text(self, mode):
             all_bindings = key_instance.get_reverse_bindings_for('passthrough')
             bindings = all_bindings.get('leave-mode')
             if bindings:
-                suffix = ' ({} to leave)'.format(bindings[0])
+                suffix = ' ({} to leave)'.format(' or '.join(bindings))
             else:
                 suffix = ''
         else: