From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#69993: Wrap window buffers while cycling Date: Mon, 25 Mar 2024 09:42:10 +0200 Organization: LINKOV.NET Message-ID: <86h6gug41x.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="5739"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) Cc: martin rudalics To: 69993@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Mar 25 08:49:06 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rof4s-0001Fr-Di for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 25 Mar 2024 08:49:06 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rof4E-0005Zu-GM; Mon, 25 Mar 2024 03:48:26 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rof4A-0005Z9-U5 for bug-gnu-emacs@gnu.org; Mon, 25 Mar 2024 03:48:22 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rof4A-0004ie-M7 for bug-gnu-emacs@gnu.org; Mon, 25 Mar 2024 03:48:22 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rof4q-00029r-2k; Mon, 25 Mar 2024 03:49:04 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: rudalics@gmx.at, bug-gnu-emacs@gnu.org Resent-Date: Mon, 25 Mar 2024 07:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69993 X-GNU-PR-Package: emacs X-Debbugs-Original-To: bug-gnu-emacs@gnu.org X-Debbugs-Original-Xcc: martin rudalics Original-Received: via spool by submit@debbugs.gnu.org id=B.17113529438285 (code B ref -1); Mon, 25 Mar 2024 07:49:03 +0000 Original-Received: (at submit) by debbugs.gnu.org; 25 Mar 2024 07:49:03 +0000 Original-Received: from localhost ([127.0.0.1]:47846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rof4n-00029O-Pp for submit@debbugs.gnu.org; Mon, 25 Mar 2024 03:49:02 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:41826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rof4j-00028n-Dk for submit@debbugs.gnu.org; Mon, 25 Mar 2024 03:49:01 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rof42-0005Vm-Rn for bug-gnu-emacs@gnu.org; Mon, 25 Mar 2024 03:48:14 -0400 Original-Received: from relay3-d.mail.gandi.net ([217.70.183.195]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rof3z-0004ak-Jb for bug-gnu-emacs@gnu.org; Mon, 25 Mar 2024 03:48:13 -0400 Original-Received: by mail.gandi.net (Postfix) with ESMTPSA id 4AF9060005 for ; Mon, 25 Mar 2024 07:48:07 +0000 (UTC) X-GND-Sasl: juri@linkov.net Received-SPF: pass client-ip=217.70.183.195; envelope-from=juri@linkov.net; helo=relay3-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:282044 Archived-At: --=-=-= Content-Type: text/plain Often users complain there is no way to wrap window buffers while cycling them with 'C-x C-' (previous-buffer) and 'C-x C-' (next-buffer). One of the latest examples is https://old.reddit.com/r/emacs/comments/1barvo2/perwindow_buffer_ordering/ This problem becomes apparent when a list of prev/next window buffers is visualized by the tab-line. So here is the patch that finally solves this problem by adding a new option 'switch-to-prev-buffer-wrap' disabled by default. When its value is t, it wraps to the first/last buffer. But when the value is 'stop', it stops at the first/last buffer. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=switch-to-prev-buffer-wrap.patch diff --git a/lisp/window.el b/lisp/window.el index df55a7ca673..4d727fb827c 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -4542,6 +4542,16 @@ set-window-buffer-start-and-point (when point (set-window-point window point)))) +(defcustom switch-to-prev-buffer-wrap nil + "Wrap to the first/last window-local buffer while cycling. +When t, wrap to the first/last buffer. +When the value is `stop', stop at the first/last buffer." + :type '(choice (const :tag "Never wrap" nil) + (const :tag "Stop at window-local buffers" stop) + (const :tag "Wrap to window-local buffers" t)) + :version "30.1" + :group 'windows) + (defcustom switch-to-visible-buffer t "If non-nil, allow switching to an already visible buffer. If this variable is non-nil, `switch-to-prev-buffer' and @@ -4676,7 +4686,7 @@ switch-to-prev-buffer ((or switch-to-prev-buffer-skip (not switch-to-visible-buffer)) frame))) - entry new-buffer killed-buffers skipped) + entry new-buffer killed-buffers skipped wrapped) (when (window-minibuffer-p window) ;; Don't switch in minibuffer window. (unless (setq window (minibuffer-selected-window)) @@ -4711,7 +4721,7 @@ switch-to-prev-buffer ;; buffer list in order to make sure that switching to the ;; previous/next buffer traverse it in opposite directions. Skip ;; this step for side windows. - (unless window-side + (unless (or window-side switch-to-prev-buffer-wrap) (dolist (buffer (if bury-or-kill (buffer-list frame) (nreverse (buffer-list frame)))) @@ -4729,7 +4739,9 @@ switch-to-prev-buffer (set-window-buffer-start-and-point window new-buffer) (throw 'found t))))) - (unless bury-or-kill + (when (eq switch-to-prev-buffer-wrap 'stop) + (setq wrapped 'stop new-buffer nil)) + (unless (or bury-or-kill (eq switch-to-prev-buffer-wrap 'stop)) ;; Scan reverted next buffers last (must not use nreverse ;; here!). (dolist (buffer (reverse next-buffers)) @@ -4744,6 +4756,7 @@ switch-to-prev-buffer (if (switch-to-prev-buffer-skip-p skip window buffer bury-or-kill) (setq skipped (or skipped buffer)) (setq new-buffer buffer) + (setq wrapped t) (set-window-buffer-start-and-point window new-buffer (nth 1 entry) (nth 2 entry)) (throw 'found t))))) @@ -4770,8 +4783,23 @@ switch-to-prev-buffer window (append (window-prev-buffers window) (list entry))))) ;; Move `old-buffer' to head of WINDOW's restored list of next ;; buffers. - (set-window-next-buffers - window (cons old-buffer (delq old-buffer next-buffers)))) + (if (not (and switch-to-prev-buffer-wrap wrapped)) + (set-window-next-buffers + window (cons old-buffer (delq old-buffer next-buffers))) + ;; Restore the right order of previous buffers. + (unless (eq wrapped 'stop) + (let ((prev-buffers (window-prev-buffers window))) + ;; Use the same sorting order as was in next-buffers + ;; with old-buffer at the bottom. + (setq prev-buffers + (sort prev-buffers + (lambda (a b) + (cond + ((eq (car a) old-buffer) nil) + ((eq (car b) old-buffer) t) + (t (< (length (memq (car a) next-buffers)) + (length (memq (car b) next-buffers)))))))) + (set-window-prev-buffers window prev-buffers))))) ;; Remove killed buffers from WINDOW's previous and next buffers. (when killed-buffers @@ -4812,7 +4840,7 @@ switch-to-next-buffer ((or switch-to-prev-buffer-skip (not switch-to-visible-buffer)) frame))) - new-buffer entry killed-buffers skipped) + new-buffer entry killed-buffers skipped wrapped) (when (window-minibuffer-p window) ;; Don't switch in minibuffer window. (unless (setq window (minibuffer-selected-window)) @@ -4839,7 +4867,7 @@ switch-to-next-buffer (throw 'found t)))) ;; Scan the buffer list of WINDOW's frame next, skipping previous ;; buffers entries. Skip this step for side windows. - (unless window-side + (unless (or window-side switch-to-prev-buffer-wrap) (dolist (buffer (buffer-list frame)) (when (and (buffer-live-p buffer) (not (eq buffer old-buffer)) @@ -4856,19 +4884,22 @@ switch-to-next-buffer (throw 'found t))))) ;; Scan WINDOW's reverted previous buffers last (must not use ;; nreverse here!) - (dolist (entry (reverse (window-prev-buffers window))) - (when (and (not (eq new-buffer (car entry))) - (not (eq old-buffer (car entry))) - (setq new-buffer (car entry)) - (or (buffer-live-p new-buffer) - (not (setq killed-buffers - (cons new-buffer killed-buffers)))) - (or (null pred) (funcall pred new-buffer))) - (if (switch-to-prev-buffer-skip-p skip window new-buffer) - (setq skipped (or skipped new-buffer)) - (set-window-buffer-start-and-point - window new-buffer (nth 1 entry) (nth 2 entry)) - (throw 'found t)))) + (if (eq switch-to-prev-buffer-wrap 'stop) + (setq wrapped 'stop new-buffer nil) + (dolist (entry (reverse (window-prev-buffers window))) + (when (and (not (eq new-buffer (car entry))) + (not (eq old-buffer (car entry))) + (setq new-buffer (car entry)) + (or (buffer-live-p new-buffer) + (not (setq killed-buffers + (cons new-buffer killed-buffers)))) + (or (null pred) (funcall pred new-buffer))) + (if (switch-to-prev-buffer-skip-p skip window new-buffer) + (setq skipped (or skipped new-buffer)) + (setq wrapped t) + (set-window-buffer-start-and-point + window new-buffer (nth 1 entry) (nth 2 entry)) + (throw 'found t))))) (when (and skipped (not (functionp switch-to-prev-buffer-skip))) ;; Show first skipped buffer, unless skip was a function. @@ -4876,7 +4907,13 @@ switch-to-next-buffer (set-window-buffer-start-and-point window new-buffer))) ;; Remove `new-buffer' from and restore WINDOW's next buffers. - (set-window-next-buffers window (delq new-buffer next-buffers)) + (if (not (and switch-to-prev-buffer-wrap wrapped)) + (set-window-next-buffers window (delq new-buffer next-buffers)) + (unless (eq wrapped 'stop) + (let ((prev-buffers (window-prev-buffers window))) + (setq prev-buffers + (nreverse (delq new-buffer (mapcar #'car prev-buffers)))) + (set-window-next-buffers window prev-buffers)))) ;; Remove killed buffers from WINDOW's previous and next buffers. (when killed-buffers --=-=-=--