Merge upstream Org (from commit 488eea)

[gnu-emacs] / lisp / org / org-list.el

diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index 10f5e6ec6a942ac20034e787394cb345c8787c60..993272aeb98c83e27a740ae234b7db7124ddf5c8 100644 (file)
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -1230,7 +1230,9 @@ some heuristics to guess the result."
             ;; Are there blank lines inside the list so far?
             ((save-excursion
                (goto-char (org-list-get-top-point struct))
-               (org-list-search-forward
+               ;; Do not use `org-list-search-forward' so blank lines
+               ;; in blocks can be counted in.
+               (re-search-forward
                 "^[ \t]*$" (org-list-get-item-end-before-blank item struct) t))
              1)
             ;; Default choice: no blank line.