mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 18:36:26 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Nicolas Goaziou 2019-04-13 09:43:32 +02:00
parent 09a1a24b73 222408d70a
commit ab311b85ae
2 changed files with 141 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/org-table.el
View file

@ -2778,6 +2778,7 @@ known that the table will be realigned a little later anyway."
beg end eqlcol eqlfield)
;; Insert constants in all formulas.
(when eqlist
(org-table-with-shrunk-columns
(org-table-save-field
;; Expand equations, then split the equation list between
;; column formulas and field formulas.
@ -2907,10 +2908,10 @@ existing formula for column %s"
"Out-of-bounds formula. Add columns? "))
(user-error
"Missing columns in the table. Aborting"))))))
(org-table-eval-formula nil formula t t t t))))
(org-table-eval-formula nil formula t t t t)))
;; Clean up markers and internal text property.
(remove-text-properties (point-min) (point-max) '(org-untouchable t))
(set-marker end nil)
(remove-text-properties (point-min) (point-max) '(:org-untouchable t))
(set-marker end nil)))
(unless noalign
(when org-table-may-need-update (org-table-align))
(when all

9
testing/lisp/test-org-table.el
View file

@ -3025,7 +3025,14 @@ See also `test-org-table/copy-field'."
(org-table-toggle-column-width)
(org-table-align)
(mapcar (lambda (o) (overlay-get o 'help-echo))
(overlays-in (line-beginning-position) (line-end-position)))))))
(overlays-in (line-beginning-position) (line-end-position))))))
;; Recalculating formulas doesn't change shrunk state.
(should
(equal "2"
(org-test-with-temp-text "| 1 | <point>0 |\n#+TBLFM: $2=$1+1\n"
(org-table-toggle-column-width)
(org-table-recalculate)
(overlay-get (car (overlays-at (point))) 'help-echo)))))