From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: "J.P." Newsgroups: gmane.emacs.bugs,gmane.emacs.erc.general Subject: bug#53617: 28.0.90; duplicate checks in erc--switch-to-buffer Date: Mon, 14 Mar 2022 06:33:48 -0700 Message-ID: <874k40r743.fsf@neverwas.me> References: <87ee4rutmo.fsf@neverwas.me> <871r0rusl5.fsf@neverwas.me> <878ruyqf0b.fsf@neverwas.me> 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="4518"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: larsi@gnus.org, emacs-erc@gnu.org, bandali@gnu.org, 53617@debbugs.gnu.org To: Guy Gastineau Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Mar 14 14:50:01 2022 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 1nTl5F-0000wp-0G for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 14 Mar 2022 14:50:01 +0100 Original-Received: from localhost ([::1]:34206 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nTl5D-0007SR-LZ for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 14 Mar 2022 09:49:59 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:42070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nTkqk-0004Cu-DY for bug-gnu-emacs@gnu.org; Mon, 14 Mar 2022 09:35:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:50489) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nTkqk-00012T-3B for bug-gnu-emacs@gnu.org; Mon, 14 Mar 2022 09:35:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nTkqj-00013w-T0 for bug-gnu-emacs@gnu.org; Mon, 14 Mar 2022 09:35:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: "J.P." Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 14 Mar 2022 13:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53617 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 53617-submit@debbugs.gnu.org id=B53617.16472648453993 (code B ref 53617); Mon, 14 Mar 2022 13:35:01 +0000 Original-Received: (at 53617) by debbugs.gnu.org; 14 Mar 2022 13:34:04 +0000 Original-Received: from localhost ([127.0.0.1]:44383 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTkpo-00012L-GB for submit@debbugs.gnu.org; Mon, 14 Mar 2022 09:34:04 -0400 Original-Received: from mail-108-mta218.mxroute.com ([136.175.108.218]:42641) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTkpl-000113-Q6 for 53617@debbugs.gnu.org; Mon, 14 Mar 2022 09:34:02 -0400 Original-Received: from filter006.mxroute.com ([140.82.40.27] 140.82.40.27.vultrusercontent.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta218.mxroute.com (ZoneMTA) with ESMTPSA id 17f88a295c2000763e.001 for <53617@debbugs.gnu.org> (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256); Mon, 14 Mar 2022 13:33:50 +0000 X-Zone-Loop: 8f90c8da09d0aec2c6cc5e47cca54413b57babfef79a X-Originating-IP: [140.82.40.27] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=neverwas.me ; s=x; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date:References: Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=UhjTrk+qBrk8RsIPf9Qx/BKrgLjpoRb/ltQpKSqQQuw=; b=btoSxsNyFEvZs8Rf1UsiVrgHJY TTkCBLkl0jUTtOdNZtZiZ93YDuGB3CLGJyxDGBWBayXjHtPqRCgvs2F5Xfd+M5YR87GFo14wJ1Yxd JFuDPfKHO+J45US7AGPaJu8eNFGC3q9KJGsG6sSx1LBWvdQD32rx9pfG48CRbo2MT4Q+EQYtylUPn lgApVF5WJOvwd4d6ZG7p6zJHXU2jCRhIkWa+DOJPLEzFdLksUrEO8NIQ0+Fbm5LRXWO6GBd2GD28f ZwxUkLUMibD7dzcI1cjsdPCaNqGguDjcWVNUCfzeIoIhiVXyM3Xt7k8auEgEpdeXtRhDJx3FL2J1t jKpxxNMg==; In-Reply-To: <878ruyqf0b.fsf@neverwas.me> (J. P.'s message of "Sat, 29 Jan 2022 15:49:24 -0800") X-AuthUser: masked@neverwas.me 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" Xref: news.gmane.io gmane.emacs.bugs:228360 gmane.emacs.erc.general:1749 Archived-At: --=-=-= Content-Type: text/plain "J.P." writes: > I've added the customary tweaks to the log message if someone wants to > glance at it (cc. bandali, Lars). This now includes a unit test. Unless anyone objects or I'm preempted, I'll add this to 29 on or around March 19th (~5 days from now), and leave ERC's version number unchanged at 5.4.1. Thanks. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Remove-redundant-checks-in-erc-switch-to-buffer.patch >From 751e93d57ac00399dfb528b270fe753a3e8cfc91 Mon Sep 17 00:00:00 2001 From: Guy Gastineau Date: Fri, 28 Jan 2022 23:12:42 -0500 Subject: [PATCH 1/2] Remove redundant checks in erc--switch-to-buffer * lisp/erc/erc.el (erc--switch-to-buffer): Commit f925fc93bac41d7622d1af927e33b0e738ff55b0 "Add `predicate' arg to `read-buffer' and use it for erc-iswitchb" meant to remove this, but it was left behind. (Bug#53617). Copyright-paperwork-exempt: yes --- lisp/erc/erc.el | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 9ee8d38b02..52fe106f2d 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1761,12 +1761,7 @@ erc--switch-to-buffer (lambda (bufname) (let ((buf (if (consp bufname) (cdr bufname) (get-buffer bufname)))) - (when buf - (erc--buffer-p buf (lambda () t) proc) - (with-current-buffer buf - (and (derived-mode-p 'erc-mode) - (or (null proc) - (eq proc erc-server-process)))))))))) + (and buf (erc--buffer-p buf (lambda () t) proc))))))) (defun erc-switch-to-buffer (&optional arg) "Prompt for an ERC buffer to switch to. When invoked with prefix argument, use all ERC buffers. Without -- 2.35.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-DROP-ME-Add-eventual-unit-test-for-erc-switch-to-buf.patch >From d0c6ef217a18c98e18e4c29e2cba2e9ab63af970 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Sun, 13 Mar 2022 22:39:36 -0700 Subject: [PATCH 2/2] [DROP ME] Add eventual unit test for erc--switch-to-buffer * test/lisp/erc/erc-tests.el (erc--switch-to-buffer): Add regression test for Bug#53617. Prefer postponing addition until after #48598. --- test/lisp/erc/erc-tests.el | 73 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el index 5603e76454..a14c4c0460 100644 --- a/test/lisp/erc/erc-tests.el +++ b/test/lisp/erc/erc-tests.el @@ -114,6 +114,79 @@ erc-with-all-buffers-of-server (should (get-buffer "#spam")) (kill-buffer "#spam"))) +;; DELETE ME BEG (just a demo, for now) +(require 'ert-x) +(defvar erc-modified-channels-alist) + +(ert-deftest erc--switch-to-buffer () + (unless (version< "28" emacs-version) + (ert-skip "Depends on symbol `minibuffer-quit'")) + + (let ((proc (start-process "aNet" (current-buffer) "true")) + (erc-modified-channels-alist `(("fake") (,(messages-buffer)))) + ;; + erc-kill-channel-hook erc-kill-server-hook erc-kill-buffer-hook) + + (with-current-buffer (get-buffer-create "server") + (erc-mode) + (set-process-buffer (setq erc-server-process proc) (current-buffer)) + (with-current-buffer (get-buffer-create "#chan") + (erc-mode) + (setq erc-server-process proc)) + (with-current-buffer (get-buffer-create "#foo") + (erc-mode) + (setq erc-server-process proc)) + + (ert-info ("Channel #chan selectable from server buffer") + (ert-simulate-keys (list ?# ?c ?h ?a ?n ?\C-m) + (should (string= "#chan" (erc--switch-to-buffer)))))) + + (ert-info ("Channel #foo selectable from non-ERC buffer") + (ert-simulate-keys (list ?# ?f ?o ?o ?\C-m) + (should (string= "#foo" (erc--switch-to-buffer))))) + + (ert-info ("Default selectable") + (ert-simulate-keys (list ?\C-m) + (should (string= "*Messages*" (erc--switch-to-buffer))))) + + ;; Can't use `should-error' here because `minibuffer-quit' derives + ;; from `quit' instead of `error', and only the latter is trapped. + (ert-info ("Extant but non-ERC buffer not selectable") + (get-buffer-create "#fake") ; not ours + (let (ran) + (condition-case s + (ert-simulate-keys (list ?# ?f ?a ?k ?e ?\C-m) + (erc--switch-to-buffer)) + (minibuffer-quit (setq ran s))) + (should (equal ran '(minibuffer-quit))))) + + (with-current-buffer (get-buffer-create "other") + (erc-mode) + (setq erc-server-process + (start-process "bNet" (current-buffer) "true"))) + + (ert-info ("Foreign ERC buffer not selectable") + (let (ran) + (condition-case s + (ert-simulate-keys (list ?o ?t ?h ?e ?r ?\C-m) + (with-current-buffer "server" + (erc--switch-to-buffer))) + (minibuffer-quit (setq ran s))) + (should (equal ran '(minibuffer-quit))))) + + (ert-info ("Any ERC-buffer selectable from non-ERC buffer") + (should-not (eq major-mode 'erc-mode)) + (ert-simulate-keys (list ?o ?t ?h ?e ?r ?\C-m) + (should (string= "other" (erc--switch-to-buffer))))) + + (kill-buffer "server") + (kill-buffer "other") + (kill-buffer "#chan") + (kill-buffer "#foo") + (kill-buffer "#fake"))) + +;; DELETE ME END (just a demo, for now) + (ert-deftest erc-lurker-maybe-trim () (let (erc-lurker-trim-nicks (erc-lurker-ignore-chars "_`")) -- 2.35.1 --=-=-=--