X-Loop: help-debbugs@HIDDEN Subject: bug#77967: [PATCH] Fallback `eww-switch-to-buffer' to `eww' Resent-From: Manuel Giraud <manuel@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: larsi@HIDDEN, bug-gnu-emacs@HIDDEN Resent-Date: Mon, 21 Apr 2025 17:45:03 +0000 Resent-Message-ID: <handler.77967.B.174525745512299 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 77967 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 77967 <at> debbugs.gnu.org Cc: Lars Magne Ingebrigtsen <larsi@HIDDEN> X-Debbugs-Original-To: bug-gnu-emacs@HIDDEN X-Debbugs-Original-Xcc: Lars Magne Ingebrigtsen <larsi@HIDDEN> Received: via spool by submit <at> debbugs.gnu.org id=B.174525745512299 (code B ref -1); Mon, 21 Apr 2025 17:45:03 +0000 Received: (at submit) by debbugs.gnu.org; 21 Apr 2025 17:44:15 +0000 Received: from localhost ([127.0.0.1]:38025 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1u6vBm-0003CI-T3 for submit <at> debbugs.gnu.org; Mon, 21 Apr 2025 13:44:15 -0400 Received: from lists.gnu.org ([2001:470:142::17]:55480) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <manuel@HIDDEN>) id 1u6vBh-0003Bx-5w for submit <at> debbugs.gnu.org; Mon, 21 Apr 2025 13:44:12 -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 <manuel@HIDDEN>) id 1u6vBZ-00037S-0T for bug-gnu-emacs@HIDDEN; Mon, 21 Apr 2025 13:44:01 -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 <manuel@HIDDEN>) id 1u6vBV-0004Pd-Hv for bug-gnu-emacs@HIDDEN; Mon, 21 Apr 2025 13:44:00 -0400 DKIM-Signature: v=1; a=ed25519-sha256; c=simple/simple; s=ed25519; bh=mM05KffG eIQNoiltvH6aGmQEABTvfxy6sveRdgD/2MA=; h=date:subject:to:from; d=ledu-giraud.fr; b=OYkWIOQ5/oBOn5rTFH8R2mkaTiu9/InUIDgY5hcqXOov9QtHHX 2ZrPu1nG2NYrfCnmQRudortjR1FeR3IQJmAg== DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=rsa; bh=mM05KffGeIQNoilt vH6aGmQEABTvfxy6sveRdgD/2MA=; h=date:subject:to:from; d=ledu-giraud.fr; b=e+5VXdBJCtoAW23IPz/54nOFgffzkVllvnZkprrcPOkey/KvxN eV+vDyP+1uMD/FM3wFlVZOgaUeE/FBDRCa+P7dvSG8YNkVQFdC3l68W20y++/S0o5W66qJ ALEK5lkgiSA6WskIYuAS0ujDDeT82FZ4Iddps7It7SGDmKLS60OTLZ41s+f3GbaRojAftU hlkrHAVphYY4wkvRBME1TCMxJ6c39QVll8hy9CzjItTlaDA/YQNl8Z2bxedSqSFLcf2ENq EFgqDyXptflGYEKDT2wGdPCWCWrzhSrINbk6u/YYAmqekQdShr8JvEegoH0P3rexWNZTND WRfw44dmxKMA== Received: from computer (<unknown> [10.1.1.1]) by ledu-giraud.fr (OpenSMTPD) with ESMTPSA id 671fdecc (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <bug-gnu-emacs@HIDDEN>; Mon, 21 Apr 2025 19:43:48 +0200 (CEST) From: Manuel Giraud <manuel@HIDDEN> Date: Mon, 21 Apr 2025 19:43:47 +0200 Message-ID: <87jz7d1kbw.fsf@HIDDEN> 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@HIDDEN; 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 <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.1 (/) --=-=-= Content-Type: text/plain Tags: patch Hi, The following patch calls `eww' interactively from `eww-switch-to-buffer' when there is no EWW buffers. Then, one can set a global shortcut on `eww-switch-to-buffer' and always be able to launch EWW. Thanks, In GNU Emacs 31.0.50 (build 5, x86_64-unknown-openbsd7.7, X toolkit) of 2025-04-20 built on computer Repository revision: b38fd553eb3291f140801ca158f6ab245496fa69 Repository branch: master Windowing system distributor 'The X.Org Foundation', version 11.0.12101016 System Description: OpenBSD computer 7.7 GENERIC.MP#625 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=lucid --with-toolkit-scroll-bars=no --without-cairo --without-compress-install' --=-=-= Content-Type: text/patch Content-Disposition: attachment; filename=0001-Fallback-eww-switch-to-buffer-to-eww.patch From d63d4cacdd6bf9b9cbfff43cb07d3268f969bd25 Mon Sep 17 00:00:00 2001 From: Manuel Giraud <manuel@HIDDEN> Date: Mon, 21 Apr 2025 19:01:25 +0200 Subject: [PATCH] Fallback `eww-switch-to-buffer' to `eww' * lisp/net/eww.el (eww-switch-to-buffer): When no EWW buffers exist, call `eww' instead. --- lisp/net/eww.el | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 7edd1acbcf9..63425882583 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -2321,25 +2321,29 @@ eww-set-character-encoding (eww-reload nil charset))) (defun eww-switch-to-buffer () - "Prompt for an EWW buffer to display in the selected window." + "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))) - (pop-to-buffer-same-window - (read-buffer "Switch to EWW buffer: " - (cl-loop for buf in (nreverse (buffer-list)) + (curbuf (current-buffer)) + (list (cl-loop for buf in (nreverse (buffer-list)) if (with-current-buffer buf (derived-mode-p 'eww-mode)) - return buf) - 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)))))))) + 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)))) (defun eww-toggle-fonts () "Toggle whether to use monospaced or font-enabled layouts." -- 2.49.0 --=-=-= Content-Type: text/plain -- Manuel Giraud --=-=-=--
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Manuel Giraud <manuel@HIDDEN> Subject: bug#77967: Acknowledgement ([PATCH] Fallback `eww-switch-to-buffer' to `eww') Message-ID: <handler.77967.B.174525745512299.ack <at> debbugs.gnu.org> References: <87jz7d1kbw.fsf@HIDDEN> X-Gnu-PR-Message: ack 77967 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 77967 <at> debbugs.gnu.org Date: Mon, 21 Apr 2025 17:45:05 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. As you requested using X-Debbugs-CC, your message was also forwarded to Lars Magne Ingebrigtsen <larsi@HIDDEN> (after having been given a bug report number, if it did not have one). Your message has been sent to the package maintainer(s): bug-gnu-emacs@HIDDEN If you wish to submit further information on this problem, please send it to 77967 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 77967: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D77967 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN Subject: bug#77967: [PATCH] Fallback `eww-switch-to-buffer' to `eww' Resent-From: Eli Zaretskii <eliz@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-gnu-emacs@HIDDEN Resent-Date: Sat, 26 Apr 2025 13:03:01 +0000 Resent-Message-ID: <handler.77967.B77967.174567254217655 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 77967 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Manuel Giraud <manuel@HIDDEN> Cc: 77967 <at> debbugs.gnu.org, larsi@HIDDEN Received: via spool by 77967-submit <at> debbugs.gnu.org id=B77967.174567254217655 (code B ref 77967); Sat, 26 Apr 2025 13:03:01 +0000 Received: (at 77967) by debbugs.gnu.org; 26 Apr 2025 13:02:22 +0000 Received: from localhost ([127.0.0.1]:59331 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1u8fAj-0004ag-NG for submit <at> debbugs.gnu.org; Sat, 26 Apr 2025 09:02:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34196) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <eliz@HIDDEN>) id 1u8fAh-0004aS-AI for 77967 <at> debbugs.gnu.org; Sat, 26 Apr 2025 09:02:20 -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 <eliz@HIDDEN>) id 1u8fAb-0001pG-F6; Sat, 26 Apr 2025 09:02:13 -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=2RlnkzseVJLlPkQ48UvqdWohaqgWN33Q2ROVjWBwJac=; b=PsaWeyA6nGey trZ1FIaj086Ai+NEl/Y/qAuZ1m0nWo4qgnGuHeuFKC9S+13FyUrdt25ZBKRA/nu9mUtf+47XGVcv5 yCymuIbLjwlAF0eeL/UJCn7RX+X4l5Gder2DUtFP2f7WZTwaQbNpQJcVAiSTNG4aSZQu9W/ErXJzf EpFtUaQVN27+9a91wBR5JqzUHgaUQakvnHBHdIiGj1skhmXkks0iyHnQSdP3DeNq0Zb9FBKvgkbJh BkB0OAwvGXE6kNP0drUB0iYbtFHvL7X+Hdk3kBdQdUQVbxaFR61oW0wuoucTsXF+t3o5tZsmyVdh4 0eW98A3EUoH1ZMEKrhdN+A==; Date: Sat, 26 Apr 2025 16:02:08 +0300 Message-Id: <86r01ft6sv.fsf@HIDDEN> From: Eli Zaretskii <eliz@HIDDEN> In-Reply-To: <87jz7d1kbw.fsf@HIDDEN> (message from Manuel Giraud on Mon, 21 Apr 2025 19:43:47 +0200) References: <87jz7d1kbw.fsf@HIDDEN> X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) > Cc: Lars Magne Ingebrigtsen <larsi@HIDDEN> > From: Manuel Giraud <manuel@HIDDEN> > Date: Mon, 21 Apr 2025 19:43:47 +0200 > > The following patch calls `eww' interactively from > `eww-switch-to-buffer' when there is no EWW buffers. Then, one can set > a global shortcut on `eww-switch-to-buffer' and always be able to launch > EWW. Thanks. > (defun eww-switch-to-buffer () > - "Prompt for an EWW buffer to display in the selected window." > + "Prompt for an EWW buffer to display in the selected window. If no such > +buffer exist, fallback to calling `eww'." The first line of a doc string should be a single complete sentence. Doesn't this change warrant a NEWS entry, and a suitable change to the EWW manual?
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.