@b4n If it's kind of alright, what should I do now - squash into a single commit or try to preserve the history and squash just the various fixes?
I'd like https://github.com/geany/geany/pull/3849/commits/d34a0a36e761cb2844ae50fface... (and its fix(es?)) be separate; for the rest it's your call. I'd keep the same separation as you initially did and squash the changes, but if it becomes too complicated you can also just squash the whole thing together but the commit above.