emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Eric Abrahamsen <eric@ericabrahamsen.net>
To: emacs-orgmode@gnu.org
Subject: Re: org-bbdb link completion fix
Date: Tue, 29 Apr 2014 09:03:12 +0800	[thread overview]
Message-ID: <87r44hq75b.fsf@ericabrahamsen.net> (raw)
In-Reply-To: 87ha5dpkqe.fsf@gmail.com

[-- Attachment #1: Type: text/plain, Size: 859 bytes --]

Nicolas Goaziou <n.goaziou@gmail.com> writes:

> Hello,
> Eric Abrahamsen <eric@ericabrahamsen.net> writes:
>> The most recent versions of BBDB return single records from
>> `bbdb-completing-read-record'. That currently breaks completion on bbdb:
>> links -- possibly earlier versions of BBDB always returned list values.
>> We should probably check for this in `org-bbdb-complete-link', I propose
>> the attached patch.
> Thank you for the patch.  Would you mind providing a proper commit
> message and send it again?

Yup, sorry about that.

Hey, on this subject... How do you all handle these situations with
one-time commits being sent to the list? It's kind of a pain making the
commit, then waiting for the same or equivalent commit to come back via
upstream, then reverting the local commit. Does everyone use throwaway
branches for this?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-BBDB-link-completion.patch --]
[-- Type: text/x-diff, Size: 1139 bytes --]

From 55f41f66cd51ed27c396c3e7c805d83d894eb987 Mon Sep 17 00:00:00 2001
From: Eric Abrahamsen <eric@ericabrahamsen.net>
Date: Tue, 29 Apr 2014 08:59:13 +0800
Subject: [PATCH] Fix BBDB link completion

lisp/org-bbdb.el: org-bbdb-complete-link

Newer versions of BBDB seem to be returning atomic values from
`bbdb-completing-read-record', we should be prepared for both atoms
and lists.
 lisp/org-bbdb.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el
index b9841a6..cfd5b3b 100644
--- a/lisp/org-bbdb.el
+++ b/lisp/org-bbdb.el
@@ -400,8 +400,11 @@ This is used by Org to re-create the anniversary hash table."
 (defun org-bbdb-complete-link ()
   "Read a bbdb link with name completion."
   (require 'bbdb-com)
-  (concat "bbdb:"
-	  (bbdb-record-name (car (bbdb-completing-read-record "Name: ")))))
+  (let ((rec (bbdb-completing-read-record "Name: ")))
+    (concat "bbdb:"
+	    (bbdb-record-name (if (listp rec)
+				  (car rec)
+				rec)))))
 (defun org-bbdb-anniv-export-ical ()
   "Extract anniversaries from BBDB and convert them to icalendar format."

  reply	other threads:[~2014-04-29  1:00 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-28  9:31 org-bbdb link completion fix Eric Abrahamsen
2014-04-28 14:55 ` Nicolas Goaziou
2014-04-29  1:03   ` Eric Abrahamsen [this message]
2014-04-29  9:38     ` Nicolas Goaziou

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87r44hq75b.fsf@ericabrahamsen.net \
    --to=eric@ericabrahamsen.net \
    --cc=emacs-orgmode@gnu.org \


* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).