summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-04-29 13:08:23 +0200
committerBastien Guerry <bzg@altern.org>2014-04-29 13:08:23 +0200
commit20b70a1716cf4b83a0e521ce784fbf75e601ab3a (patch)
tree422e61965b02e52ae7a8fdb0ca4701882f382dae
parent86a129c59799fe820933f7c2f97e100c92b10287 (diff)
parente6918b0bb2c981f9ac71accb0ab4a1f116fa2835 (diff)
downloadorg-mode-20b70a1716cf4b83a0e521ce784fbf75e601ab3a.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-bbdb.el7
-rw-r--r--lisp/org-capture.el4
2 files changed, 8 insertions, 3 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."
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index cf6c9e2..c053640 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -1678,7 +1678,9 @@ The template may still contain \"%?\" for cursor positioning."
(or (equal (char-before) ?:) (insert ":"))
(insert ins)
(or (equal (char-after) ?:) (insert ":"))
- (and (org-at-heading-p) (org-set-tags nil 'align)))))
+ (and (org-at-heading-p)
+ (let ((org-ignore-region t))
+ (org-set-tags nil 'align))))))
((equal char "C")
(cond ((= (length clipboards) 1) (insert (car clipboards)))
((> (length clipboards) 1)