From f28d52322593854155395862cb06a80540c13aef Mon Sep 17 00:00:00 2001
From: Iordanis Grigoriou <iordanis.grigoriou@gmail.com>
Date: Fri, 16 Jun 2017 12:28:56 +0200
Subject: [PATCH] Select the last focused tab when running ':tab-focus <current
 tab number>'

---
 qutebrowser/browser/commands.py     |  5 +++--
 tests/end2end/features/tabs.feature | 12 ++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 97a764c68..810e357ce 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1076,10 +1076,11 @@ class CommandDispatcher:
                    last tab.
             count: The tab index to focus, starting with 1.
         """
-        if index == 'last':
+        index = count if count is not None else index
+
+        if index in ('last', self._current_index() + 1):
             self._tab_focus_last()
             return
-        index = count if count is not None else index
 
         if index is None:
             self.tab_next()
diff --git a/tests/end2end/features/tabs.feature b/tests/end2end/features/tabs.feature
index 00fe5c16a..5e5e7f24c 100644
--- a/tests/end2end/features/tabs.feature
+++ b/tests/end2end/features/tabs.feature
@@ -236,6 +236,18 @@ Feature: Tab management
             - data/numbers/2.txt
             - data/numbers/3.txt
 
+    Scenario: :tab-focus with current tab number
+        When I open data/numbers/1.txt
+        And I open data/numbers/2.txt in a new tab
+        And I open data/numbers/3.txt in a new tab
+        And I run :tab-focus 1
+        And I run :tab-focus 3
+        And I run :tab-focus 1
+        Then the following tabs should be open:
+            - data/numbers/1.txt (active)
+            - data/numbers/2.txt
+            - data/numbers/3.txt
+
     Scenario: :tab-focus with -1
         When I open data/numbers/1.txt
         And I open data/numbers/2.txt in a new tab