Tweak ordering and whitespace.
Add missing va_end, from Thomas Jarosch.
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code