Merge branch 'master' of https://github.com/molly-cactus/kitty

Author: kovidgoyal

docs/changelog.rst

@@ -50,6 +50,8 @@ To update |kitty|, :doc:`follow the instructions <binary>`.
 
 - Fix mapping ``remote_control send-text`` not working (:iss:`3147`)
 
+- Add a ``right`` option for :opt:`tab_switch_strategy` (:pull:`3155`)
+
 
 0.19.2 [2020-11-13]
 -------------------

kitty/config_data.py

@@ -880,11 +880,12 @@ def tab_bar_min_tabs(x: str) -> int:
 The minimum number of tabs that must exist before the tab bar is shown
 '''))
 
-o('tab_switch_strategy', 'previous', option_type=choices('previous', 'left', 'last'), long_text=_('''
+o('tab_switch_strategy', 'previous', option_type=choices('previous', 'left', 'right', 'last'), long_text=_('''
 The algorithm to use when switching to a tab when the current tab is closed.
 The default of :code:`previous` will switch to the last used tab. A value of
 :code:`left` will switch to the tab to the left of the closed tab. A value
-of :code:`last` will switch to the right-most tab.
+of :code:`right` will switch to the tab to the right of the closed tab.
+A value of :code:`last` will switch to the right-most tab.
 '''))
 
 

kitty/tabs.py

@@ -721,6 +721,8 @@ def remove(self, tab: Tab) -> None:
                         break
         elif self.opts.tab_switch_strategy == 'left':
             next_active_tab = max(0, self.active_tab_idx - 1)
+        elif self.opts.tab_switch_strategy == 'right':
+            next_active_tab = min(self.active_tab_idx, len(self.tabs) - 1)
 
         if next_active_tab < 0:
             next_active_tab = max(0, min(self.active_tab_idx, len(self.tabs) - 1))