From ed817b5cb29f982ac1d34752b9f0321e8d954426 Mon Sep 17 00:00:00 2001 From: Sebastian Lipp Date: Fri, 4 Jul 2014 11:25:38 +0200 Subject: [PATCH] Re: [PATCH] emacs: add missing paren to fix defun in notmuch-address.el. --- af/75cb738f34fd3763495a410275453ce9540f37 | 164 ++++++++++++++++++++++ 1 file changed, 164 insertions(+) create mode 100644 af/75cb738f34fd3763495a410275453ce9540f37 diff --git a/af/75cb738f34fd3763495a410275453ce9540f37 b/af/75cb738f34fd3763495a410275453ce9540f37 new file mode 100644 index 000000000..a00828417 --- /dev/null +++ b/af/75cb738f34fd3763495a410275453ce9540f37 @@ -0,0 +1,164 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id AE333431FAF + for ; Fri, 4 Jul 2014 02:25:45 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.001 +X-Spam-Level: +X-Spam-Status: No, score=0.001 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_NONE=-0.0001, UNPARSEABLE_RELAY=0.001] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 8T3r01Yrb0KL for ; + Fri, 4 Jul 2014 02:25:38 -0700 (PDT) +Received: from mx1.riseup.net (mx1.riseup.net [198.252.153.129]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id C9DDA431FAE + for ; Fri, 4 Jul 2014 02:25:38 -0700 (PDT) +Received: from fruiteater.riseup.net (fruiteater-pn.riseup.net [10.0.1.74]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (Client CN "*.riseup.net", + Issuer "Gandi Standard SSL CA" (not verified)) + by mx1.riseup.net (Postfix) with ESMTPS id 5FCBB50E6C; + Fri, 4 Jul 2014 02:25:37 -0700 (PDT) +Received: from [127.0.0.1] (localhost [127.0.0.1]) + (Authenticated sender: bacuh@fruiteater.riseup.net) + with ESMTPSA id 2E27E10BF +From: Sebastian Lipp +To: Karl Fogel +Subject: Re: [PATCH] emacs: add missing paren to fix defun in + notmuch-address.el. +In-Reply-To: <87oax6vt4u.fsf@ktab.red-bean.com> +References: <87wqsfik5l.fsf@floss.red-bean.com> + <87mwtah2hd.fsf@zancas.localnet> + <877gkeau42.fsf@floss.red-bean.com> + <8738v1jtzc.fsf@nikula.org> + <87k3odgutd.fsf@zancas.localnet> <87ip3wbj7g.fsf@mcs.anl.gov> + + <87vc7vgbym.fsf@zancas.localnet> + + <87pphmc604.fsf@verb.i-did-not-set--mail-host-address--so-tickle-me> + <87oax6vt4u.fsf@ktab.red-bean.com> +User-Agent: Notmuch/0.18 (http://notmuchmail.org) Emacs/24.3.1 + (i686-pc-linux-gnu) +Date: Fri, 04 Jul 2014 11:25:38 +0200 +Message-ID: + <87r4215vcd.fsf@verb.i-did-not-set--mail-host-address--so-tickle-me> +MIME-Version: 1.0 +Content-Type: text/plain +X-Virus-Scanned: clamav-milter 0.98.1 at mx1 +X-Virus-Status: Clean +Cc: Tomi Ollila , notmuch@notmuchmail.org +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Fri, 04 Jul 2014 09:25:45 -0000 + +Karl Fogel writes: +> Sebastian Lipp writes: +>>As I'd like to see this in notmuch I made the change. The patch is +>>attached. As it is my first contribution to notmuch at all: Just tell me +>>if I'm supposed to do it in any other way. +> +> I think your patch includes much more than just the above, though. + +True. See below on that. + +>>diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el +>>index fa65cd5..ee7b169 100644 +>>--- a/emacs/notmuch-address.el +>>+++ b/emacs/notmuch-address.el +>>@@ -113,6 +113,59 @@ to know how address selection is made by default." +>> (when (notmuch-address-locate-command notmuch-address-command) +>> (notmuch-address-message-insinuate)) +>> +>>+;; functions to add sender / recipients to BBDB +>>+ +>>+(defvar bbdb-get-addresses-headers) +> +> I think it's good to include an initial value (even an invalid +> placeholder one, if the real initialization has not happened yet), and a +> doc string. C-h f defvar RET will say more about how to do that. + +I will read into this and get back to it. + +>>+(declare-function notmuch-show-get-header "notmuch-show" (header &optional props)) +>>+ +>>+(declare-function bbdb-get-addresses "bbdb-com" +>>+ (only-first-address +>>+ uninteresting-senders +>>+ get-header-content-function +>>+ &rest get-header-content-function-args)) +>>+ +>>+(declare-function bbdb-update-records "bbdb-com" (addrs auto-create-p offer-to-create)) +> +> At this point, your patch has accomplished what Tomi originally +> suggested. But then the patch continues with what looks like +> substantive new code: +> +>>+(defun notmuch-bbdb/snarf-headers (headers) +>>+ ;; Helper function to avoid code duplication in the two below +>>+ ;; headers should have the same format as bbdb-get-addresses-headers +>>+ +>>+ ;; bbdb-get-addresses reads these +>>+ ;; Ugh, pass-by-global +>>+ (let ((addrs (bbdb-get-addresses nil nil 'notmuch-bbdb/get-header-content)) +>>+ (bbdb-get-addresses-headers headers) ; headers to read +>>+ (bbdb-gag-messages t)) ; suppress m/n processed message) +>>+ (bbdb-update-records addrs t t))) +>>+ +>>+(defun notmuch-bbdb/snarf-from () +>>+ "Import the sender of the current message into BBDB" +>>+ (interactive) +>>+ (notmuch-bbdb/snarf-headers +>>+ (list (assoc 'authors bbdb-get-addresses-headers)))) +>>+ +>>+(defun notmuch-bbdb/snarf-to () +>>+ "Import all recipients of the current message into BBDB" +>>+ (interactive) +>>+ (notmuch-bbdb/snarf-headers +>>+ (list (assoc 'recipients bbdb-get-addresses-headers)))) +>>+ +>>+(defvar notmuch-bbdb/header-by-name +>>+ ;; both are case sensitive +>>+ '( ("From" . :From) +>>+ ("To" . :To) +>>+ ("CC" . :Cc) +>>+ ("BCC" . :Bcc) +>>+ ("Resent-From" . nil) +>>+ ("Reply-To" . nil) +>>+ ("Resent-To" . nil) +>>+ ("Resent-CC" . nil)) +>>+ "Alist for dispatching header symbols as used by notmuch-show-get-header +>>+from strings as used by bbdb-get-addresses") +>>+ +>>+(defun notmuch-bbdb/get-header-content (name) +>>+ (notmuch-show-get-header (cdr (assoc name notmuch-bbdb/header-by-name)))) +> +> It looks like new code, but I suspect what actually happened is that +> this is just the original code, somehow mis-expressed as "+" lines in +> the patch. Is that what happened? + +No, it happened by intention because what is "original" to you is not +part of my freshly cloned notmuch. So I thought good practise is to +construct *one* patch that brings the already fixed feature to the +notmuch codebase to keep it clean. + +If you like better, my next patch will only base Tomis and your +suggestions on top of the "original" patch. + +basti -- 2.26.2