Previous patch was incomplete and only introduced the new feature on one 
of the major-modes.

This latest patch introduces it on both and should be good.

--
Jostein