Merge branch 'maint'

Conflicts: lisp/org.el
2014-04-22 11:18:58 +02:00 · 2014-04-22 11:18:58 +02:00 · 38ffaf061e
parent f588f6d884 fdb4b54e92
commit 38ffaf061e
1 changed files with 1 additions and 1 deletions
--- a/lisp/org.el
+++ b/lisp/org.el
@ -7744,7 +7744,7 @@ command."
 	       pos hide-previous previous-pos)

 	  ;; If we insert after content, move there and clean up whitespace
-	  (when respect-content
+	  (when (and respect-content (not (org-on-heading-p)))
 	    (org-end-of-subtree nil t)
 	    (skip-chars-backward " \r\n")
 	    (and (not (looking-back "^\\*+"))