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

Prevent fuzzy links from matching themselves 

* lisp/org.el (org-open-at-point):
(org-link-search): Prevent fuzzy links from matching themselves.
This commit is contained in:
Nicolas Goaziou 2015-08-03 02:20:06 +02:00
parent cfe5bc97f8
commit e50033d494
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lisp/org.el
View File

@ -10759,7 +10759,7 @@ link in a property drawer line."
(funcall dedicated-function (funcall dedicated-function
(concat path (concat path
(and option (concat "::" option)))) (and option (concat "::" option))))
(apply 'org-open-file (apply #'org-open-file
path path
(cond (arg) (cond (arg)
((equal app "emacs") 'emacs) ((equal app "emacs") 'emacs)
@ -10833,10 +10833,13 @@ link in a property drawer line."
path) path)
,(cond ((equal arg '(4)) 'occur) ,(cond ((equal arg '(4)) 'occur)
((equal arg '(16)) 'org-occur)) ((equal arg '(16)) 'org-occur))
,(org-element-property :begin link)))) ;; Prevent fuzzy links from matching
;; themselves.
,(and (equal type "fuzzy")
(+ 2
(org-element-property :begin link))))))
(condition-case nil (condition-case nil
(let ((org-link-search-inhibit-query t)) (let ((org-link-search-inhibit-query t)) (eval cmd))
(eval cmd))
(error (progn (widen) (eval cmd))))))) (error (progn (widen) (eval cmd)))))))
(t (browse-url-at-point)))))) (t (browse-url-at-point))))))
;; On a footnote reference or at a footnote definition's label. ;; On a footnote reference or at a footnote definition's label.
@ -11129,9 +11132,20 @@ Search is case-insensitive and ignores white spaces."
((catch :fuzzy-match ((catch :fuzzy-match
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward s-multi-re nil t) (while (re-search-forward s-multi-re nil t)
(unless (and avoid-pos ;; Skip match if it contains AVOID-POS or it is included
(>= (match-beginning 0) avoid-pos) ;; in a link with a description but outside the
(< (match-end 0) avoid-pos)) ;; description.
(unless (or (and avoid-pos
(<= (match-beginning 0) avoid-pos)
(> (match-end 0) avoid-pos))
(and (save-match-data
(org-in-regexp org-bracket-link-regexp))
(match-beginning 3)
(or (> (match-beginning 3) (point))
(<= (match-end 3) (point)))
(org-element-lineage
(save-match-data (org-element-context))
'(link) t)))
(goto-char (match-beginning 0)) (goto-char (match-beginning 0))
(setq type 'fuzzy) (setq type 'fuzzy)
(throw :fuzzy-match t))) (throw :fuzzy-match t)))