bug#22469: org-mode export fail

[Phillip Lord]

Kyle Meyer <kyle@kyleam.com> writes:

> Hi Phil
>
> phillip.lord@russet.org.uk (Phillip Lord) writes:
>
>> I am seeing this error from org-mode when trying to export to HTML. The
>> main org file has an include line like so:
>
> [...]
>
>> Debugger entered--Lisp error: (wrong-type-argument stringp nil)
>>   file-exists-p(nil)
>>   org-check-agenda-file(nil)
>>   org-agenda-prepare-buffers((nil))
>>   org-map-entries(#[nil "\300\301 !\207" [org-reduced-level
>> org-current-level] 2])
>
> This should be fixed on the Org side as of 44c8cd7 (2015-08-10):
>
>     org-map-entries: Fix org-agenda-prepare-buffers call
>     
>     * lisp/org.el (org-map-entries): Check that buffer-file-name is non-nil
>       before passing to org-agenda-prepare-buffers.
>     
>     Like 11e8749, this surfaced as an error when 05efa7a ("Backport commit
>     3a5f751 from Emacs master branch", 2015-08-08) replaced a
>     '(while (setq VAR (pop LIST)) BODY)' with '(dolist (VAR LIST) BODY)',
>     resulting in the body being executed when '(nil)' was passed to
>     org-agenda-prepare-buffers.

Okay. What's the best way to get this fix onto the release branch?

Phil