updated for version 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)
Added tag v7-4-391 for changeset f051e50a6a5f