mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-21 23:48:34 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Bastien Guerry 2014-02-05 10:57:01 +01:00
parent 655e07730b a08bff4138
commit aa19233d80
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

@ -10446,7 +10446,8 @@ application the system uses for this file type."
(let (type path link line search (pos (point)))
(catch 'match
(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)
(setq link (org-extract-attributes
(org-link-unescape (org-match-string-no-properties 1))))
@ -10484,9 +10485,10 @@ application the system uses for this file type."
;; Check a plain link is not within a bracket link
(and match
(save-excursion
(progn
(goto-char (car match))
(not (org-in-regexp org-bracket-link-regexp))))))
(save-match-data
(progn
(goto-char (car match))
(not (org-in-regexp org-bracket-link-regexp)))))))
(let ((line_ending (save-excursion (end-of-line) (point))))
;; We are in a line before a plain or bracket link
(or (re-search-forward org-plain-link-re line_ending t)