mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 19:07:52 +00:00
Code Releases Activity

Prevent duplicating calls to `org-link-search'

Browse source 
* lisp/org.el (org-open-at-point): Do not call twice `org-link-search'
  when destination is not accessible within the current narrowed part of
  the buffer.
This commit is contained in:
Nicolas Goaziou 2015-08-04 14:32:55 +02:00
parent b4d85b47a9
commit 776449fd7d
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lisp/org.el
View file

@ -10827,22 +10827,24 @@ link in a property drawer line."
(if (not arg) (org-mark-ring-push)
(switch-to-buffer-other-window
(org-get-buffer-for-internal-link (current-buffer))))
(let ((cmd
(if (equal type "radio")
`(org-search-radio-target
,(org-element-property :path link))
`(org-link-search
,(if (member type '("custom-id" "coderef"))
(org-element-property :raw-link link)
path)
(let ((destination
(org-with-wide-buffer
(if (equal type "radio")
(org-search-radio-target
(org-element-property :path link))
(org-link-search
(if (member type '("custom-id" "coderef"))
(org-element-property :raw-link link)
path)
;; Prevent fuzzy links from matching
;; themselves.
,(and (equal type "fuzzy")
(+ 2
(org-element-property :begin link)))))))
(condition-case nil
(let ((org-link-search-inhibit-query t)) (eval cmd))
(error (progn (widen) (eval cmd)))))))
(and (equal type "fuzzy")
(+ 2 (org-element-property :begin link)))))
(point))))
(unless (and (<= (point-min) destination)
(>= (point-max) destination))
(widen))
(goto-char destination))))
(t (browse-url-at-point))))))
;; On a footnote reference or at a footnote definition's label.
((or (eq type 'footnote-reference)