mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-22 12:10:44 +00:00
Code Releases Activity

Merge branch 'master' of orgmode.org:org-mode

Browse source
This commit is contained in:
Bastien Guerry 2011-10-27 18:23:08 +02:00
parent 44435f3ee3 23b8111ffa
commit 901121ac45
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
lisp/org-table.el
View file

@ -2986,20 +2986,24 @@ when a line/row is swaped out of that privileged position. So for
formulas that use a range of rows or columns, it may often be better formulas that use a range of rows or columns, it may often be better
to anchor the formula with \"I\" row markers, or to offset from the to anchor the formula with \"I\" row markers, or to offset from the
borders of the table using the @< @> $< $> makers." borders of the table using the @< @> $< $> makers."
(let (n nmax len char) (let (n nmax len char (start 0))
(while (string-match "\\([@$]\\)\\(<+\\|>+\\)" s) (while (string-match "\\([@$]\\)\\(<+\\|>+\\)\\|\\(remote([^\)]+)\\)"
(setq nmax (if (equal (match-string 1 s) "@") s start)
(1- (length org-table-dlines)) (if (match-end 3)
org-table-current-ncol) (setq start (match-end 3))
len (- (match-end 2) (match-beginning 2)) (setq nmax (if (equal (match-string 1 s) "@")
char (string-to-char (match-string 2 s)) (1- (length org-table-dlines))
n (if (= char ?<) org-table-current-ncol)
len len (- (match-end 2) (match-beginning 2))
(- nmax len -1))) char (string-to-char (match-string 2 s))
(if (or (< n 1) (> n nmax)) n (if (= char ?<)
(error "Reference \"%s\" in expression \"%s\" points outside table" len
(match-string 0 s) s)) (- nmax len -1)))
(setq s (replace-match (format "%s%d" (match-string 1 s) n) t t s)))) (if (or (< n 1) (> n nmax))
(error "Reference \"%s\" in expression \"%s\" points outside table"
(match-string 0 s) s))
(setq start (match-beginning 0))
(setq s (replace-match (format "%s%d" (match-string 1 s) n) t t s)))))
s) s)
(defun org-table-formula-substitute-names (f) (defun org-table-formula-substitute-names (f)
@ -4668,6 +4672,8 @@ The return value is either a single string for a single field, or a
list of the fields in the rectangle ." list of the fields in the rectangle ."
(save-match-data (save-match-data
(let ((id-loc nil) (let ((id-loc nil)
;; Protect a bunch of variables from being overwritten
;; by the context of the remote table
org-table-column-names org-table-column-name-regexp org-table-column-names org-table-column-name-regexp
org-table-local-parameters org-table-named-field-locations org-table-local-parameters org-table-named-field-locations
org-table-current-line-types org-table-current-begin-line org-table-current-line-types org-table-current-begin-line
@ -4704,7 +4710,8 @@ list of the fields in the rectangle ."
(error "Cannot find a table at NAME or ID %s" name-or-id)) (error "Cannot find a table at NAME or ID %s" name-or-id))
(setq tbeg (point-at-bol)) (setq tbeg (point-at-bol))
(org-table-get-specials) (org-table-get-specials)
(setq form (org-table-formula-substitute-names form)) (setq form (org-table-formula-substitute-names
(org-table-formula-handle-first/last-rc form)))
(if (and (string-match org-table-range-regexp form) (if (and (string-match org-table-range-regexp form)
(> (length (match-string 0 form)) 1)) (> (length (match-string 0 form)) 1))
(save-match-data (save-match-data