From unknown Tue Aug 19 05:08:42 2025 X-Loop: help-debbugs@gnu.org Subject: bug#78372: [PATCH] Fix `eww-switch-to-buffer' when resorting to `eww' Resent-From: Manuel Giraud Original-Sender: "Debbugs-submit" Resent-CC: larsi@gnus.org, bug-gnu-emacs@gnu.org Resent-Date: Sun, 11 May 2025 12:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78372 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 78372@debbugs.gnu.org Cc: Lars Magne Ingebrigtsen X-Debbugs-Original-To: bug-gnu-emacs@gnu.org X-Debbugs-Original-Xcc: Lars Magne Ingebrigtsen Received: via spool by submit@debbugs.gnu.org id=B.174696771032040 (code B ref -1); Sun, 11 May 2025 12:49:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 May 2025 12:48:30 +0000 Received: from localhost ([127.0.0.1]:60606 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uE66Y-0008Kh-0t for submit@debbugs.gnu.org; Sun, 11 May 2025 08:48:30 -0400 Received: from lists.gnu.org ([2001:470:142::17]:51772) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uE66U-0008K8-Ng for submit@debbugs.gnu.org; Sun, 11 May 2025 08:48:28 -0400 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 1uE66P-0006G6-1R for bug-gnu-emacs@gnu.org; Sun, 11 May 2025 08:48:21 -0400 Received: from ledu-giraud.fr ([51.159.28.247]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uE66L-0000nO-U4 for bug-gnu-emacs@gnu.org; Sun, 11 May 2025 08:48:20 -0400 DKIM-Signature: v=1; a=ed25519-sha256; c=simple/simple; s=ed25519; bh=d2Nb30D2 HmJnSZbd52T0mZfrVhDcX7gKvYb5RggTlSw=; h=date:subject:to:from; d=ledu-giraud.fr; b=7FUn5DET19QMj59LFw/vwLpXzvyuPMqt2x6C+9XVQAwxC+SIjm xj4HLcVqh3GpO4f4CHxa+25+VYc/C4af41Cw== DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=rsa; bh=d2Nb30D2HmJnSZbd 52T0mZfrVhDcX7gKvYb5RggTlSw=; h=date:subject:to:from; d=ledu-giraud.fr; b=1NR8sCGByDGvn8tMllQCv/DexfFYTNc3A78LRFKvQ0CNoRCE0q ukUK+LFMkniuHFnH15VnJRK1hMKD/bCuWo8bafEZfsY0r4g/o8xR+qwZgdDvhZrBUJ+vUI WgkVdUfcvHbifd5IWTERL4McNTPoixSBwBGgkkJYyVD/EW0WbvvceCxh0xg2g9mvwY6Dil b+NfqVa9U8fAPEiZbg9HWt9hhgTGFQ6z4+7UyzQ06K/rjBM56GPnP4qTCuwW4oLsiiyc6J P7up3HYIKH1/Fd9+3dFEJKhyPbq3M1ZvsHc7SxXLqFE9TCHcuPEtzeABU9sX0a7icAxKS6 rPVDbTl31pKw== Received: from computer ( [10.1.1.1]) by ledu-giraud.fr (OpenSMTPD) with ESMTPSA id 13f0a8a7 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Sun, 11 May 2025 14:48:15 +0200 (CEST) From: Manuel Giraud Date: Sun, 11 May 2025 14:48:13 +0200 Message-ID: <877c2njotu.fsf@ledu-giraud.fr> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=51.159.28.247; envelope-from=manuel@ledu-giraud.fr; helo=ledu-giraud.fr X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) --=-=-= Content-Type: text/plain Tags: patch Hi, When `eww-switch-to-buffer' is resorting to `eww', having `completion-extra-properties' bound prevent `eww' to correctly complete the suggested URIS. This patch fixes this issue. In GNU Emacs 31.0.50 (build 1, x86_64-unknown-openbsd7.7) of 2025-05-11 built on computer Repository revision: 3975094f1d96680fe73232ca4216733904ebecd0 Repository branch: master Windowing system distributor 'The X.Org Foundation', version 11.0.12101016 System Description: OpenBSD computer 7.7 GENERIC.MP#658 amd64 Configured using: 'configure CC=egcc CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib MAKEINFO=gmakeinfo --prefix=/home/manuel/emacs --bindir=/home/manuel/bin --with-x-toolkit=no --with-toolkit-scroll-bars=no --without-cairo --without-compress-install' --=-=-= Content-Type: text/patch Content-Disposition: attachment; filename=0001-Fix-eww-switch-to-buffer-when-resorting-to-eww.patch >From ec9e306f7ad449ad14a53d5b9d127ff0ad7effa9 Mon Sep 17 00:00:00 2001 From: Manuel Giraud Date: Sun, 11 May 2025 14:40:18 +0200 Subject: [PATCH] Fix `eww-switch-to-buffer' when resorting to `eww' * lisp/net/eww.el (eww-switch-to-buffer): Do not bound `completion-extra-properties' before calling `eww'. --- lisp/net/eww.el | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lisp/net/eww.el b/lisp/net/eww.el index c11e378c714..e59df6d1699 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -2324,26 +2324,26 @@ eww-switch-to-buffer "Prompt for an EWW buffer to display in the selected window. If no such buffer exist, fallback to calling `eww'." (interactive nil eww-mode) - (let ((completion-extra-properties - `(:annotation-function - ,(lambda (buf) - (with-current-buffer buf - (format " %s" (eww-current-url)))))) - (curbuf (current-buffer)) - (list (cl-loop for buf in (nreverse (buffer-list)) + (let ((list (cl-loop for buf in (nreverse (buffer-list)) if (with-current-buffer buf (derived-mode-p 'eww-mode)) return buf))) (if list - (pop-to-buffer-same-window - (read-buffer "Switch to EWW buffer: " - list - t - (lambda (bufn) - (setq bufn (if (consp bufn) (cdr bufn) (get-buffer bufn))) - (and (with-current-buffer bufn - (derived-mode-p 'eww-mode)) - (not (eq bufn curbuf)))))) - (call-interactively 'eww)))) + (let ((completion-extra-properties + `(:annotation-function + ,(lambda (buf) + (with-current-buffer buf + (format " %s" (eww-current-url)))))) + (curbuf (current-buffer))) + (pop-to-buffer-same-window + (read-buffer "Switch to EWW buffer: " + list + t + (lambda (bufn) + (setq bufn (if (consp bufn) (cdr bufn) (get-buffer bufn))) + (and (with-current-buffer bufn + (derived-mode-p 'eww-mode)) + (not (eq bufn curbuf))))))) + (call-interactively #'eww)))) (defun eww-toggle-fonts () "Toggle whether to use monospaced or font-enabled layouts." -- 2.49.0 --=-=-= Content-Type: text/plain -- Manuel Giraud --=-=-=-- From unknown Tue Aug 19 05:08:42 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Manuel Giraud Subject: bug#78372: closed (Re: bug#78372: [PATCH] Fix `eww-switch-to-buffer' when resorting to `eww') Message-ID: References: <86bjrrwqqn.fsf@gnu.org> <877c2njotu.fsf@ledu-giraud.fr> X-Gnu-PR-Message: they-closed 78372 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 78372@debbugs.gnu.org Date: Sat, 17 May 2025 09:07:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1747472822-9003-1" This is a multi-part message in MIME format... ------------=_1747472822-9003-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #78372: [PATCH] Fix `eww-switch-to-buffer' when resorting to `eww' which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 78372@debbugs.gnu.org. --=20 78372: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D78372 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1747472822-9003-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 78372-done) by debbugs.gnu.org; 17 May 2025 09:06:51 +0000 Received: from localhost ([127.0.0.1]:45578 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uGDVL-0002Kg-Bu for submit@debbugs.gnu.org; Sat, 17 May 2025 05:06:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51294) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uGDVI-0002KG-AP for 78372-done@debbugs.gnu.org; Sat, 17 May 2025 05:06:49 -0400 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 1uGDVC-0007Qp-Nk; Sat, 17 May 2025 05:06:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=rksg00U+dUcT+uq2EM8eCabRf2qbMkMM8jdrhcy0pV4=; b=cCWzKKO+aIiI iEt/VW3BBEi/4nU/OS1ZB3zdRSykyGP9isAJhO9CvL+NO3lH5PfD4liZvZFQ/+oJWeCF4Gl1wKpdQ cnDLVq/oxxxtJKoVJwNcrUzXsvF2FJ3HDnu57OOy1ZVpYCpsE2Twm8mQP3toTs54EJiH3jSYdApfR iZsirWwogWqUJM/lfgRuxTzX1k+xp1FSiyWEmvxw/OlJQuEn+QS3BJKP6TXJLzE9ZWEm1HzZoQe4I fAu+agnF7/Sk6V+1AAuS0PXqriOL+5lJMDJFzgWgFqDauI9+cU2K50bNvLEIp+hViTllmSN2BXnCn aX1qfg1LZLNMIgAlIWM7lw==; Date: Sat, 17 May 2025 12:06:40 +0300 Message-Id: <86bjrrwqqn.fsf@gnu.org> From: Eli Zaretskii To: Manuel Giraud In-Reply-To: <877c2njotu.fsf@ledu-giraud.fr> (message from Manuel Giraud on Sun, 11 May 2025 14:48:13 +0200) Subject: Re: bug#78372: [PATCH] Fix `eww-switch-to-buffer' when resorting to `eww' References: <877c2njotu.fsf@ledu-giraud.fr> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 78372-done Cc: larsi@gnus.org, 78372-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Cc: Lars Magne Ingebrigtsen > From: Manuel Giraud > Date: Sun, 11 May 2025 14:48:13 +0200 > > When `eww-switch-to-buffer' is resorting to `eww', having > `completion-extra-properties' bound prevent `eww' to correctly complete > the suggested URIS. This patch fixes this issue. Thanks, installed on master, and closing the bug. ------------=_1747472822-9003-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 11 May 2025 12:48:30 +0000 Received: from localhost ([127.0.0.1]:60606 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uE66Y-0008Kh-0t for submit@debbugs.gnu.org; Sun, 11 May 2025 08:48:30 -0400 Received: from lists.gnu.org ([2001:470:142::17]:51772) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uE66U-0008K8-Ng for submit@debbugs.gnu.org; Sun, 11 May 2025 08:48:28 -0400 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 1uE66P-0006G6-1R for bug-gnu-emacs@gnu.org; Sun, 11 May 2025 08:48:21 -0400 Received: from ledu-giraud.fr ([51.159.28.247]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uE66L-0000nO-U4 for bug-gnu-emacs@gnu.org; Sun, 11 May 2025 08:48:20 -0400 DKIM-Signature: v=1; a=ed25519-sha256; c=simple/simple; s=ed25519; bh=d2Nb30D2 HmJnSZbd52T0mZfrVhDcX7gKvYb5RggTlSw=; h=date:subject:to:from; d=ledu-giraud.fr; b=7FUn5DET19QMj59LFw/vwLpXzvyuPMqt2x6C+9XVQAwxC+SIjm xj4HLcVqh3GpO4f4CHxa+25+VYc/C4af41Cw== DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=rsa; bh=d2Nb30D2HmJnSZbd 52T0mZfrVhDcX7gKvYb5RggTlSw=; h=date:subject:to:from; d=ledu-giraud.fr; b=1NR8sCGByDGvn8tMllQCv/DexfFYTNc3A78LRFKvQ0CNoRCE0q ukUK+LFMkniuHFnH15VnJRK1hMKD/bCuWo8bafEZfsY0r4g/o8xR+qwZgdDvhZrBUJ+vUI WgkVdUfcvHbifd5IWTERL4McNTPoixSBwBGgkkJYyVD/EW0WbvvceCxh0xg2g9mvwY6Dil b+NfqVa9U8fAPEiZbg9HWt9hhgTGFQ6z4+7UyzQ06K/rjBM56GPnP4qTCuwW4oLsiiyc6J P7up3HYIKH1/Fd9+3dFEJKhyPbq3M1ZvsHc7SxXLqFE9TCHcuPEtzeABU9sX0a7icAxKS6 rPVDbTl31pKw== Received: from computer ( [10.1.1.1]) by ledu-giraud.fr (OpenSMTPD) with ESMTPSA id 13f0a8a7 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Sun, 11 May 2025 14:48:15 +0200 (CEST) From: Manuel Giraud To: bug-gnu-emacs@gnu.org Subject: [PATCH] Fix `eww-switch-to-buffer' when resorting to `eww' X-Debbugs-Cc: Lars Magne Ingebrigtsen Date: Sun, 11 May 2025 14:48:13 +0200 Message-ID: <877c2njotu.fsf@ledu-giraud.fr> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=51.159.28.247; envelope-from=manuel@ledu-giraud.fr; helo=ledu-giraud.fr X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) --=-=-= Content-Type: text/plain Tags: patch Hi, When `eww-switch-to-buffer' is resorting to `eww', having `completion-extra-properties' bound prevent `eww' to correctly complete the suggested URIS. This patch fixes this issue. In GNU Emacs 31.0.50 (build 1, x86_64-unknown-openbsd7.7) of 2025-05-11 built on computer Repository revision: 3975094f1d96680fe73232ca4216733904ebecd0 Repository branch: master Windowing system distributor 'The X.Org Foundation', version 11.0.12101016 System Description: OpenBSD computer 7.7 GENERIC.MP#658 amd64 Configured using: 'configure CC=egcc CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib MAKEINFO=gmakeinfo --prefix=/home/manuel/emacs --bindir=/home/manuel/bin --with-x-toolkit=no --with-toolkit-scroll-bars=no --without-cairo --without-compress-install' --=-=-= Content-Type: text/patch Content-Disposition: attachment; filename=0001-Fix-eww-switch-to-buffer-when-resorting-to-eww.patch >From ec9e306f7ad449ad14a53d5b9d127ff0ad7effa9 Mon Sep 17 00:00:00 2001 From: Manuel Giraud Date: Sun, 11 May 2025 14:40:18 +0200 Subject: [PATCH] Fix `eww-switch-to-buffer' when resorting to `eww' * lisp/net/eww.el (eww-switch-to-buffer): Do not bound `completion-extra-properties' before calling `eww'. --- lisp/net/eww.el | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lisp/net/eww.el b/lisp/net/eww.el index c11e378c714..e59df6d1699 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -2324,26 +2324,26 @@ eww-switch-to-buffer "Prompt for an EWW buffer to display in the selected window. If no such buffer exist, fallback to calling `eww'." (interactive nil eww-mode) - (let ((completion-extra-properties - `(:annotation-function - ,(lambda (buf) - (with-current-buffer buf - (format " %s" (eww-current-url)))))) - (curbuf (current-buffer)) - (list (cl-loop for buf in (nreverse (buffer-list)) + (let ((list (cl-loop for buf in (nreverse (buffer-list)) if (with-current-buffer buf (derived-mode-p 'eww-mode)) return buf))) (if list - (pop-to-buffer-same-window - (read-buffer "Switch to EWW buffer: " - list - t - (lambda (bufn) - (setq bufn (if (consp bufn) (cdr bufn) (get-buffer bufn))) - (and (with-current-buffer bufn - (derived-mode-p 'eww-mode)) - (not (eq bufn curbuf)))))) - (call-interactively 'eww)))) + (let ((completion-extra-properties + `(:annotation-function + ,(lambda (buf) + (with-current-buffer buf + (format " %s" (eww-current-url)))))) + (curbuf (current-buffer))) + (pop-to-buffer-same-window + (read-buffer "Switch to EWW buffer: " + list + t + (lambda (bufn) + (setq bufn (if (consp bufn) (cdr bufn) (get-buffer bufn))) + (and (with-current-buffer bufn + (derived-mode-p 'eww-mode)) + (not (eq bufn curbuf))))))) + (call-interactively #'eww)))) (defun eww-toggle-fonts () "Toggle whether to use monospaced or font-enabled layouts." -- 2.49.0 --=-=-= Content-Type: text/plain -- Manuel Giraud --=-=-=-- ------------=_1747472822-9003-1--