ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-10-18 22:49:10 +02:00
parent 52d4ca4b29 8c5c030c64
commit cd9cccb4b2
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/org.el
View File

@ -7938,8 +7938,7 @@ unchecked check box."
(org-insert-heading (or (and (equal arg '(16)) '(16)) (org-insert-heading (or (and (equal arg '(16)) '(16))
force-heading)) force-heading))
(save-excursion (save-excursion
(org-back-to-heading) (org-forward-heading-same-level -1)
(outline-previous-heading)
(let ((case-fold-search nil)) (looking-at org-todo-line-regexp))) (let ((case-fold-search nil)) (looking-at org-todo-line-regexp)))
(let* ((new-mark-x (let* ((new-mark-x
(if (or (equal arg '(4)) (if (or (equal arg '(4))

7
testing/lisp/test-org.el
View File

@ -1415,6 +1415,13 @@
"* TODO \n" "* TODO \n"
(org-test-with-temp-text "* H\n- an item\n- another one" (org-test-with-temp-text "* H\n- an item\n- another one"
(search-forward "an ") (search-forward "an ")
(org-insert-todo-heading-respect-content)
(buffer-substring-no-properties (line-beginning-position) (point-max)))))
;; Use the same TODO keyword as current heading.
(should
(equal
"* TODO \n"
(org-test-with-temp-text "* TODO\n** WAITING\n"
(org-insert-todo-heading-respect-content) (org-insert-todo-heading-respect-content)
(buffer-substring-no-properties (line-beginning-position) (point-max)))))) (buffer-substring-no-properties (line-beginning-position) (point-max))))))