Surround word also surrounds space

[Melker Ulander]

For example, if I have the following (where | is the cursor):

|foo bar

and then type ysw)

I get the following:

|(foo )bar

This clearly is unwanted behaviour.