When will the defined-or patch be part of the main source?

It *is* part of the main source. But only in the development track, so if you want to run 'patch' only 0 times, you have to wait till 5.10.

Abigail