Fix level of newly inserted headlines

* lisp/org.el (org-insert-heading): Fix level of new headline when
  creating it from a regular text line.

* testing/lisp/test-org.el (test-org/insert-heading): Add tests.

Reported-by: swflint@flintfam.org (Samuel W. Flint)
<http://permalink.gmane.org/gmane.emacs.orgmode/110842>

2 files changed, 64 insertions, 49 deletions

diff --git a/lisp/org.el b/lisp/org.el
index 0baf5ed..e5c2230 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -7938,69 +7938,67 @@ command.
 When optional argument TOP is non-nil, insert a level 1 heading,
 unconditionally."
   (interactive "P")
-  (let ((blank? (org--blank-before-heading-p (equal arg '(16)))))
+  (let* ((blank? (org--blank-before-heading-p (equal arg '(16))))
+	 (level (org-current-level))
+	 (stars (make-string (if (and level (not top)) level 1) ?*)))
     (cond
      ((or org-insert-heading-respect-content
 	  (member arg '((4) (16)))
 	  (and (not invisible-ok)
 	       (invisible-p (max (1- (point)) (point-min)))))
-      (let ((level (org-current-level)))
-        ;; Position point at the location of insertion.
-	(if (not level)			;before first headline
-	    (org-with-limited-levels (outline-next-heading))
-	  ;; Make sure we end up on a visible headline if INVISIBLE-OK
-	  ;; is nil.
-	  (org-with-limited-levels (org-back-to-heading invisible-ok))
-	  (cond ((equal arg '(16))
-		 (org-up-heading-safe)
-		 (org-end-of-subtree t t))
-		(t
-		 (org-end-of-subtree t t))))
-        (unless (bolp) (insert "\n"))   ;ensure final newline
-        (unless (and blank? (org-previous-line-empty-p))
-          (org-N-empty-lines-before-current (if blank? 1 0)))
-        (insert (make-string (if (and level (not top)) level 1) ?*) " \n")
-        (forward-char -1)))
+      ;; Position point at the location of insertion.
+      (if (not level)			;before first headline
+	  (org-with-limited-levels (outline-next-heading))
+	;; Make sure we end up on a visible headline if INVISIBLE-OK
+	;; is nil.
+	(org-with-limited-levels (org-back-to-heading invisible-ok))
+	(cond ((equal arg '(16))
+	       (org-up-heading-safe)
+	       (org-end-of-subtree t t))
+	      (t
+	       (org-end-of-subtree t t))))
+      (unless (bolp) (insert "\n"))   ;ensure final newline
+      (unless (and blank? (org-previous-line-empty-p))
+	(org-N-empty-lines-before-current (if blank? 1 0)))
+      (insert stars " \n")
+      (forward-char -1))
      ;; At a headline...
      ((org-at-heading-p)
-      (let ((level (if top 1 (org-current-level))))
-        (cond ((bolp)
-               (when blank? (save-excursion (insert "\n")))
-               (save-excursion (insert (make-string level ?*) " \n"))
-               (unless (and blank? (org-previous-line-empty-p))
-                 (org-N-empty-lines-before-current (if blank? 1 0)))
-               (end-of-line))
-              ((and (org-get-alist-option org-M-RET-may-split-line 'headline)
-                    (save-excursion
-                      (beginning-of-line)
-                      (looking-at org-complex-heading-regexp))
-                    (org-pos-in-match-range (point) 4))
-               ;; Grab the text that should moved to the new headline.
-               ;; Preserve tags.
-               (let ((split (delete-and-extract-region (point) (match-end 4))))
-                 (if (looking-at "[ \t]*$") (replace-match "")
-                   (org-set-tags nil t))
-                 (end-of-line)
-                 (when blank? (insert "\n"))
-                 (insert "\n" (make-string level ?*) " ")
-                 (when (org-string-nw-p split) (insert split))
-                 (insert "\n")
-                 (forward-char -1)))
-              (t
-               (end-of-line)
-               (when blank? (insert "\n"))
-               (insert "\n" (make-string level ?*) " \n")
-               (forward-char -1)))))
+      (cond ((bolp)
+	     (when blank? (save-excursion (insert "\n")))
+	     (save-excursion (insert stars " \n"))
+	     (unless (and blank? (org-previous-line-empty-p))
+	       (org-N-empty-lines-before-current (if blank? 1 0)))
+	     (end-of-line))
+	    ((and (org-get-alist-option org-M-RET-may-split-line 'headline)
+		  (org-match-line org-complex-heading-regexp)
+		  (org-pos-in-match-range (point) 4))
+	     ;; Grab the text that should moved to the new headline.
+	     ;; Preserve tags.
+	     (let ((split (delete-and-extract-region (point) (match-end 4))))
+	       (if (looking-at "[ \t]*$") (replace-match "")
+		 (org-set-tags nil t))
+	       (end-of-line)
+	       (when blank? (insert "\n"))
+	       (insert "\n" stars " ")
+	       (when (org-string-nw-p split) (insert split))
+	       (insert "\n")
+	       (forward-char -1)))
+	    (t
+	     (end-of-line)
+	     (when blank? (insert "\n"))
+	     (insert "\n" stars " \n")
+	     (forward-char -1))))
      ;; On regular text, turn line into a headline or split, if
      ;; appropriate.
      ((bolp)
-      (insert "* ")
+      (insert stars " ")
       (unless (and blank? (org-previous-line-empty-p))
         (org-N-empty-lines-before-current (if blank? 1 0))))
      (t
       (unless (org-get-alist-option org-M-RET-may-split-line 'headline)
         (end-of-line))
-      (insert "\n* ")
+      (insert "\n" stars " ")
       (unless (and blank? (org-previous-line-empty-p))
         (org-N-empty-lines-before-current (if blank? 1 0))))))
   (run-hooks 'org-insert-heading-hook))
diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el
index 5e850bf..61e92de 100644
--- a/testing/lisp/test-org.el
+++ b/testing/lisp/test-org.el
@@ -1154,7 +1154,7 @@
 	  (org-test-with-temp-text ""
 	    (org-insert-heading)
 	    (buffer-string))))
-  ;; At the beginning of a line, turn it into a headline
+  ;; At the beginning of a line, turn it into a headline.
   (should
    (equal "* P"
 	  (org-test-with-temp-text "<point>P"
@@ -1213,6 +1213,23 @@
 	    (let ((org-M-RET-may-split-line '((headline . t))))
 	      (org-insert-heading))
 	    (buffer-string))))
+  ;; New headline level depends on the level of the headline above.
+  (should
+   (equal "** H\n** P"
+	  (org-test-with-temp-text "** H\n<point>P"
+	    (org-insert-heading)
+	    (buffer-string))))
+  (should
+   (equal "** H\nPara\n** graph"
+	  (org-test-with-temp-text "** H\nPara<point>graph"
+	    (let ((org-M-RET-may-split-line '((default . t))))
+	      (org-insert-heading))
+	    (buffer-string))))
+  (should
+   (equal "** \n** H"
+	  (org-test-with-temp-text "** H"
+	    (org-insert-heading)
+	    (buffer-string))))
   ;; When called with one universal argument, insert a new headline at
   ;; the end of the current subtree, independently on the position of
   ;; point.