ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

org.el (org-open-at-point): Fix bug when opening a plain link followed by a bracket link 

* org.el (org-open-at-point): Fix bug when opening a plain
link followed by a bracket link.

Thanks to John Kitchin for reporting this.
This commit is contained in:
Bastien Guerry 2014-02-05 10:56:50 +01:00
parent 8e1386cead
commit a08bff4138
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/org.el
View File

@ -10339,7 +10339,8 @@ application the system uses for this file type."
(let (type path link line search (pos (point))) (let (type path link line search (pos (point)))
(catch 'match (catch 'match
(save-excursion (save-excursion
(skip-chars-forward "^]\n\r") (or (org-in-regexp org-plain-link-re)
(skip-chars-forward "^]\n\r"))
(when (org-in-regexp org-bracket-link-regexp 1) (when (org-in-regexp org-bracket-link-regexp 1)
(setq link (org-extract-attributes (setq link (org-extract-attributes
(org-link-unescape (org-match-string-no-properties 1)))) (org-link-unescape (org-match-string-no-properties 1))))
@ -10377,9 +10378,10 @@ application the system uses for this file type."
;; Check a plain link is not within a bracket link ;; Check a plain link is not within a bracket link
(and match (and match
(save-excursion (save-excursion
(progn (save-match-data
(goto-char (car match)) (progn
(not (org-in-regexp org-bracket-link-regexp)))))) (goto-char (car match))
(not (org-in-regexp org-bracket-link-regexp)))))))
(let ((line_ending (save-excursion (end-of-line) (point)))) (let ((line_ending (save-excursion (end-of-line) (point))))
;; We are in a line before a plain or bracket link ;; We are in a line before a plain or bracket link
(or (re-search-forward org-plain-link-re line_ending t) (or (re-search-forward org-plain-link-re line_ending t)