Sorry, but I'm unable to tell what's wrong from the provided

information.

Since Emacs starts fine from 'emacs -Q', you could try to track down

which part of your initialization file is causing the error.

Either way, if you've found that the error stems from commit 6aa04a5,

I think that it deserves it's own bug ticket instead of discussing it

here, since it's unrelated to bug #21488.

When you report it, I think it would be good to include a backtrace to

make it easier to track down the cause of the error.

-- Simen