From: Juri Linkov <juri@linkov.net>
Date: Tue, 16 Nov 2021 20:45:33 +0000 (+0200)
Subject: * lisp/tab-bar.el (tab-bar-select-tab): Add check for wc-frame (bug#51883).
X-Git-Tag: emacs-28.0.90~64
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c25be3e7bb91f932a1d620bef08e16872dcf04d5;p=emacs.git

* lisp/tab-bar.el (tab-bar-select-tab): Add check for wc-frame (bug#51883).
---

diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el
index 9fba70f34da..871ed1c9817 100644
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -1096,7 +1096,11 @@ Negative TAB-NUMBER counts tabs from the end of the tab bar."
         ;; its value of window-configuration is unreadable,
         ;; so restore its saved window-state.
         (cond
-         ((window-configuration-p wc)
+         ((and (window-configuration-p wc)
+               ;; Check for such cases as cloning a frame with tabs.
+               ;; When tabs were cloned to another frame, then fall back
+               ;; to using `window-state-put' below.
+               (eq (window-configuration-frame wc) (selected-frame)))
           (let ((wc-point (alist-get 'wc-point to-tab))
                 (wc-bl  (seq-filter #'buffer-live-p (alist-get 'wc-bl to-tab)))
                 (wc-bbl (seq-filter #'buffer-live-p (alist-get 'wc-bbl to-tab)))