Thanks a lot!  I'll wait for approval before pushing it.

On 2016-12-01 16:29, Davor Rotim wrote:
> I think "conditionally disabled" is a better choice since it implies it
> should be disabled in the first place.
> I hope the attached patch is correct (emacs-25 branch).
> 
> Thanks,
> Davor Rotim
>