diff --git a/lisp/org.el b/lisp/org.el index c0b9c1984..d07b61dcc 100755 --- a/lisp/org.el +++ b/lisp/org.el @@ -7762,9 +7762,7 @@ command." (insert "\n* "))) (run-hooks 'org-insert-heading-hook)) - ((and itemp (not (member arg '((4) (16))))) - ;; Insert an item - (org-insert-item)) + ((and itemp (not (member arg '((4) (16)))) (org-insert-item))) (t ;; Maybe move at the end of the subtree diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el index 3203dd952..cc06432c4 100644 --- a/testing/lisp/test-org.el +++ b/testing/lisp/test-org.el @@ -841,6 +841,36 @@ (let ((org-M-RET-may-split-line '((default . nil)))) (org-insert-heading)) (buffer-string)))) + ;; When on a list, insert an item instead, unless called with an + ;; universal argument or if list is invisible. In this case, create + ;; a new headline after contents. + (should + (equal "* H\n- item\n- " + (org-test-with-temp-text "* H\n- item" + (let ((org-insert-heading-respect-content nil)) + (org-insert-heading)) + (buffer-string)))) + (should + (equal "* H\n- item\n- item 2\n* " + (org-test-with-temp-text "* H\n- item\n- item 2" + (let ((org-insert-heading-respect-content nil)) + (org-insert-heading '(4))) + (buffer-string)))) + (should + (equal "* H\n- item\n* " + (org-test-with-temp-text "* H\n- item" + (org-cycle) + (goto-char (point-max)) + (let ((org-insert-heading-respect-content nil)) (org-insert-heading)) + (buffer-string)))) + ;; When called with two universal arguments, insert a new headline + ;; at the end of the grandparent subtree. + (should + (equal "* H1\n** H3\n- item\n** H2\n** " + (org-test-with-temp-text "* H1\n** H3\n- item\n** H2" + (let ((org-insert-heading-respect-content nil)) + (org-insert-heading '(16))) + (buffer-string)))) ;; Corner case: correctly insert a headline after an empty one. (should (equal "* \n* "