summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-11-15 21:50:56 (GMT)
committer Nicolas Goaziou <mail@nicolasgoaziou.fr>2017-11-15 21:50:56 (GMT)
commitde289d1fe84238470bcf178bac907a4becb0cf0f (patch)
tree8fe6bfbe72bf13f1b70b78193868f6e92a65f262
parent04e0532ef53b17c482fb81da2687fb403207eb55 (diff)
parent946f76d7070f8fbcf5c1072b7f53cea599f2e110 (diff)
downloadorg-mode-master.zip
org-mode-master.tar.gz
Merge branch 'maint'HEADmaster
-rw-r--r--lisp/org-table.el7
1 files changed, 2 insertions, 5 deletions
diff --git a/lisp/org-table.el b/lisp/org-table.el
index ed2e835..af3f717 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -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))