From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eric Abrahamsen Newsgroups: gmane.emacs.bugs Subject: bug#29749: 27.0.50; Fix header value extraction in Gnus registry Date: Sat, 16 Dec 2017 17:35:27 -0800 Message-ID: <87tvwqjfvk.fsf@ericabrahamsen.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1513474457 21288 195.159.176.226 (17 Dec 2017 01:34:17 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 17 Dec 2017 01:34:17 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) To: 29749@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Dec 17 02:34:13 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eQNqH-00058e-3y for geb-bug-gnu-emacs@m.gmane.org; Sun, 17 Dec 2017 02:34:13 +0100 Original-Received: from localhost ([::1]:52761 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQNsC-0005oK-6k for geb-bug-gnu-emacs@m.gmane.org; Sat, 16 Dec 2017 20:36:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQNs5-0005oC-SO for bug-gnu-emacs@gnu.org; Sat, 16 Dec 2017 20:36:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQNs2-0002Lb-Oc for bug-gnu-emacs@gnu.org; Sat, 16 Dec 2017 20:36:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:57439) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eQNs2-0002LK-Ja for bug-gnu-emacs@gnu.org; Sat, 16 Dec 2017 20:36:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eQNs2-00038B-AB for bug-gnu-emacs@gnu.org; Sat, 16 Dec 2017 20:36:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eric Abrahamsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 17 Dec 2017 01:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 29749 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.151347454412003 (code B ref -1); Sun, 17 Dec 2017 01:36:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 17 Dec 2017 01:35:44 +0000 Original-Received: from localhost ([127.0.0.1]:37887 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eQNrj-00037X-P2 for submit@debbugs.gnu.org; Sat, 16 Dec 2017 20:35:43 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:42648) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eQNri-00037I-Cr for submit@debbugs.gnu.org; Sat, 16 Dec 2017 20:35:42 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQNrb-00020L-Vp for submit@debbugs.gnu.org; Sat, 16 Dec 2017 20:35:36 -0500 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:43372) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eQNrb-0001zt-CJ for submit@debbugs.gnu.org; Sat, 16 Dec 2017 20:35:35 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQNrZ-0005ln-Tw for bug-gnu-emacs@gnu.org; Sat, 16 Dec 2017 20:35:35 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQNrW-0001vV-QJ for bug-gnu-emacs@gnu.org; Sat, 16 Dec 2017 20:35:33 -0500 Original-Received: from mail.ericabrahamsen.net ([50.56.99.223]:53552) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eQNrW-0001uu-GR for bug-gnu-emacs@gnu.org; Sat, 16 Dec 2017 20:35:30 -0500 Original-Received: from localhost (71-212-75-109.tukw.qwest.net [71.212.75.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: eric@ericabrahamsen.net) by mail.ericabrahamsen.net (Postfix) with ESMTPSA id 83ADCBBC94 for ; Sun, 17 Dec 2017 01:35:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mail.ericabrahamsen.net; s=mail; t=1513474528; bh=UXsknBiuybGH6q8KgaOTOQdrCg1MBiadsSrv9MKi0Y0=; h=From:To:Subject:Date:From; b=SIlVqJnrY1uMLMlEXh2+xDzz/cjHxC3ZYMSZpWnnB+US57IO7gwiizgZYK58E3B7D vTZ66Mg4SoSuwElrZBzLwaJIJm3GSBHiUWdbKC+eOLqEDV1M7QbvpTVqIYAILLorC0 /wkT/yFvR+yM/q0hftuFBkxGzYtjHaG1tIFQ1ePs= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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: 208.118.235.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:141191 Archived-At: --=-=-= Content-Type: text/plain The Gnus registry extracts some header values from messages using `gnus-registry-fetch-header-fast'. There are two problems with this: 1. It is called with its arguments reversed which (by luck) causes it to always return nil. 2. If it were called correctly it would raise an error, as it tries to use `assq' to find a string key in a vector. Maybe `gnus-data-header' used to return a different value, but so far as I can tell this hasn't worked for quite some time. It's a bug, but it's one that hasn't done much harm for a while, so I'm proposing this for master. Eric In GNU Emacs 27.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version 3.22.26) of 2017-12-16 built on clem Repository revision: 7ef18c6ea5b2cb6450c0f960445b26cad03d200e --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Fix-Gnus-registry-header-extraction.patch >From 7ef18c6ea5b2cb6450c0f960445b26cad03d200e Mon Sep 17 00:00:00 2001 From: Eric Abrahamsen Date: Sat, 16 Dec 2017 14:03:18 -0800 Subject: [PATCH] Fix Gnus registry header extraction * lisp/gnus/gnus-registry.el (gnus-registry-fetch-recipients-fast, gnus-registry-fetch-sender-fast): First, delete `gnus-registry-fetch-header-fast'. It was being called with reversed arguments, and thus always returned nil, but even if the argument order was correct it would have raised an error, as it was trying to `assq' a string in a vector. Instead, just have these two functions do their own work, as they're doing fairly different things. --- lisp/gnus/gnus-registry.el | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el index 466238d252..7345c084db 100644 --- a/lisp/gnus/gnus-registry.el +++ b/lisp/gnus/gnus-registry.el @@ -844,21 +844,17 @@ gnus-registry-fetch-simplified-message-subject-fast nil)) (defun gnus-registry-fetch-sender-fast (article) - (gnus-registry-fetch-header-fast "from" article)) + (when-let* ((data (and (numberp article) + (assoc article (gnus-data-list nil))))) + (mail-header-from (gnus-data-header data)))) (defun gnus-registry-fetch-recipients-fast (article) - (gnus-registry-sort-addresses - (or (ignore-errors (gnus-registry-fetch-header-fast "Cc" article)) "") - (or (ignore-errors (gnus-registry-fetch-header-fast "To" article)) ""))) - -(defun gnus-registry-fetch-header-fast (article header) - "Fetch the HEADER quickly, using the internal gnus-data-list function." - (if (and (numberp article) - (assoc article (gnus-data-list nil))) - (gnus-string-remove-all-properties - (cdr (assq header (gnus-data-header - (assoc article (gnus-data-list nil)))))) - nil)) + (when-let* ((data (and (numberp article) + (assoc article (gnus-data-list nil)))) + (extra (mail-header-extra (gnus-data-header data)))) + (gnus-registry-sort-addresses + (or (cdr (assq 'Cc extra)) "") + (or (cdr (assq 'To extra)) "")))) ;; registry marks glue (defun gnus-registry-do-marks (type function) -- 2.15.1 --=-=-=--