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

org-table: Fix formulas with relative ranges in current row 

* lisp/org-table.el (org-table-eval-formula): Fix formulas with
  relative ranges in current row.

Reported-by: Eric S Fraga <e.fraga@ucl.ac.uk>
<http://permalink.gmane.org/gmane.emacs.orgmode/97727>
This commit is contained in:
Nicolas Goaziou 2015-06-09 14:53:18 +02:00
parent c532ff36aa
commit 3924989b4f
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lisp/org-table.el
View File

@ -2790,15 +2790,19 @@ not overwrite the stored one."
(string-match (regexp-quote form) formrpl)))
(setq form (replace-match formrpl t t form))
(user-error "Spreadsheet error: invalid reference \"%s\"" form)))
;; Insert simple ranges
(while (string-match "\\$\\([0-9]+\\)\\.\\.\\$\\([0-9]+\\)" form)
;; Insert simple ranges, i.e. included in the current row.
(while (string-match
"\\$\\(\\([-+]\\)?[0-9]+\\)\\.\\.\\$\\(\\([-+]\\)?[0-9]+\\)"
form)
(setq form
(replace-match
(save-match-data
(org-table-make-reference
(org-sublist
fields (string-to-number (match-string 1 form))
(string-to-number (match-string 2 form)))
(org-sublist fields
(+ (if (match-end 2) n0 0)
(string-to-number (match-string 1 form)))
(+ (if (match-end 4) n0 0)
(string-to-number (match-string 3 form))))
keep-empty numbers lispp))
t t form)))
(setq form0 form)