Apply patch from John Gabriele to add some tweaks/fixes (thanks).


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1788 ea778897-0a13-0410-b9d1-a72fbfd435f5