|
|
@@ -3260,7 +3260,7 @@ existing formula for column %s"
|
|
|
(goto-char beg)
|
|
|
;; Mark named fields untouchable. Also check if several
|
|
|
;; field/range formulas try to set the same field.
|
|
|
- (remove-text-properties beg end '(org-untouchable t))
|
|
|
+ (remove-text-properties beg end '(:org-untouchable t))
|
|
|
(let ((current-line (count-lines org-table-current-begin-pos
|
|
|
(line-beginning-position)))
|
|
|
seen-fields)
|
|
|
@@ -3288,9 +3288,7 @@ existing formula for column %s"
|
|
|
(org-table-goto-field name)
|
|
|
(org-table-put-field-property :org-untouchable t)))))
|
|
|
;; Evaluate the column formulas, but skip fields covered by
|
|
|
- ;; field formulas. This is done by setting
|
|
|
- ;; `:org-untouchable' property on such fields. The property
|
|
|
- ;; is them removed once column formulas have been applied.
|
|
|
+ ;; field formulas.
|
|
|
(goto-char beg)
|
|
|
(while (re-search-forward line-re end t)
|
|
|
(unless (string-match "\\` *[_^!$/] *\\'" (org-table-get-field 1))
|
|
|
@@ -3312,7 +3310,6 @@ existing formula for column %s"
|
|
|
(unless (get-text-property (point) :org-untouchable)
|
|
|
(org-table-eval-formula
|
|
|
nil (cdr entry) 'noalign 'nocst 'nostore 'noanalysis)))))
|
|
|
- (remove-text-properties beg end '(:org-untouchable))
|
|
|
;; Evaluate the field formulas.
|
|
|
(dolist (eq eqlfield)
|
|
|
(let ((reference (car eq))
|
Nicolas Goaziou