From 16561446168b08baec120d06054310c4b452476b Mon Sep 17 00:00:00 2001 From: Sebastian Lipp Date: Fri, 4 Jul 2014 02:38:51 +0200 Subject: [PATCH] Re: [PATCH] emacs: add missing paren to fix defun in notmuch-address.el. --- 4e/47b443aaf10bd9f6c2eda77a678577e65c7ba9 | 208 ++++++++++++++++++++++ 1 file changed, 208 insertions(+) create mode 100644 4e/47b443aaf10bd9f6c2eda77a678577e65c7ba9 diff --git a/4e/47b443aaf10bd9f6c2eda77a678577e65c7ba9 b/4e/47b443aaf10bd9f6c2eda77a678577e65c7ba9 new file mode 100644 index 000000000..8b6dce870 --- /dev/null +++ b/4e/47b443aaf10bd9f6c2eda77a678577e65c7ba9 @@ -0,0 +1,208 @@ +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 43DC3431FAF + for ; Thu, 3 Jul 2014 17:48:52 -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 cHPpjH8bDl8T for ; + Thu, 3 Jul 2014 17:48:46 -0700 (PDT) +X-Greylist: delayed 597 seconds by postgrey-1.32 at olra; + Thu, 03 Jul 2014 17:48:46 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 41E93431FAE + for ; Thu, 3 Jul 2014 17:48:46 -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 4CF2149376; + Thu, 3 Jul 2014 17:38:48 -0700 (PDT) +Received: from [127.0.0.1] (localhost [127.0.0.1]) + (Authenticated sender: bacuh@fruiteater.riseup.net) + with ESMTPSA id CDBC61016 +From: Sebastian Lipp +To: Tomi Ollila , David Bremner , + Jed Brown , Jani Nikula , + Karl Fogel , Daniel Bergey +Subject: Re: [PATCH] emacs: add missing paren to fix defun in + notmuch-address.el. +In-Reply-To: +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> + +User-Agent: Notmuch/0.18 (http://notmuchmail.org) Emacs/24.3.1 + (i686-pc-linux-gnu) +Date: Fri, 04 Jul 2014 02:38:51 +0200 +Message-ID: + <87pphmc604.fsf@verb.i-did-not-set--mail-host-address--so-tickle-me> +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="=-=-=" +X-Virus-Scanned: clamav-milter 0.98.1 at mx1 +X-Virus-Status: Clean +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 00:48:52 -0000 + +--=-=-= +Content-Type: text/plain + +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 + + +--=-=-= +Content-Type: text/x-diff +Content-Disposition: inline; + filename=0001-emacs-functions-to-import-sender-or-recipient-into-B.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 +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) ++ ++(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 ++ (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 + + +--=-=-=-- -- 2.26.2