mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

TBLFM remote ref: Improve indirection 

* lisp/org-table.el (org-table-remote-reference-indirection): Use the
optional arg START of `string-match' to improve performance and to
avoid endless loop on user error.
This commit is contained in:
Michael Brand 2014-01-12 11:52:40 +01:00
parent bc1d54b84b
commit 9a5b8a7434
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lisp/org-table.el
View File

@ -5017,19 +5017,17 @@ For example \"remote($1, @>$2)\" => \"remote(year_2013, @>$1)\".
This indirection works only with the format @ROW$COLUMN. The
format \"B3\" is not supported because it can not be
distinguished from a plain table name or ID."
(let ((index-last -1) index-this)
(while (and (setq index-this
(string-match (concat
;; Same as in `org-table-eval-formula'.
"\\<remote([ \t]*\\("
;; Allow "$1", "@<", "$-1", "@<<$1" etc.
"[@$][^,]+"
;; Same as in `org-table-eval-formula'.
"\\)[ \t]*,[ \t]*\\([^\n)]+\\))")
form))
;; Protect from last replace replaced itself.
(/= index-last index-this))
(setq index-last index-this)
(let ((start 0))
(while (string-match (concat
;; Same as in `org-table-eval-formula'.
"\\<remote([ \t]*\\("
;; Allow "$1", "@<", "$-1", "@<<$1" etc.
"[@$][^,)]+"
;; Same as in `org-table-eval-formula'.
"\\)[ \t]*,[ \t]*\\([^\n)]+\\))")
form
start)
(setq start (match-end 0))
;; Substitute the remote reference with the value found in the
;; field.
(setq form