summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2011-07-24 20:44:01 +0200
committerBastien Guerry <bzg@altern.org>2011-07-24 20:44:01 +0200
commitcb973614bd3fb106acf69d4514e09a783bcaf0a2 (patch)
tree8ebc6860f58e911b374b979d0fd028b48a1e53f5
parent53da4c15a9077c0487fb5ddba4158e40356758fe (diff)
parentba092ec08d3a7b3fe3cd1b617a1b6c297382fd4d (diff)
downloadorg-mode-cb973614bd3fb106acf69d4514e09a783bcaf0a2.tar.gz
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r--lisp/org-exp.el2
-rw-r--r--lisp/org-list.el3
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 8628d1f..3e7e54b 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -1786,6 +1786,7 @@ These special cookies will later be interpreted by the backend."
(top-ind (org-list-get-ind top struct)))
(goto-char bottom)
(when (and (not (eq org-list-ending-method 'indent))
+ (not (looking-at "[ \t]*$"))
(looking-at org-list-end-re))
(replace-match ""))
(unless (bolp) (insert "\n"))
@@ -1844,6 +1845,7 @@ These special properties will later be interpreted by the backend."
(goto-char bottom)
(when (or (looking-at "^ORG-LIST-END-MARKER\n")
(and (not (eq org-list-ending-method 'indent))
+ (not (looking-at "[ \t]*$"))
(looking-at org-list-end-re)))
(replace-match ""))
(unless (bolp) (insert "\n"))
diff --git a/lisp/org-list.el b/lisp/org-list.el
index e7f3ec2..7c9ef01 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -2897,8 +2897,9 @@ Point is left at list end."
(when delete
(delete-region top bottom)
(when (and (not (eq org-list-ending-method 'indent))
+ (not (looking-at "[ \t]*$"))
(looking-at org-list-end-re))
- (replace-match "\n")))
+ (replace-match "")))
out))
(defun org-list-make-subtree ()