Merge branch 'master' of orgmode.org:org-mode

lisp/org-list.el

@@ -516,18 +516,19 @@ are boundaries and CONTEXT is a symbol among `drawer', `block',
 
 Contexts `block' and `invalid' refer to `org-list-forbidden-blocks'."
   (save-match-data
-    (org-with-limited-levels
+    (save-excursion
       (beginning-of-line)
       (let* ((case-fold-search t) (pos (point)) beg end
 	     ;; Compute position of surrounding headings. This is the
 	     ;; default context.
 	     (heading
+	      (org-with-limited-levels
 	       (save-excursion
 		 (list (or (and (org-at-heading-p) (point-at-bol))
 			   (outline-previous-heading)
 			   (point-min))
 		       (or (outline-next-heading) (point-max))
-		     nil)))
+		       nil))))
 	     (prev-head (car heading))
 	     (next-head (nth 1 heading))
 	     ;; Is point inside a drawer?