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