From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sergio Durigan Junior Newsgroups: gmane.emacs.devel Subject: [PATCH] Adjust EUDC to use BBDB 3.x Date: Mon, 19 Jan 2015 18:21:26 -0500 Message-ID: <87h9vml5l5.fsf@sergiodj.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1421717601 6207 80.91.229.3 (20 Jan 2015 01:33:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 20 Jan 2015 01:33:21 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 20 02:33:17 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YDNgx-0007Nb-KZ for ged-emacs-devel@m.gmane.org; Tue, 20 Jan 2015 02:33:15 +0100 Original-Received: from localhost ([::1]:40475 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDNgx-0005qK-31 for ged-emacs-devel@m.gmane.org; Mon, 19 Jan 2015 20:33:15 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40464) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDLdX-0005ww-6Z for emacs-devel@gnu.org; Mon, 19 Jan 2015 18:21:36 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YDLdU-000459-0G for emacs-devel@gnu.org; Mon, 19 Jan 2015 18:21:35 -0500 Original-Received: from kwanyin.sergiodj.net ([176.31.208.32]:45090) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDLdT-00044W-Qq for emacs-devel@gnu.org; Mon, 19 Jan 2015 18:21:31 -0500 X-URL: http://blog.sergiodj.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 176.31.208.32 X-Mailman-Approved-At: Mon, 19 Jan 2015 20:33:02 -0500 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:181458 Archived-At: Hi, With the release of BBDB 3.x, EUDC does not work properly anymore. The reason is because BBDB renamed a few fields internally, and EUDC is still using the old names. Specifically, the problem happens because of the 'net' -> 'mail' rename. The following patch fixes this issue. I tested it with my current .gnus configuration, and it works fine. I have the copyright assignment on file for contributing with GDB and binutils, but I still do not have it for Emacs (this is my third patch to the project IIRC). So I will contact the copyright clerk at FSF and get it done. Meanwhile, I'd appreciate reviews and comments. Thanks, -- Sergio GPG key ID: 0x65FC5E36 Please send encrypted e-mail if possible http://sergiodj.net/ 2015-01-19 Sergio Durigan Junior Adapt EUDC to BBDB 3.x * net/eudcb-bbdb.el (eudc-bbdb-attributes-translation-alist): Replacing 'net' by 'mail'. (eudc-bbdb-format-query): Likewise. (eudc-bbdb-filter-non-matching-record): Likewise. (eudc-bbdb-format-record-as-result): Likewise. diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el index 0400e5b..7abfd0c 100644 --- a/lisp/net/eudcb-bbdb.el +++ b/lisp/net/eudcb-bbdb.el @@ -43,7 +43,7 @@ (defvar eudc-bbdb-attributes-translation-alist '((name . lastname) - (email . net) + (email . mail) (phone . phones)) "Alist mapping EUDC attribute names to BBDB names.") @@ -63,10 +63,10 @@ firstname lastname)) (company (cdr (assq 'company query))) - (net (cdr (assq 'net query))) + (mail (cdr (assq 'mail query))) (notes (cdr (assq 'notes query))) (phone (cdr (assq 'phone query)))) - (list name company net notes phone))) + (list name company mail notes phone))) (defun eudc-bbdb-filter-non-matching-record (record) @@ -80,7 +80,7 @@ (case-fold-search t) bbdb-val) (or (and (memq attr '(firstname lastname aka company phones - addresses net)) + addresses mail)) (progn (setq bbdb-val (eval (list (intern (concat "bbdb-record-" @@ -151,7 +151,7 @@ The record is filtered according to `eudc-bbdb-current-return-attributes'" (require 'bbdb) (let ((attrs (or eudc-bbdb-current-return-attributes - '(firstname lastname aka company phones addresses net notes))) + '(firstname lastname aka company phones addresses mail notes))) attr eudc-rec val) @@ -163,7 +163,7 @@ The record is filtered according to `eudc-bbdb-current-return-attributes'" (setq val (eudc-bbdb-extract-phones record))) ((eq attr 'addresses) (setq val (eudc-bbdb-extract-addresses record))) - ((memq attr '(firstname lastname aka company net notes)) + ((memq attr '(firstname lastname aka company mail notes)) (setq val (eval (list (intern (concat "bbdb-record-"