Merge branch 'airodactyl-fix/undo-tab-detach'

CHANGELOG.asciidoc

@@ -89,6 +89,7 @@ Fixed
 - `:bind` can now be used to bind to an alias (binding by editing `keys.conf`
   already worked before)
 - The command completion now updates correctly when changing aliases
+- `:undo` now doesn't undo tabs "closed" by `:tab-detach` anymore.
 
 v0.8.3 (unreleased)
 -------------------

README.asciidoc

@@ -192,6 +192,7 @@ Contributors, sorted by the number of commits in descending order:
 * Nick Ginther
 * Michał Góral
 * Michael Ilsaas
+* Michael Hoang
 * Martin Zimmermann
 * Fritz Reichwald
 * Brian Jackson
@@ -213,7 +214,6 @@ Contributors, sorted by the number of commits in descending order:
 * adam
 * Samir Benmendil
 * Regina Hug
-* Michael Hoang
 * Mathias Fussenegger
 * Marcelo Santos
 * Jean-Louis Fuchs

qutebrowser/browser/commands.py

@@ -427,7 +427,7 @@ class CommandDispatcher:
         url = self._current_url()
         self._open(url, window=True)
         cur_widget = self._current_widget()
-        self._tabbed_browser.close_tab(cur_widget)
+        self._tabbed_browser.close_tab(cur_widget, add_undo=False)
 
     def _back_forward(self, tab, bg, window, count, forward):
         """Helper function for :back/:forward."""

qutebrowser/mainwindow/tabbedbrowser.py

@@ -217,11 +217,12 @@ class TabbedBrowser(tabwidget.TabWidget):
         for tab in self.widgets():
             self._remove_tab(tab)
 
-    def close_tab(self, tab):
+    def close_tab(self, tab, *, add_undo=True):
         """Close a tab.
 
         Args:
             tab: The QWebView to be closed.
+            add_undo: Whether the tab close can be undone.
         """
         last_close = config.get('tabs', 'last-close')
         count = self.count()
@@ -229,7 +230,7 @@ class TabbedBrowser(tabwidget.TabWidget):
         if last_close == 'ignore' and count == 1:
             return
 
-        self._remove_tab(tab)
+        self._remove_tab(tab, add_undo=add_undo)
 
         if count == 1:  # We just closed the last tab above.
             if last_close == 'close':
@@ -243,11 +244,12 @@ class TabbedBrowser(tabwidget.TabWidget):
                 url = config.get('general', 'default-page')
                 self.openurl(url, newtab=True)
 
-    def _remove_tab(self, tab):
+    def _remove_tab(self, tab, *, add_undo=True):
         """Remove a tab from the tab list and delete it properly.
 
         Args:
             tab: The QWebView to be closed.
+            add_undo: Whether the tab close can be undone.
         """
         idx = self.indexOf(tab)
         if idx == -1:
@@ -261,6 +263,7 @@ class TabbedBrowser(tabwidget.TabWidget):
                           window=self._win_id)
         if tab.url().isValid():
             history_data = tab.history.serialize()
+            if add_undo:
                 entry = UndoEntry(tab.url(), history_data, idx)
                 self._undo_stack.append(entry)
         elif tab.url().isEmpty():