Merge branch 'bugfix'

lisp/org-element.el

@@ -7708,7 +7708,8 @@ the cache."
                             ;; it to real beginning then despite
                             ;; START being larger.
                             (setq start nil)
-                            (move-start-to-next-match nil)
+                            (let ((data nil)) ; data may not be valid. ignore it.
+                              (move-start-to-next-match nil))
                             ;; The new element may now start before
                             ;; or at already processed position.
                             ;; Make sure that we continue from an

testing/lisp/test-org.el

@@ -2820,7 +2820,30 @@ SCHEDULED: <2014-03-04 tue.>"
                (beginning-of-line 2)
                (insert "test\n")
                (beginning-of-line -1)))
-            acc))))))
+            acc)))))
+  ;; Removing heading being processed.
+  (should
+   (equal
+    "Some text
+Some text
+Some more text
+Let’s stop here
+"
+    (org-test-with-temp-text
+        "* Heading 1
+Some text
+** Heading 1.1
+Some text
+* Heading 2
+Some more text
+** Heading 2.1
+Let’s stop here
+"
+      (org-map-entries
+       (lambda ()
+         (delete-region (point) (line-beginning-position 2))
+         (setq org-map-continue-from (point))))
+      (buffer-string)))))
 
 (ert-deftest test-org/edit-headline ()
   "Test `org-edit-headline' specifications."