From ceba71e365772d571e189d59f027b6a93461141a Mon Sep 17 00:00:00 2001 From: Visuwesh Date: Thu, 20 Feb 2025 20:19:32 +0530 Subject: [PATCH] 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) --- lisp/tab-bar.el | 7 ++++++- lisp/winner.el | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el index 7f35476482d..d479b0c9f09 100644 --- 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 ab5b222eb26..fa1d53b5b6f 100644 --- 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 '. If you change your mind (while undoing), -you can press \\`C-c ' (calling `winner-redo')." +you can press \\`C-c ' (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 -- 2.39.5