diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-11-15 22:47:06 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-11-15 22:47:06 +0100 |
commit | 946f76d7070f8fbcf5c1072b7f53cea599f2e110 (patch) | |
tree | cc5f03c64dc92c7c0b07c457216dbf334c8dd334 | |
parent | 696ec60341b6f8190b92dae9a3cee940830a5f21 (diff) |
org-table: Better fix for `:org-untouchable'release_9.1.3
* lisp/org-table.el (org-table-recalculate): Fix typo in existing
`remove-text-properties' call instead of adding a new one.
Also, cleaning property before processing formulas is more robust,
e.g., if last process raised an error.
-rw-r--r-- | lisp/org-table.el | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lisp/org-table.el b/lisp/org-table.el index b4c72a436..d51750fc0 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -3242,7 +3242,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) @@ -3270,9 +3270,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)) @@ -3294,7 +3292,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)) |