Finally reindent with the cl indentation behavior of 24.4.50.
It have font-lock broken in some place but is not broken as in 24.3.90.
So perhaps it is the best option for now.