[RFC] vim-patch:7.4.391

Problem:    No 'cursorline' highlighting when the cursor is on a line with
            diff highlighting. (Benjamin Fritz)
Solution:   Combine the highlight attributes. (Christian Brabandt)

https://code.google.com/p/vim/source/detail?r=v7-4-391

This contains the fix for issue #1233.