mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-20 14:19:00 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Bastien Guerry 2012-12-20 09:39:48 +01:00
parent beeb9168dd 14ffe22b8f
commit 9be19e32d1
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lisp/org.el
View file

@ -9849,12 +9849,13 @@ application the system uses for this file type."
(throw 'match t))
(save-excursion
(when (or (org-in-regexp org-angle-link-re)
(and (goto-char (car (org-in-regexp org-plain-link-re)))
(save-match-data (not (looking-back "\\[\\[")))))
(setq type (match-string 1)
path (org-link-unescape (match-string 2)))
(throw 'match t)))
(let ((linkpos (org-in-regexp org-angle-link-re)))
(when (or linkpos
(and linkpos (goto-char (car klpos))
(save-match-data (not (looking-back "\\[\\[")))))
(setq type (match-string 1)
path (org-link-unescape (match-string 2)))
(throw 'match t))))
(save-excursion
(when (org-in-regexp (org-re "\\(:[[:alnum:]_@#%:]+\\):[ \t]*$"))
(setq type "tags"
@ -9867,7 +9868,7 @@ application the system uses for this file type."
path (match-string 1))
(throw 'match t)))
(unless path
(error "No link found"))
(user-error "No link found"))
;; switch back to reference buffer
;; needed when if called in a temporary buffer through