Updated patch by Roland Eggner

posted at https://groups.google.com/d/msg/vim_dev/Ntoa2ZMXwfo/JEXXLMVWwkoJ
Thanks!