<p>Finally^2 (If we continue with this speed, we might have it merged around the time we are retired ;-)</p>
<p>I resolved the merge conflicts by merging master into this branch. It might not be clear what exactly I did, so:</p>
<ol>
<li>The lcpp problem</li>
</ol>
<p><a class="commit-link" href="https://github.com/geany/geany/commit/6f692112e39fa0714d882332b8f935419fd69a27#diff-4ff0e4c5d80fdb5e2e0e3f4352cfbb87"><tt>6f69211</tt>#diff-4ff0e4c5d80fdb5e2e0e3f4352cfbb87</a></p>
<p>seemed to be fixed upstream so I kept the version from this pull request and discarded your patch.</p>
<ol start="2">
<li>I kept the fix from</li>
</ol>
<p><a class="commit-link" href="https://github.com/geany/geany/commit/63850b3eb7302b6ce1c4223581be7687dc231a11#diff-dea5ae7be33b3111ef5fc7a75dde7cbd"><tt>63850b3</tt>#diff-dea5ae7be33b3111ef5fc7a75dde7cbd</a></p>
<p>in parse.c - I didn't find this function in current ctags master so this code will probably be removed in the future ctags sync.</p>
<ol start="3">
<li>I added the unsigned from</li>
</ol>
<p><a class="commit-link" href="https://github.com/geany/geany/commit/dbd0573dd6a5175ec9b536c4053bb66caac0f665#diff-dea5ae7be33b3111ef5fc7a75dde7cbd"><tt>dbd0573</tt>#diff-dea5ae7be33b3111ef5fc7a75dde7cbd</a></p>
<p>to the corresponding function where this code is now.</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/1263#issuecomment-429539387">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABDrJ-ng537P7hI5Re-VSTL66iulAg8jks5ukeGmgaJpZM4KXvBh">mute the thread</a>.<img src="https://github.com/notifications/beacon/ABDrJ2T0pIILiyN74o2KELRtv2mWFVxpks5ukeGmgaJpZM4KXvBh.gif" height="1" width="1" alt="" /></p>
<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/geany/geany","title":"geany/geany","subtitle":"GitHub repository","main_image_url":"https://assets-cdn.github.com/images/email/message_cards/header.png","avatar_image_url":"https://assets-cdn.github.com/images/email/message_cards/avatar.png","action":{"name":"Open in GitHub","url":"https://github.com/geany/geany"}},"updates":{"snippets":[{"icon":"PERSON","message":"@techee in #1263: Finally^2 (If we continue with this speed, we might have it merged around the time we are retired ;-)\r\n\r\nI resolved the merge conflicts by merging master into this branch. It might not be clear what exactly I did, so:\r\n\r\n1. The lcpp problem\r\n\r\nhttps://github.com/geany/geany/commit/6f692112e39fa0714d882332b8f935419fd69a27#diff-4ff0e4c5d80fdb5e2e0e3f4352cfbb87\r\n\r\nseemed to be fixed upstream so I kept the version from this pull request and discarded your patch.\r\n\r\n2. I kept the fix from\r\n\r\nhttps://github.com/geany/geany/commit/63850b3eb7302b6ce1c4223581be7687dc231a11#diff-dea5ae7be33b3111ef5fc7a75dde7cbd\r\n\r\nin parse.c - I didn't find this function in current ctags master so this code will probably be removed in the future ctags sync.\r\n\r\n3. I added the unsigned from\r\n\r\nhttps://github.com/geany/geany/commit/dbd0573dd6a5175ec9b536c4053bb66caac0f665#diff-dea5ae7be33b3111ef5fc7a75dde7cbd\r\n\r\nto the corresponding function where this code is now."}],"action":{"name":"View Pull Request","url":"https://github.com/geany/geany/pull/1263#issuecomment-429539387"}}}</script>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/geany/geany/pull/1263#issuecomment-429539387",
"url": "https://github.com/geany/geany/pull/1263#issuecomment-429539387",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
},
{
"@type": "MessageCard",
"@context": "http://schema.org/extensions",
"hideOriginalBody": "false",
"originator": "AF6C5A86-E920-430C-9C59-A73278B5EFEB",
"title": "Re: [geany/geany] Sync ctags main part (#1263)",
"sections": [
{
"text": "",
"activityTitle": "**Jiří Techet**",
"activityImage": "https://assets-cdn.github.com/images/email/message_cards/avatar.png",
"activitySubtitle": "@techee",
"facts": [

]
}
],
"potentialAction": [
{
"name": "Add a comment",
"@type": "ActionCard",
"inputs": [
{
"isMultiLine": true,
"@type": "TextInput",
"id": "IssueComment",
"isRequired": false
}
],
"actions": [
{
"name": "Comment",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"IssueComment\",\n\"repositoryFullName\": \"geany/geany\",\n\"issueId\": 1263,\n\"IssueComment\": \"{{IssueComment.value}}\"\n}"
}
]
},
{
"name": "Close pull request",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"PullRequestClose\",\n\"repositoryFullName\": \"geany/geany\",\n\"pullRequestId\": 1263\n}"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/geany/geany/pull/1263#issuecomment-429539387"
}
],
"@type": "OpenUri",
"name": "View on GitHub"
},
{
"name": "Unsubscribe",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"MuteNotification\",\n\"threadId\": 173994081\n}"
}
],
"themeColor": "26292E"
}
]</script>