mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-21 23:48:34 +00:00
Merge branch 'maint'
This commit is contained in:
commit
aa19233d80
10
lisp/org.el
10
lisp/org.el
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue