summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2011-10-26 19:20:12 +0200
committerBastien Guerry <bzg@altern.org>2011-10-26 19:20:12 +0200
commitde8cd8ee41543bb0548af1cdc7fa7a8168321677 (patch)
tree8d5e5949ba52497731523a0ad423c62faedcc363
parent611598099385e5ca2d04d7302cbf91eb421d47f4 (diff)
downloadorg-mode-de8cd8ee41543bb0548af1cdc7fa7a8168321677.tar.gz
Bugfix: make `org-return' detect 'org-link face properly.
* org.el (org-return): Check the presence of the 'org-link face even in contexts where there is more than one face. Thanks to Maximilian Matthé for reporting this bug.
-rw-r--r--lisp/org.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org.el b/lisp/org.el
index d42db47..2599d41 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -18286,7 +18286,8 @@ See the individual commands for more information."
(org-indent-line-function)
(org-indent-line-to ind)))))
((and org-return-follows-link
- (eq (get-text-property (point) 'face) 'org-link))
+ (or (eq (get-text-property (point) 'face) 'org-link)
+ (memq 'org-link (get-text-property (point) 'face))))
(call-interactively 'org-open-at-point))
((and (org-at-heading-p)
(looking-at