Merge branch 'maint'

2014-03-17 01:42:42 +01:00 · 2014-03-17 01:42:42 +01:00 · 5289825cb2
parent c444e4ed38 afffe03dcf
commit 5289825cb2
1 changed files with 2 additions and 1 deletions
--- a/lisp/org.el
+++ b/lisp/org.el
@ -7714,7 +7714,8 @@ This is important for non-interactive uses of the command."
 	  (when respect-content
 	    (org-end-of-subtree nil t)
 	    (skip-chars-backward " \r\n")
-	    (and (looking-at "[ \t]+") (replace-match ""))
+	    (and (not (looking-back "^\*+"))
+		 (looking-at "[ \t]+") (replace-match ""))
 	    (unless (eobp) (forward-char 1))
 	    (when (looking-at "^\\*")
 	      (unless (bobp) (backward-char 1))