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

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2013-07-20 13:53:35 +02:00
parent fb0f806299 21dd83661b
commit 17b584df89
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lisp/org-element.el
View File

@ -3135,42 +3135,42 @@ Assume point is at the beginning of the link."
;; abbreviation in it. ;; abbreviation in it.
raw-link (org-translate-link raw-link (org-translate-link
(org-link-expand-abbrev (org-link-expand-abbrev
(org-match-string-no-properties 1))) (org-match-string-no-properties 1))))
link (org-link-unescape raw-link))
;; Determine TYPE of link and set PATH accordingly. ;; Determine TYPE of link and set PATH accordingly.
(cond (cond
;; File type. ;; File type.
((or (file-name-absolute-p link) (string-match "^\\.\\.?/" link)) ((or (file-name-absolute-p raw-link)
(setq type "file" path link)) (string-match "^\\.\\.?/" raw-link))
(setq type "file" path raw-link))
;; Explicit type (http, irc, bbdb...). See `org-link-types'. ;; Explicit type (http, irc, bbdb...). See `org-link-types'.
((string-match org-link-re-with-space3 link) ((string-match org-link-re-with-space3 raw-link)
(setq type (match-string 1 link) path (match-string 2 link))) (setq type (match-string 1 raw-link) path (match-string 2 raw-link)))
;; Id type: PATH is the id. ;; Id type: PATH is the id.
((string-match "^id:\\([-a-f0-9]+\\)" link) ((string-match "^id:\\([-a-f0-9]+\\)" raw-link)
(setq type "id" path (match-string 1 link))) (setq type "id" path (match-string 1 raw-link)))
;; Code-ref type: PATH is the name of the reference. ;; Code-ref type: PATH is the name of the reference.
((string-match "^(\\(.*\\))$" link) ((string-match "^(\\(.*\\))$" raw-link)
(setq type "coderef" path (match-string 1 link))) (setq type "coderef" path (match-string 1 raw-link)))
;; Custom-id type: PATH is the name of the custom id. ;; Custom-id type: PATH is the name of the custom id.
((= (aref link 0) ?#) ((= (aref raw-link 0) ?#)
(setq type "custom-id" path (substring link 1))) (setq type "custom-id" path (substring raw-link 1)))
;; Fuzzy type: Internal link either matches a target, an ;; Fuzzy type: Internal link either matches a target, an
;; headline name or nothing. PATH is the target or ;; headline name or nothing. PATH is the target or
;; headline's name. ;; headline's name.
(t (setq type "fuzzy" path link)))) (t (setq type "fuzzy" path raw-link))))
;; Type 3: Plain link, i.e. http://orgmode.org ;; Type 3: Plain link, i.e. http://orgmode.org
((looking-at org-plain-link-re) ((looking-at org-plain-link-re)
(setq raw-link (org-match-string-no-properties 0) (setq raw-link (org-match-string-no-properties 0)
type (org-match-string-no-properties 1) type (org-match-string-no-properties 1)
path (org-match-string-no-properties 2) link-end (match-end 0)
link-end (match-end 0))) path (org-match-string-no-properties 2)))
;; Type 4: Angular link, i.e. <http://orgmode.org> ;; Type 4: Angular link, i.e. <http://orgmode.org>
((looking-at org-angle-link-re) ((looking-at org-angle-link-re)
(setq raw-link (buffer-substring-no-properties (setq raw-link (buffer-substring-no-properties
(match-beginning 1) (match-end 2)) (match-beginning 1) (match-end 2))
type (org-match-string-no-properties 1) type (org-match-string-no-properties 1)
path (org-match-string-no-properties 2) link-end (match-end 0)
link-end (match-end 0)))) path (org-match-string-no-properties 2))))
;; In any case, deduce end point after trailing white space from ;; In any case, deduce end point after trailing white space from
;; LINK-END variable. ;; LINK-END variable.
(setq post-blank (progn (goto-char link-end) (skip-chars-forward " \t")) (setq post-blank (progn (goto-char link-end) (skip-chars-forward " \t"))
@ -3187,7 +3187,7 @@ Assume point is at the beginning of the link."
(when (string-match "::\\(.*\\)$" path) (when (string-match "::\\(.*\\)$" path)
(setq search-option (match-string 1 path) (setq search-option (match-string 1 path)
path (replace-match "" nil nil path))) path (replace-match "" nil nil path)))
;; Make sure TYPE always report "file". ;; Make sure TYPE always reports "file".
(setq type "file")) (setq type "file"))
(list 'link (list 'link
(list :type type (list :type type