Merge branch 'maint'

2015-08-11 14:13:46 +02:00 · 2015-08-11 14:13:46 +02:00 · 4a7b2c5072
parent a0c634ba3c 9bb87f49f7
commit 4a7b2c5072
1 changed files with 7 additions and 4 deletions
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@ -2550,10 +2550,13 @@ With optional prefix argument ALL, do this for the whole buffer."
 			   (when (eq (org-element-type element) 'item)
 			     (push (org-element-property :structure element)
 				   structs)
-			     (goto-char (org-element-property
-					 :end
-					 (org-element-property :parent
-							       element))))))
+			     ;; Skip whole list since we have its
+			     ;; structure anyway.
+			     (while (setq element (org-element-lineage
+						   element '(plain-list)))
+			       (goto-char
+				(min (org-element-property :end element)
+				     end))))))
 		       ;; Cache count for cookies applying to the same
 		       ;; area.  Then return it.
 		       (let ((count