[Github-comments] [geany/geany] Sync ctags main part (#1263)

[Jiří Techet]

Finally^2 (If we continue with this speed, we might have it merged around the time we are retired ;-)

I resolved the merge conflicts by merging master into this branch. It might not be clear what exactly I did, so:

1. The lcpp problem

https://github.com/geany/geany/commit/6f692112e39fa0714d882332b8f935419fd69a27#diff-4ff0e4c5d80fdb5e2e0e3f4352cfbb87

seemed to be fixed upstream so I kept the version from this pull request and discarded your patch.

2. I kept the fix from

https://github.com/geany/geany/commit/63850b3eb7302b6ce1c4223581be7687dc231a11#diff-dea5ae7be33b3111ef5fc7a75dde7cbd

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.

3. I added the unsigned from

https://github.com/geany/geany/commit/dbd0573dd6a5175ec9b536c4053bb66caac0f665#diff-dea5ae7be33b3111ef5fc7a75dde7cbd

to the corresponding function where this code is now.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/1263#issuecomment-429539387
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.geany.org/pipermail/github-comments/attachments/20181013/e87e24c8/attachment-0001.html>