From 7e80c49030da6d9ceba37346baf601443a839a62 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Fri, 4 Jul 2014 19:31:33 +0300 Subject: [PATCH] Re: [PATCH] emacs: add missing paren to fix defun in notmuch-address.el. --- 8d/4b5b83d9fd003705a57f3bf35081877636cd11 | 213 ++++++++++++++++++++++ 1 file changed, 213 insertions(+) create mode 100644 8d/4b5b83d9fd003705a57f3bf35081877636cd11 diff --git a/8d/4b5b83d9fd003705a57f3bf35081877636cd11 b/8d/4b5b83d9fd003705a57f3bf35081877636cd11 new file mode 100644 index 000000000..318e5cfa9 --- /dev/null +++ b/8d/4b5b83d9fd003705a57f3bf35081877636cd11 @@ -0,0 +1,213 @@ +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 4A747431FAF + for ; Fri, 4 Jul 2014 09:31:56 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 9Nk4hNV6MFuP for ; + Fri, 4 Jul 2014 09:31:51 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id A9F8B431FAE + for ; Fri, 4 Jul 2014 09:31:50 -0700 (PDT) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id 2F3A8100033; + Fri, 4 Jul 2014 19:31:34 +0300 (EEST) +From: Tomi Ollila +To: Sebastian Lipp , Jed Brown , + Karl Fogel , Daniel Bergey +Subject: Re: [PATCH] emacs: add missing paren to fix defun + in notmuch-address.el. +In-Reply-To: + <87pphmc604.fsf@verb.i-did-not-set--mail-host-address--so-tickle-me> +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> +User-Agent: Notmuch/0.18.1+25~gdaf4b6f (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +Cc: 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 16:31:56 -0000 + +On Fri, Jul 04 2014, Sebastian Lipp wrote: + +> Tomi Ollila writes: +>> On Tue, Apr 09 2013, David Bremner wrote: +>>> There seems to be a few warnings: +>>> +>>> In notmuch-bbdb/snarf-from: +>>> notmuch-address.el:116:26:Warning: reference to free variable +>>> `bbdb-get-addresses-headers' +>>> +>>> In notmuch-bbdb/snarf-to: +>>> notmuch-address.el:122:29:Warning: reference to free variable +>>> `bbdb-get-addresses-headers' +>>> +>>> In end of data: +>>> notmuch-address.el:143:1:Warning: the following functions are not known to be +>>> defined: bbdb-get-addresses, bbdb-update-records, notmuch-show-get-header +>>> +>>> Do we need a few defvars? +>> +>> For the above set, something like: +>> +>> (defvar bbdb-get-addresses-headers) +>> +>> (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)) +> +> 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. +> +> LG +> basti + +I saved this patch with 'w' in emacs mua -- and have to remove '>' From the +first line so that 'git am' could recognize it. + +There was one whitespace error -- I reapplied with + +git am --whitespace=fix ~/0001-emacs-functions-to-import-sender-or-recipient-into-B.patch + +more inline (in addition to Karl's good comments) + +IMO all of that can be in one patch... + +>>From 522e4294258e6392a02c923b4b7e78a898986fca Mon Sep 17 00:00:00 2001 +> From: Daniel Bergey +> Date: Mon, 8 Apr 2013 19:55:04 -0500 +> Subject: [PATCH] emacs: functions to import sender or recipient into BBDB [v3] +> +>>From a show buffer, notmuch-bbdb/snarf-from imports the sender into + +Interestingly the line above was lost when I applied the patch -- +probably '>From' somehow borke git am... -- should git am be more capable +there (or would the required heuristics pass the tolerance threshold) ? + +> bbdb. notmuch-bbdb/snarf-to imports all recipients. Newly imported +> contacts are reported in the minibuffer / Messages buffer. +> +> Both functions use the BBDB parser to recognize email address formats. +> +> [v3] Fixes a few warnings as suggested by Tomi Ollila in +> id:87vc7vgbym.fsf@zancas.localnet +> [v2] Fixes missing close parenthesis in original. +> Spotted by Karl Fogel . +> --- +> emacs/notmuch-address.el | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ +> 1 file changed, 53 insertions(+) +> +> 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) + +It would be nice to have comment where bbdb-get-addresses-headers is defined. + +> + +> +(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)) +> + +> +(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 + +Somehow this comment section looks a bit odd -- is it the empty line there, +or just that (at least part of) it is not docstring. + +> + (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)))) +> + +> ;; +> +> (provide 'notmuch-address) +> -- +> 2.0.1 + +Tomi -- 2.26.2