From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Olivier Certner Newsgroups: gmane.emacs.bugs Subject: bug#44100: Updated patch Date: Tue, 06 Jul 2021 14:06:32 +0200 Message-ID: <3008082.TtUXfVIq0z@ravel> References: <4578382.cRamKGfW39@ravel> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart16120163.Vh8gfE0j03" Content-Transfer-Encoding: 7Bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="29789"; mail-complaints-to="usenet@ciao.gmane.io" To: 44100@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Jul 06 17:10:29 2021 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 1m0miN-0007G7-4K for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 06 Jul 2021 17:10:23 +0200 Original-Received: from localhost ([::1]:57326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0miM-0004Uo-2n for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 06 Jul 2021 11:10:22 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:33398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mXR-0005CZ-Hv for bug-gnu-emacs@gnu.org; Tue, 06 Jul 2021 10:59:05 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:38136) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mXO-0002FE-Qx for bug-gnu-emacs@gnu.org; Tue, 06 Jul 2021 10:59:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m0mXO-0006yd-Q6 for bug-gnu-emacs@gnu.org; Tue, 06 Jul 2021 10:59:02 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <4578382.cRamKGfW39@ravel> Resent-From: Olivier Certner Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 06 Jul 2021 14:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44100 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 44100-submit@debbugs.gnu.org id=B44100.162558351926735 (code B ref 44100); Tue, 06 Jul 2021 14:59:02 +0000 Original-Received: (at 44100) by debbugs.gnu.org; 6 Jul 2021 14:58:39 +0000 Original-Received: from localhost ([127.0.0.1]:49669 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0mX0-0006x8-Jd for submit@debbugs.gnu.org; Tue, 06 Jul 2021 10:58:39 -0400 Original-Received: from smtp5-g21.free.fr ([212.27.42.5]:48004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0jqV-0008O7-6P for 44100@debbugs.gnu.org; Tue, 06 Jul 2021 08:06:36 -0400 Original-Received: from ravel.localnet (unknown [2.15.208.149]) (Authenticated sender: ocert.dev@free.fr) by smtp5-g21.free.fr (Postfix) with ESMTPSA id D28625FF9A for <44100@debbugs.gnu.org>; Tue, 6 Jul 2021 14:06:32 +0200 (CEST) X-Mailman-Approved-At: Tue, 06 Jul 2021 10:58:37 -0400 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:209523 Archived-At: This is a multi-part message in MIME format. --nextPart16120163.Vh8gfE0j03 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="UTF-8" Patch slightly edited (commit message) and rebased on top of a recent 'master'. Ready to apply. Easy to backport to 27 as well. -- Olivier Certner --nextPart16120163.Vh8gfE0j03 Content-Disposition: attachment; filename="0001-ERC-Unbreak-ERC-s-IBuffer-s-custom-displays-Bug-4410.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="UTF-8"; name="0001-ERC-Unbreak-ERC-s-IBuffer-s-custom-displays-Bug-4410.patch" >From c21f772f35fad8f80d951048ff134387e30ca076 Mon Sep 17 00:00:00 2001 From: Olivier Certner Date: Tue, 6 Jul 2021 10:51:57 +0200 Subject: [PATCH] ERC: Unbreak ERC's IBuffer's custom displays (Bug#44100) * lisp/erc/erc-ibuffer.el (erc-modified): Don't use `length' on dotted lists (and not even to test if there is more than one element, for that matter). Use `cdr' instead. --- lisp/erc/erc-ibuffer.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/erc/erc-ibuffer.el b/lisp/erc/erc-ibuffer.el index 22336ede21..31e59a6d3e 100644 --- a/lisp/erc/erc-ibuffer.el +++ b/lisp/erc/erc-ibuffer.el @@ -73,7 +73,7 @@ erc-modified erc-track-mode) (let ((entry (assq (current-buffer) erc-modified-channels-alist))) (if entry - (if (> (length entry) 1) + (if (cdr entry) (cond ((eq 'pal (nth 1 entry)) (string erc-ibuffer-pal-char)) ((eq 'fool (nth 1 entry)) -- 2.30.0 --nextPart16120163.Vh8gfE0j03--