"J.P." <jp@neverwas.me> writes:

> I see two basic avenues of attack here. The first is a pretty safe
> stopgap and the second a slightly riskier comprehensive approach that
> should have been on the books the moment that bug was closed:
>
>   hack: partially revert a tiny hunk from the commit above
>
>   fix:  don't require goodies at all and instead update the module
>         mapping data and add all necessary autoloads and forward
>         declarations

Under "fix," I forgot to mention also couching any top-level `add-hook'
calls in module-setup and teardown functions. Of particular concern are
those that mutate user options. Attached is an addition to the (5.6
portion of the) patch set that does this for the Imenu integration.