diff options
| author | Bastien Guerry <bzg@altern.org> | 2014-04-22 11:18:58 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2014-04-22 11:18:58 +0200 |
| commit | 38ffaf061e2ea343d9e5d87c3628acfa28a2ca2a (patch) | |
| tree | cc908bb240be817f992820e33f2c47ea3a022b9a | |
| parent | f588f6d88476b7941c64b3e3099138cd5d334132 (diff) | |
| parent | fdb4b54e92aff9bbe7fec6209813af17a14eb876 (diff) | |
| download | org-mode-38ffaf061e2ea343d9e5d87c3628acfa28a2ca2a.tar.gz | |
Merge branch 'maint'
Conflicts:
lisp/org.el
| -rw-r--r-- | lisp/org.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org.el b/lisp/org.el index 635512b..5d201ea 100644 --- 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 "^\\*+")) |