From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#62417: ; Regression: 59ecf25fc860 is the first bad commit Date: Mon, 27 Mar 2023 20:09:44 +0300 Message-ID: <83r0ta86jr.fsf@gnu.org> References: <87sfducmrc.fsf@gmail.com> <87o7oicgy4.fsf@gmail.com> <87wn365e3t.fsf@posteo.net> <87pm8yaq24.fsf_-_@gmail.com> <83fs9tc7o9.fsf@gnu.org> <83cz4xc6hg.fsf@gnu.org> <83zg80c40u.fsf@gnu.org> <87a5zzuutl.fsf@gmail.com> <83h6u79bjl.fsf@gnu.org> <875yamv1ox.fsf@gmail.com> <838rfi9udc.fsf@gnu.org> <83zg7y8blb.fsf@gnu.org> <83v8im887i.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="15426"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 62417@debbugs.gnu.org To: philipk@posteo.net, =?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Mar 27 19:10:26 2023 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 1pgqMS-0003ge-6y for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 27 Mar 2023 19:10:24 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pgqM8-0004Ff-GR; Mon, 27 Mar 2023 13:10:04 -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 1pgqM6-0004Aa-QI for bug-gnu-emacs@gnu.org; Mon, 27 Mar 2023 13:10:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pgqM6-0006CN-Ic for bug-gnu-emacs@gnu.org; Mon, 27 Mar 2023 13:10:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pgqM6-0005MR-Cp for bug-gnu-emacs@gnu.org; Mon, 27 Mar 2023 13:10:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 27 Mar 2023 17:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62417 X-GNU-PR-Package: emacs Original-Received: via spool by 62417-submit@debbugs.gnu.org id=B62417.167993699120585 (code B ref 62417); Mon, 27 Mar 2023 17:10:02 +0000 Original-Received: (at 62417) by debbugs.gnu.org; 27 Mar 2023 17:09:51 +0000 Original-Received: from localhost ([127.0.0.1]:48365 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgqLv-0005Lw-5X for submit@debbugs.gnu.org; Mon, 27 Mar 2023 13:09:51 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:34784) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgqLs-0005Ld-P2 for 62417@debbugs.gnu.org; Mon, 27 Mar 2023 13:09:49 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pgqLm-00068O-KP; Mon, 27 Mar 2023 13:09:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=i3+ztkimPAjSeMp24H4pY0JLwzkY/ef35meKLSVgOWs=; b=gLGpPNNqQM/CpvCUTkTb OP8qvBL15mIcLbQbS5fnfvqBa/S9kAZO4F8w8gfNXbEksZmZtA6xacsXgxotIz6TAptJMhzoeFPV+ puvuVnqLhDom+20yavv3UzfWVfbhaesH/xpoHCf27Gvk/agc2+XC1T0BRjisRG8ASXC8k9WYQm+ou 54nKol9qdmzehpa5aQitqBZNpvA3/2NtSceqw1qk1B17Hgqd05S9uWDY7HtbBYVgOumg8yJpvCtM+ v6RCqmgMgAHG/a9kt8DJeQdqAovMoxYR/R14R5DNYgGIPzaqyhT1u7B8xO0x+lT5p0yYL/zCJjHrV aUQ+otDCPpVxzQ==; Original-Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pgqLm-0007fl-4W; Mon, 27 Mar 2023 13:09:42 -0400 In-Reply-To: (message from =?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?= on Mon, 27 Mar 2023 16:42:05 +0000) 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:258764 Archived-At: > From: João Távora > Date: Mon, 27 Mar 2023 16:42:05 +0000 > Cc: philipk@posteo.net, 62417@debbugs.gnu.org > > On Mon, Mar 27, 2023 at 5:33 PM Eli Zaretskii wrote: > > > > To make a long story short: here's how the call to > > display-buffer-assq-regexp looked like in Emacs 28: > > > > (let* ((user-action > > (display-buffer-assq-regexp > > (buffer-name buffer) display-buffer-alist action)) > > > > And here's how it looks like in Emacs 29: > > > > (let* ((user-action > > (display-buffer-assq-regexp > > buffer display-buffer-alist action)) > > > > Your change modified display-buffer-assq-regexp to pass to > > buffer-match-p the name of the buffer if display-buffer-assq-regexp > > was called with a buffer object. This is not TRT, since, among other > > issues, it changes the API of display-buffer-assq-regexp, which is a > > public function. > > Is it? Not documented in the manual. Looked a lot like bog-standard > generic data-accessing implementation detail to me, and I can't > see any advantage of using it directly. > > But don't let that stop you from doing this change, which, if it > works (I've given a super simple recipe to check), is 120% percent > fine by me. OK. Philip, any objections to the following change: diff --git a/lisp/window.el b/lisp/window.el index 4bdc265..016d53f 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -7556,19 +7556,16 @@ display-buffer-fallback-action `display-buffer'.") (put 'display-buffer-fallback-action 'risky-local-variable t) -(defun display-buffer-assq-regexp (buffer-or-name alist action) - "Retrieve ALIST entry corresponding to buffer specified by BUFFER-OR-NAME. +(defun display-buffer-assq-regexp (buffer-name alist action) + "Retrieve ALIST entry corresponding to buffer whose name is BUFFER-NAME. This returns the cdr of the alist entry ALIST if the entry's key (its car) and the name of the buffer designated by -BUFFER-OR-NAME satisfy `buffer-match-p', using the key as +BUFFER-NAME satisfy `buffer-match-p', using the key as CONDITION argument of `buffer-match-p'. ACTION should have the form of the action argument passed to `display-buffer'." (catch 'match (dolist (entry alist) - (when (buffer-match-p (car entry) (if (stringp buffer-or-name) - buffer-or-name - (buffer-name buffer-or-name)) - action) + (when (buffer-match-p (car entry) buffer-name action) (throw 'match (cdr entry)))))) (defvar display-buffer--same-window-action @@ -7727,6 +7724,9 @@ display-buffer (let ((buffer (if (bufferp buffer-or-name) buffer-or-name (get-buffer buffer-or-name))) + (buf-name (if (bufferp buffer-or-name) + (buffer-name buffer-or-name) + buffer-or-name)) ;; Make sure that when we split windows the old window keeps ;; point, bug#14829. (split-window-keep-point t) @@ -7735,7 +7735,7 @@ display-buffer (unless (listp action) (setq action nil)) (let* ((user-action (display-buffer-assq-regexp - buffer display-buffer-alist action)) + buf-name display-buffer-alist action)) (special-action (display-buffer--special-action buffer)) ;; Extra actions from the arguments to this function: (extra-action