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

Revert "Allow regexps in org-file-apps to capture link parameters using groups" 

This reverts commit 75563bf71e.

Conflicts:

	lisp/ChangeLog
	lisp/org.el
This commit is contained in:
Jan Böcker 2010-04-09 20:08:21 +02:00
parent cd70e85522
commit db2056e92a
2 changed files with 13 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/ChangeLog
View File

@ -293,16 +293,6 @@
(org-table-get, org-table-put, org-table-goto-line)
(org-table-current-line): New functions.
2010-03-21 Jan Böcker <jan.boecker@jboecker.de>
* org.el (org-open-file): Allow regular expressions in
org-file-apps to capture link parameters using groups. In a
command string to be executed, the parameters can be referenced
using %1, %2, etc. Lisp forms can access them using
(match-string n link).
(org-apps-regexp-alist): Adopt the created regexp, as this is now
matched against a file: link instead of the file name.
2010-03-21 Carsten Dominik <carsten.dominik@gmail.com>
* org-crypt.el (org-reveal-start-hook): Add a decryption function

64
lisp/org.el
View File

@ -1463,10 +1463,9 @@ you can use this variable to set the application for a given file
extension. The entries in this list are cons cells where the car identifies
files and the cdr the corresponding command. Possible values for the
file identifier are
\"regex\" Regular expression matched against the file: link. For
backward compatibility, this can also be a string with only
alphanumeric characters, which is then interpreted as an
extension.
\"regex\" Regular expression matched against the file name. For backward
compatibility, this can also be a string with only alphanumeric
characters, which is then interpreted as an extension.
`directory' Matches a directory
`remote' Matches a remote file, accessible through tramp or efs.
Remote files most likely should be visited through Emacs
@ -1495,13 +1494,9 @@ Possible values for the command are:
does define this command, but you can overrule/replace it
here.
string A command to be executed by a shell; %s will be replaced
by the path to the file. If the file identifier is a regex,
%n will be replaced by the match of the nth match group.
by the path to the file.
sexp A Lisp form which will be evaluated. The file path will
be available in the Lisp variable `file', the link itself
in the Lisp variable `link'. If the file identifier is a regex,
the original match data will be restored, so subexpression
matches are accessible using (match-string n link).
be available in the Lisp variable `file'.
For more examples, see the system specific constants
`org-file-apps-defaults-macosx'
`org-file-apps-defaults-windowsnt'
@ -9129,12 +9124,10 @@ With a double C-c C-u prefix arg, Org tries to avoid opening in Emacs
and to use an external application to visit the file.
Optional LINE specifies a line to go to, optional SEARCH a string to
search for. If LINE or SEARCH is given, but IN-EMACS is nil, it will
be assumed that org-open-file was called to open a file: link, and the
original link to match against org-file-apps will be reconstructed
from PATH and whichever of LINE or SEARCH is given.
search for. If LINE or SEARCH is given, the file will always be
opened in Emacs.
If the file does not exist, an error is thrown."
(setq in-emacs (or in-emacs line search))
(let* ((file (if (equal path "")
buffer-file-name
(substitute-in-file-name (expand-file-name path))))
@ -9146,19 +9139,10 @@ If the file does not exist, an error is thrown."
file))
(a-m-a-p (assq 'auto-mode apps))
(dfile (downcase file))
;; reconstruct the original file: link from the PATH, LINE and SEARCH args
(link (cond ((and (eq line nil)
(eq search nil))
file)
(line
(concat file "::" (number-to-string line)))
(search
(concat file "::" search))))
(dlink (downcase link))
(old-buffer (current-buffer))
(old-pos (point))
(old-mode major-mode)
ext cmd link-match-data)
ext cmd)
(if (string-match "^.*\\.\\([a-zA-Z0-9]+\\.gz\\)$" dfile)
(setq ext (match-string 1 dfile))
(if (string-match "^.*\\.\\([a-zA-Z0-9]+\\)$" dfile)
@ -9170,15 +9154,8 @@ If the file does not exist, an error is thrown."
(t
(setq cmd (or (and remp (cdr (assoc 'remote apps)))
(and dirp (cdr (assoc 'directory apps)))
;; if we find a match in org-file-apps, store the match
;; data for later
(let ((match (assoc-default dlink (org-apps-regexp-alist
apps a-m-a-p)
'string-match)))
(if match
(progn (setq link-match-data (match-data))
match)
nil))
(assoc-default dfile (org-apps-regexp-alist apps a-m-a-p)
'string-match)
(cdr (assoc ext apps))
(cdr (assoc t apps))))))
(when (eq cmd 'system)
@ -9208,18 +9185,6 @@ If the file does not exist, an error is thrown."
(shell-quote-argument
(convert-standard-filename file)))
t t cmd)))
;; Replace "%1", "%2" etc. in command with group matches from regex
(save-match-data
(let ((match-index 1)
(number-of-groups (- (/ (length link-match-data) 2) 1)))
(set-match-data link-match-data)
(while (<= match-index number-of-groups)
(let ((regex (concat "%" (number-to-string match-index)))
(replace-with (match-string match-index dlink)))
(while (string-match regex cmd)
(setq cmd (replace-match replace-with t t cmd))))
(setq match-index (+ match-index 1)))))
(save-window-excursion
(start-process-shell-command cmd nil cmd)
(and (boundp 'org-wait) (numberp org-wait) (sit-for org-wait))
@ -9232,9 +9197,7 @@ If the file does not exist, an error is thrown."
(if search (org-link-search search))))
((consp cmd)
(let ((file (convert-standard-filename file)))
(save-match-data
(set-match-data link-match-data)
(eval cmd))))
(eval cmd)))
(t (funcall (cdr (assq 'file org-link-frame-setup)) file)))
(and (org-mode-p) (eq old-mode 'org-mode)
(or (not (equal old-buffer (current-buffer)))
@ -9264,8 +9227,7 @@ be opened in Emacs."
nil
(if (string-match "\\W" (car x))
x
(cons (concat "\\." (car x) "\\(::.*\\)?\\'")
(cdr x)))))
(cons (concat "\\." (car x) "\\'") (cdr x)))))
list))
(if add-auto-mode
(mapcar (lambda (x) (cons (car x) 'emacs)) auto-mode-alist))))