0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 19:07:52 +00:00

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2016-08-29 00:45:07 +02:00
commit a9aad1c8e1
2 changed files with 29 additions and 2 deletions

View file

@ -3194,8 +3194,8 @@ existing formula for column %s"
(re-search-forward org-table-hline-regexp end t)
(re-search-forward org-table-dataline-regexp end t))
(setq beg (match-beginning 0)))
;; Just leave BEG where it is.
(t (setq beg (line-beginning-position)))))
;; Just leave BEG at the start of the table.
(t nil)))
(setq beg (line-beginning-position)
end (copy-marker (line-beginning-position 2))))
(goto-char beg)

View file

@ -2009,6 +2009,33 @@ is t, then new columns should be added as needed"
| 4 | too large |
#+TBLFM: $2 = '(orgtbl-ascii-draw $1 0 3 3 \"$-\")")))
(ert-deftest test-org-table/single-rowgroup ()
"Test column formula in a table with a single rowgroup."
(should
(equal
"
|---+---|
| 1 | 0 |
|---+---|
#+TBLFM: $2=$1-1"
(org-test-with-temp-text "
|---+---|
| 1 | |
|---+---|
<point>#+TBLFM: $2=$1-1"
(org-table-calc-current-TBLFM)
(buffer-string))))
(should
(equal
"
| 1 | 0 |
#+TBLFM: $2=$1-1"
(org-test-with-temp-text "
| 1 | |
<point>#+TBLFM: $2=$1-1"
(org-table-calc-current-TBLFM)
(buffer-string)))))
(provide 'test-org-table)