Merge branch 'maint'

diff --cc lisp/org-agenda.el
index 74ce5fb,6309771..f3ffa8e
--- 1/lisp/org-agenda.el
--- 2/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@@ -6022,10 -5938,9 +6019,10 @@@ See also the user option `org-agenda-cl
                      warntime (get-text-property (point) 'org-appt-warntime)
                      category-pos (get-text-property (point) 'org-category-position))
                (if (not (re-search-backward "^\\*+[ \t]+" nil t))
-                   (setq txt org-agenda-no-heading-message)
+                   (throw :skip nil)
                  (goto-char (match-end 0))
                  (setq pos1 (match-beginning 0))
 +                (setq level (make-string (org-reduced-level (org-outline-level)) ? ))
                  (setq inherited-tags
                        (or (eq org-agenda-show-inherited-tags 'always)
                            (and (listp org-agenda-show-inherited-tags)