Fix newline substitution: Adapt to upstream patch.

Fix previous changes to be compatible with agreed changes to upstream
vim (https://code.google.com/p/vim/issues/detail?id=287).
Merge pull request #1596 from elmart/fix-newline-subst

Fix newline substitution: Adapt to upstream patch.