tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Revert "Improve file opening when matching links" 

This reverts commit 39c91ba24a.
This commit is contained in:
Jan Böcker 2010-04-09 18:33:53 +02:00
parent 8258daf439
commit cd70e85522
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lisp/ChangeLog
View File

@ -9,7 +9,6 @@
frames. frames.
(org-export-latex-default-packages-alist): hyperref must be loaded (org-export-latex-default-packages-alist): hyperref must be loaded
late. late.
(org-open-file): More care with the new matching for file links.
2010-04-07 Carsten Dominik <carsten.dominik@gmail.com> 2010-04-07 Carsten Dominik <carsten.dominik@gmail.com>

18
lisp/org.el
View File

@ -9172,19 +9172,13 @@ If the file does not exist, an error is thrown."
(and dirp (cdr (assoc 'directory apps))) (and dirp (cdr (assoc 'directory apps)))
;; if we find a match in org-file-apps, store the match ;; if we find a match in org-file-apps, store the match
;; data for later ;; data for later
(let* ((re-list1 (org-apps-regexp-alist apps nil)) (let ((match (assoc-default dlink (org-apps-regexp-alist
(re-list2 apps a-m-a-p)
(if a-m-a-p 'string-match)))
(org-apps-regexp-alist apps a-m-a-p) (if match
re-list1))
(private-match
(assoc-default dlink re-list1 'string-match))
(general-match
(assoc-default dfile re-list2 'string-match)))
(if private-match
(progn (setq link-match-data (match-data)) (progn (setq link-match-data (match-data))
private-match) match)
general-match)) nil))
(cdr (assoc ext apps)) (cdr (assoc ext apps))
(cdr (assoc t apps)))))) (cdr (assoc t apps))))))
(when (eq cmd 'system) (when (eq cmd 'system)