<p>I didn't review the proposed changes thoroughly, but maybe you could make it a commit on top of this PR?  Or we merge or drop this one, and you open a new one with the revamped version?</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/geany/geany/pull/1087#issuecomment-228754281">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe/ABDrJ54SW-dsnyvhKDBVhhC6EfmTGpAgks5qP9fjgaJpZM4I9TLT">mute the thread</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABDrJ2wPKu6wIMtDzLr8KhP6CAx5OxLmks5qP9fjgaJpZM4I9TLT.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
  <link itemprop="url" href="https://github.com/geany/geany/pull/1087#issuecomment-228754281"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>