mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Bastien 2020-02-04 19:09:55 +01:00
parent 04cb76571d 6671e41e40
commit 6ec3b993fd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/org-capture.el
View File

@ -238,15 +238,15 @@ properties are:
:jump-to-captured When set, jump to the captured entry when finished.
:empty-lines Set this to the number of lines the should be inserted
:empty-lines Set this to the number of lines that should be inserted
before and after the new item. Default 0, only common
other value is 1.
:empty-lines-before Set this to the number of lines the should be inserted
:empty-lines-before Set this to the number of lines that should be inserted
before the new item. Overrides :empty-lines for the
number lines inserted before.
:empty-lines-after Set this to the number of lines the should be inserted
:empty-lines-after Set this to the number of lines that should be inserted
after the new item. Overrides :empty-lines for the
number of lines inserted after.

2
testing/lisp/test-org-capture.el
View File

@ -197,7 +197,7 @@
(org-capture-kill))
(buffer-string)))))
(ert-deftest test-org-caputre/entry ()
(ert-deftest test-org-capture/entry ()
"Test `entry' type in capture template."
;; Do not break next headline.
(should