From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: "Basil L. Contovounesios" Newsgroups: gmane.emacs.bugs Subject: bug#34987: 27.0.50; Error after toggling duplicate suppression Date: Fri, 05 Apr 2019 18:43:03 +0100 Message-ID: <87a7h48i1k.fsf@tcd.ie> References: <87pnqfiply.fsf@tcd.ie> <874l7rip7q.fsf@tcd.ie> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="214247"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: Eric Abrahamsen , Katsumi Yamaoka To: 34987@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Apr 05 19:44:39 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hCStL-000tRH-7l for geb-bug-gnu-emacs@m.gmane.org; Fri, 05 Apr 2019 19:44:39 +0200 Original-Received: from localhost ([127.0.0.1]:45073 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hCStK-0000mL-2K for geb-bug-gnu-emacs@m.gmane.org; Fri, 05 Apr 2019 13:44:38 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:34631) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hCStC-0000m1-8H for bug-gnu-emacs@gnu.org; Fri, 05 Apr 2019 13:44:31 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hCStA-00022L-RK for bug-gnu-emacs@gnu.org; Fri, 05 Apr 2019 13:44:30 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:60954) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hCSsl-0001Wj-4K for bug-gnu-emacs@gnu.org; Fri, 05 Apr 2019 13:44:28 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hCSsk-0001Li-Jl; Fri, 05 Apr 2019 13:44:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: "Basil L. Contovounesios" Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org, bugs@gnus.org Resent-Date: Fri, 05 Apr 2019 17:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34987 X-GNU-PR-Package: emacs,gnus X-GNU-PR-Keywords: patch Original-Received: via spool by 34987-submit@debbugs.gnu.org id=B34987.15544861935120 (code B ref 34987); Fri, 05 Apr 2019 17:44:02 +0000 Original-Received: (at 34987) by debbugs.gnu.org; 5 Apr 2019 17:43:13 +0000 Original-Received: from localhost ([127.0.0.1]:46265 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hCSrx-0001KW-F0 for submit@debbugs.gnu.org; Fri, 05 Apr 2019 13:43:13 -0400 Original-Received: from mail-ed1-f47.google.com ([209.85.208.47]:43803) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hCSrv-0001KF-67 for 34987@debbugs.gnu.org; Fri, 05 Apr 2019 13:43:12 -0400 Original-Received: by mail-ed1-f47.google.com with SMTP id t22so1229928edw.10 for <34987@debbugs.gnu.org>; Fri, 05 Apr 2019 10:43:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=RjRn1l+cBCNTg6RGRMv+D7VeC+lBANqakVY2+G2BR/Q=; b=dIqA58hq2+Yft/49+fzPYyofFrqkUBQBz0PFtRfYxTicx/BAOjeMgX/ni69C0a/A+t eT7rwV8w24BEWWL4AJIESn7mYm0H3yJQNpURj/k/T0jF5skv3PfV0rIIfisWBvdJo0Ih BeOvX3F4A1SrFZrRhNR4kpdcsqPv+q0P8HLzblExH5lgU2OE01EQ4146EOlHX/MbS0zl n47A3osynIS8KGBH+LvC2ZWEX1B3rFAeULv/A42DZPiU58b12LexLepttgyV6bamTFxX tGi5hpFE5toEx8whKNX00qUyWoAODo4Drhh7L5/nhiPjw2LwRHY22P8DHAerWb5DxpEe 5KYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=RjRn1l+cBCNTg6RGRMv+D7VeC+lBANqakVY2+G2BR/Q=; b=fGVzjWWYNDUjyR2pkR1Eeut09N6YYBE6o6R2YqfkCnh2v01OD7OYokcAtmzrZxbcGy gJ/DrSz6amr2Hz3d3FiAsmNCyhCsuCdQ1HtD0H0rQ20+I11mv+gXFEovPJFUVK/Bu1OK 2RHFGjZ0nvEd7wA8N3e/kTI/99fNsfMhQ4wCuagpJvTMYo5EWDpDRTLl4Zn+FgLhD/l2 QUXWsqzkc1r2AP557vkl1GpcKSj3OiUPBihJVQoGZxlgTN7R70HKfwmFGo50bYCvAc91 SxlIwqNhOtbn+wvTeyzQVzeNU5m1IQPY7r/LFuiRVTM1ulcpridZk9zua2nz08Lwoc/N nDpg== X-Gm-Message-State: APjAAAUW9MA5/tVEo3AkcXFD0nzjRofFBIyJU28VIn1Cptd1qTISOu/S EmK8syMkPA91LWwyUDKBbsyV8EOsR1XSYyhC X-Google-Smtp-Source: APXvYqz4WHZ1shRNwCTIUuYuRIF32im8kpBrbvnFmmdBwNG12YjOc1cyevFyU9a+kjcZqwg18/bJRg== X-Received: by 2002:a17:906:b291:: with SMTP id q17mr8149309ejz.56.1554486185008; Fri, 05 Apr 2019 10:43:05 -0700 (PDT) Original-Received: from localhost (86-41-18-45-dynamic.agg3.crz.crz-crz.eircom.net. [86.41.18.45]) by smtp.gmail.com with ESMTPSA id a38sm6691658eda.71.2019.04.05.10.43.03 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 05 Apr 2019 10:43:04 -0700 (PDT) In-Reply-To: <874l7rip7q.fsf@tcd.ie> (Basil L. Contovounesios's message of "Mon, 25 Mar 2019 03:54:01 +0000") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:157230 Archived-At: [CCing Yamaoka-san due to recent work in this area.] "Basil L. Contovounesios" writes: > "Basil L. Contovounesios" writes: > >> Patch to follow. > > Here it is: > > From 162c8d12a4614776e0104b6701d27f5b30bf607b Mon Sep 17 00:00:00 2001 > From: "Basil L. Contovounesios" > Date: Mon, 25 Mar 2019 02:15:10 +0000 > Subject: [PATCH] Fix Gnus duplicate suppression guards (bug#34987) > > * lisp/gnus/gnus-dup.el (gnus-dup-enter-articles) > (gnus-dup-suppress-articles): Use gnus-dup-hashtb as an indicator of > initialization instead of gnus-dup-list, which may happen to be nil. > (gnus-dup-unsuppress-article): Do nothing if gnus-dup-hashtb is > uninitialized. > --- > lisp/gnus/gnus-dup.el | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/lisp/gnus/gnus-dup.el b/lisp/gnus/gnus-dup.el > index 8b876489e1..86dbf1a574 100644 > --- a/lisp/gnus/gnus-dup.el > +++ b/lisp/gnus/gnus-dup.el > @@ -105,7 +105,7 @@ gnus-dup-save > > (defun gnus-dup-enter-articles () > "Enter articles from the current group for future duplicate suppression." > - (unless gnus-dup-list > + (unless gnus-dup-hashtb > (gnus-dup-open)) > (setq gnus-dup-list-dirty t) ; mark list for saving > (let (msgid) > @@ -129,7 +129,7 @@ gnus-dup-enter-articles > > (defun gnus-dup-suppress-articles () > "Mark duplicate articles as read." > - (unless gnus-dup-list > + (unless gnus-dup-hashtb > (gnus-dup-open)) > (gnus-message 8 "Suppressing duplicates...") > (let ((auto (and gnus-newsgroup-auto-expire > @@ -149,9 +149,10 @@ gnus-dup-suppress-articles > > (defun gnus-dup-unsuppress-article (article) > "Stop suppression of ARTICLE." > - (let* ((header (gnus-data-header (gnus-data-find article))) > - (id (when header (mail-header-id header)))) > - (when id > + (let (header id) > + (when (and gnus-dup-hashtb > + (setq header (gnus-data-header (gnus-data-find article))) > + (setq id (mail-header-id header))) > (setq gnus-dup-list-dirty t) > (setq gnus-dup-list (delete id gnus-dup-list)) > (remhash id gnus-dup-hashtb)))) > -- > 2.20.1 Sorry to nag, but I think this is a straightforward enough fix that I would like to push soon. WDYT? Thanks, -- Basil