Fix zenroom2 function case

There's another pull request for this, however, it also includes many other changes. Messages seen under vim >= 7.4.