summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2011-10-28 16:42:20 +0200
committerBastien Guerry <bzg@altern.org>2011-10-28 16:42:20 +0200
commit6da350bf06fa2e16bd3db326e10e3ca2b0e549b4 (patch)
treec1e8531532c7978994c1164ac630affd9cb2609b
parent30f7c5cc0d2079b03227abfde58539fc6246c149 (diff)
downloadorg-mode-6da350bf06fa2e16bd3db326e10e3ca2b0e549b4.tar.gz
org.el: Fix bug when matching the face property before following a link.
* org.el (org-return): Fix bug when matching the face property before following a link. Thanks to Paul Sexton for the analysis and the fix.
-rw-r--r--lisp/org.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el
index b55de90..7f967ce 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -18287,8 +18287,9 @@ See the individual commands for more information."
(org-indent-line-function)
(org-indent-line-to ind)))))
((and org-return-follows-link
- (or (eq (get-text-property (point) 'face) 'org-link)
- (memq 'org-link (get-text-property (point) 'face))))
+ (let ((tprop (get-text-property (point) 'face)))
+ (or (eq tprop 'org-link)
+ (and (listp tprop) (memq 'org-link tprop)))))
(call-interactively 'org-open-at-point))
((and (org-at-heading-p)
(looking-at