neovim/neovim — pull request #1236 by atwupack (2014-09-24 19:12:54+00:00)
Title: 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.