From 6da350bf06fa2e16bd3db326e10e3ca2b0e549b4 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 28 Oct 2011 16:42:20 +0200 Subject: [PATCH] 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. --- lisp/org.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index b55de9065..7f967ce24 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 -- 2.11.4.GIT