mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-15 23:41:27 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Nicolas Goaziou 2013-05-02 14:52:47 +02:00
parent 168c5584f5 b7301bd639
commit 1e32d7bf25
1 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
lisp/ox.el
View file

@ -3976,27 +3976,43 @@ significant."
;; Split PATH at white spaces so matches are space ;; Split PATH at white spaces so matches are space
;; insensitive. ;; insensitive.
(path (org-split-string (path (org-split-string
(if match-title-p (substring raw-path 1) raw-path)))) (if match-title-p (substring raw-path 1) raw-path)))
;; Cache for locations of fuzzy links that are not position dependent
(link-cache
(or (plist-get info :fuzzy-link-cache)
(plist-get (setq info (plist-put info :fuzzy-link-cache
(make-hash-table :test 'equal)))
:fuzzy-link-cache)))
(found-in-cache (gethash path link-cache 'fuzzy-link-not-found)))
(cond (cond
;; First try to find a matching "<<path>>" unless user specified ;; First try to find a matching "<<path>>" unless user specified
;; he was looking for a headline (path starts with a "*" ;; he was looking for a headline (path starts with a "*"
;; character). ;; character).
((and (not match-title-p) ((and (not match-title-p)
(org-element-map (plist-get info :parse-tree) 'target (or (not (eq found-in-cache 'fuzzy-link-not-found))
(lambda (blob) (puthash path
(and (equal (org-split-string (org-element-property :value blob)) (org-element-map (plist-get info :parse-tree) 'target
path) (lambda (blob)
blob)) (and (equal (org-split-string
info t))) (org-element-property :value blob))
path)
blob))
info t)
link-cache))))
;; Then try to find an element with a matching "#+NAME: path" ;; Then try to find an element with a matching "#+NAME: path"
;; affiliated keyword. ;; affiliated keyword.
((and (not match-title-p) ((and (not match-title-p)
(org-element-map (plist-get info :parse-tree) (or (not (eq found-in-cache 'fuzzy-link-not-found))
org-element-all-elements (puthash path
(lambda (el) (org-element-map (plist-get info :parse-tree)
(let ((name (org-element-property :name el))) org-element-all-elements
(when (and name (equal (org-split-string name) path)) el))) (lambda (el)
info 'first-match))) (let ((name (org-element-property :name el)))
(when (and name
(equal (org-split-string name) path))
el)))
info 'first-match)
link-cache))))
;; Last case: link either points to a headline or to nothingness. ;; Last case: link either points to a headline or to nothingness.
;; Try to find the source, with priority given to headlines with ;; Try to find the source, with priority given to headlines with
;; the closest common ancestor. If such candidate is found, ;; the closest common ancestor. If such candidate is found,