From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: James Thomas Newsgroups: gmane.emacs.bugs Subject: bug#65914: Exclude current buffer from eww-switch-to-buffer Date: Wed, 13 Sep 2023 16:15:03 +0530 Message-ID: <87y1ha1he8.fsf@gmx.net> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6279"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) To: 65914@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Sep 13 12:46:23 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 1qgNO2-0001Sx-OS for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 13 Sep 2023 12:46:22 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qgNNf-0005BY-B7; Wed, 13 Sep 2023 06:45:59 -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 1qgNNe-0005BP-5h for bug-gnu-emacs@gnu.org; Wed, 13 Sep 2023 06:45:58 -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 1qgNNc-0004OU-Nq for bug-gnu-emacs@gnu.org; Wed, 13 Sep 2023 06:45:57 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qgNNh-0001JW-Rt for bug-gnu-emacs@gnu.org; Wed, 13 Sep 2023 06:46:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: James Thomas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 13 Sep 2023 10:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65914 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: notabug patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.16946019275006 (code B ref -1); Wed, 13 Sep 2023 10:46:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 13 Sep 2023 10:45:27 +0000 Original-Received: from localhost ([127.0.0.1]:60921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgNN8-0001Ig-Jq for submit@debbugs.gnu.org; Wed, 13 Sep 2023 06:45:26 -0400 Original-Received: from lists.gnu.org ([2001:470:142::17]:33292) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgNN6-0001IT-L3 for submit@debbugs.gnu.org; Wed, 13 Sep 2023 06:45:25 -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 1qgNMv-00056G-Sj for bug-gnu-emacs@gnu.org; Wed, 13 Sep 2023 06:45:13 -0400 Original-Received: from mout.gmx.net ([212.227.17.22]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qgNMt-0004A3-CT for bug-gnu-emacs@gnu.org; Wed, 13 Sep 2023 06:45:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1694601907; x=1695206707; i=jimjoe@gmx.net; bh=6Exk1U+HKKLF9HMigk3UGVygVzSgzfr59HGVHluM07Q=; h=X-UI-Sender-Class:From:To:Subject:Date; b=niNr+Kk5/uS93sHhT3ieLgeVPHs+bcxv8wsjnhizDmE8oqKPo3OFECxDYZk8ToXYXKfdZuiOsKh nhCiSIZeGLORfob05f2HUlggb3Isw6QEgPMJQdx3kOvtlHUJcEtaLDr8Y5dfVupk6all9VdLGmoX7 6zp1d3myyUVbOdcyL0r6DBch1iirGrnDJt59O/eR284xs7rsKt/y3SNJ7bpfWOIpMgap8lQqsAhEH BhbIeg/fyiVrVK19SQYAhfCOenXzm8JCm/v7K64T+gCvLtzI12S7694VCqG4KjZFSOtKjT8MXo24C 1rwdRPZeRx63DpvzkP/2iVh6sqYmngOSv2FA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from user-Inspiron-15-5518 ([117.216.19.225]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1M5QJJ-1qhCqc07OP-001PRK for ; Wed, 13 Sep 2023 12:45:07 +0200 X-Provags-ID: V03:K1:m/LdzBXJeGJeESWg9jFBHC/wEF72IkWEDPbhbXY/lt0vBMsJ/OZ W5fczixaFOmLLeviAfWavgCm0LUFE7//ir2JhHxYchNn3mYTI27GXSFonzNi5jtn210deqb iBAyoPkAeIdnbTKeYhPy0fH0wMF1f5UDAsCWZ4hT34aMFce2opEQBFLw+/adCX9lObEZ6Ca rZ9bBFEowzQYZFhMJ9wTQ== UI-OutboundReport: notjunk:1;M01:P0:lnZO0cyidy0=;7yvQ9NGB+VGDa2Ru033CSGVfgEB uEDi6ofsVKF2ajqK41PDddTs4NA5zlxj2aqk9V3dxONBdSDSKR4YV0Ev3uqRbohbVF1Rzq7Br UWIqbpMg8DnrujY1bY4GA9ILAg+ru+LRTip4eZF9LLvyb+5aJVlC8jWT9t7xQQl/tJRvn4PdG CdzmCt+ERXGrPFHbktWVXOrJnA9QkbODxq5QBGxZt8SGwiGPEf+9cvFTeaqYYfjIjzcWksnXP V78fTp5Y+GZqZpqPfQW3CrcL/16gvH+CVlng+0viojlLTzWoHvI41A1SYD3gWiqzfLa3a3phS 3xrxKJzcCyrbSjKidCNI+wRwV8otrE/7+IQCudvyJCucsm2XU0XQ9NRknqk01uWqVYEZiO8ZC v/BtYmHriZIVUSptXixK7B695dXMI7mmhA/GBejws7LWRbNespysjRM727f1ESXyrdk+93msG jx0/ZeoM4zAa03QgUzIOHHbbfy9r++LmSTpPh9LZM4blohJyNvZ7iM/fx7AETq9W4aI3C6fDi T9f/O0NEXd4Oddpw7Mf0nw3p8a7ZltAJMYmPgHo3VJMgMMA7Xu2KCkK0iiypRmsblhp7X1DnI OY4j5wSyLMeoXTziBDQYcie6NMTt/8riljYTasp6rpRwZQp7o+v1yQc1KQdCS3w6etweGolRN +K+pJtz/ZK3USo1geIFKk7qltHqG+Sxn4OslFwdBoMMrKfsdlo26161IPz1pz4B6ixK+IVi2O eILl5oUXzisDS1ofBf7vGZrNDMbyt8JbZ3D2O3tnPn8vFRlJqtsZMUmYkecpFQVrGKSPIX2s Received-SPF: pass client-ip=212.227.17.22; envelope-from=jimjoe@gmx.net; helo=mout.gmx.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=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:270257 Archived-At: Tags: patch, notabug This patch excludes the current buffer from the completion list of the above command. The main motivation is avoiding one cycling keystroke in icomplete. For eg. a use-case of cycling visits between the last 3 visited eww buffers: Currently (to visit each buffer in succession), after pressing s, one would have to cycle thrice in icomplete before pressing C-j. With this patch, it would only need to be done twice (a mnemonic to remember the number of times to cycle could be 'the last 2 *other* buffers' rather than 'the last 3 buffers' it is currently). Moreover, if you remember that the target eww buffer was the last n-th buffer you opened, you may now simply cycle n times. Eg. n is 1 for the previous buffer. * lisp/net/eww.el (eww-switch-to-buffer): diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 4ddda216afc..e43ef2bfe8b 100644 =2D-- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -2062,7 +2062,8 @@ eww-switch-to-buffer (let ((completion-extra-properties '(:annotation-function (lambda (buf) (with-current-buffer buf - (format " %s" (eww-current-url))))))) + (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)) @@ -2070,9 +2071,10 @@ eww-switch-to-buffer return buf) t (lambda (bufn) - (with-current-buffer - (if (consp bufn) (cdr bufn) (get-buffer bufn)) - (derived-mode-p 'eww-mode))))))) + (setq bufn (if (consp bufn) (cdr bufn) (get-buffer bu= fn))) + (and (with-current-buffer bufn + (derived-mode-p 'eww-mode)) + (not (eq bufn curbuf)))))))) (defun eww-toggle-fonts () "Toggle whether to use monospaced or font-enabled layouts." =2D-