Recommend 'tab-bar-history-mode' over 'winner-mode'

* lisp/winner.el (winner-mode):
* lisp/tab-bar.el (tab-bar-mode): Update the docstring to
suggest 'tab-bar-history-mode' instead of 'winner-mode' when
using 'tab-bar-mode' instead.  (Bug#76439)

(cherry picked from commit ea715b0183f6a19d491cad36eb18c2c9cf0f0dd3)

diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el
index 7f35476482dc6f646f4469a94f9bda767b83f398..d479b0c9f09683b735c3a475b97fdc24faa9b00d 100644 (file)
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -291,7 +291,12 @@ to switch the frame between different window configurations.
 See `current-window-configuration' for more about window configurations.
 To add a button (which can then record one more window configuration),
 click on the \"+\" button.  Clicking on the \"x\" icon of a button
-deletes the button."
+deletes the button.
+
+If you intend to use `tab-bar-mode' with `winner-mode', we recommend
+using `tab-bar-history-mode' instead, since it provides tab-specific
+window configuration history, and is better behaved when `tab-bar-mode'
+is turned on."
   :global t
   ;; It's defined in C/cus-start, this stops the d-m-m macro defining it again.
   :variable tab-bar-mode

diff --git a/lisp/winner.el b/lisp/winner.el
index ab5b222eb269e877a4a141232ace4d45cc3a3fda..fa1d53b5b6fad6ad8f50b85f93b0357dc71ea028 100644 (file)
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -345,7 +345,13 @@ the window configuration (i.e. how the frames are partitioned
 into windows) so that the changes can be \"undone\" using the
 command `winner-undo'.  By default this one is bound to the key
 sequence \\`C-c <left>'.  If you change your mind (while undoing),
-you can press \\`C-c <right>' (calling `winner-redo')."
+you can press \\`C-c <right>' (calling `winner-redo').
+
+If you use `tab-bar-mode', consider using `tab-bar-history-mode', as
+`winner-mode' is unaware of tab switching, and might turn the window
+configuration of the current tab to another's (old) window
+configuration.  `tab-bar-history-mode' provides tab-specific window
+configuration history avoiding this problem."
   :global t
   (if winner-mode
       (progn