summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2010-11-20 18:24:18 +0100
committerCarsten Dominik <carsten.dominik@gmail.com>2010-11-20 18:24:18 +0100
commitf692ba3c2604e522a04c333c7404fc6bd66f8336 (patch)
tree43c7655e203675e864ec29db870af4b89a86cb74
parentdce955fad095a6580933d326cdc72e425e44594c (diff)
downloadorg-mode-f692ba3c2604e522a04c333c7404fc6bd66f8336.tar.gz
Remove confusion of C-c C-o in footnote with cursor on link
* lisp/org.el (org-open-at-point): Don't do footnote action if cursor is on a bracket link. Sebastian Mengin writes: > Hi, > > Consider the following minimal example: > > Text[fn:1] > > * Footnotes > [fn:1] Note with a [[file:abecedaire.jpg][link]]. > > Here with orgmode 7.02, doing C-c C-o on the link moves the cursor on > [fn:1] and says in the minibuffer: "Position saved mark to ring, go back > with C-c &", instead of opening the linked file. > > Is this a 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 c634a6c..0c46eec 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9080,7 +9080,8 @@ application the system uses for this file type."
(progn (require 'org-attach) (org-attach-reveal 'if-exists))))
((run-hook-with-args-until-success 'org-open-at-point-functions))
((org-at-timestamp-p t) (org-follow-timestamp-link))
- ((or (org-footnote-at-reference-p) (org-footnote-at-definition-p))
+ ((and (or (org-footnote-at-reference-p) (org-footnote-at-definition-p))
+ (not (org-in-regexp org-bracket-link-regexp)))
(org-footnote-action))
(t
(let (type path link line search (pos (point)))