Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-12-04 21:37:18 +01:00
commit 9534b159e8
2 changed files with 18 additions and 1 deletions

View File

@ -2722,7 +2722,9 @@ not overwrite the stored one."
(setq orig (or (get-text-property 1 :orig-formula formula) "?"))
(while (> ndown 0)
(setq fields (org-split-string
(buffer-substring-no-properties (point-at-bol) (point-at-eol))
(org-trim
(buffer-substring-no-properties
(line-beginning-position) (line-end-position)))
" *| *"))
;; replace fields with duration values if relevant
(if duration

View File

@ -1820,6 +1820,21 @@ is t, then new columns should be added as needed"
(org-table-calc-current-TBLFM)
(buffer-string)))))
(ert-deftest test-org-table/tab-indent ()
"Test named fields with tab indentation."
(should
(org-string-match-p
"| # | 111 |"
(org-test-with-temp-text
"
| ! | sum | | a | b | c |
|---+------+------+---+----+-----|
| # | 1011 | 1000 | 1 | 10 | 100 |
<point>#+TBLFM: $2=$a+$b+$c
"
(org-table-calc-current-TBLFM)
(buffer-string)))))
(provide 'test-org-table)
;;; test-org-table.el ends here