Branch: refs/heads/master Home: https://github.com/geany/geany

Commit: a00366b266cac650134370103f5b3b5d3a08a700 https://github.com/geany/geany/commit/a00366b266cac650134370103f5b3b5d3a08a7... Author: Colomban Wendling ban@herbesfolles.org Date: 2011-11-11 (Fri, 11 Nov 2011)

Changed paths: M HACKING

Log Message: ----------- Update HACKING for highlighting setup refactoring

Commit: e53d5b82992550921451d30487b1a426477338f5 https://github.com/geany/geany/commit/e53d5b82992550921451d30487b1a426477338... Author: Colomban Wendling ban@herbesfolles.org Date: 2011-11-12 (Sat, 12 Nov 2011)

Changed paths: M HACKING M data/filetypes.html M data/filetypes.php M data/filetypes.xml M src/Makefile.am M src/highlighting.c A src/highlightingmappings.h

Log Message: ----------- Merge branch 'highlighting-rewrite'

Commit: 8942bc810bc2091581027ea578717cf1d8342af1 https://github.com/geany/geany/commit/8942bc810bc2091581027ea578717cf1d8342a... Author: Colomban Wendling ban@herbesfolles.org Date: 2011-11-12 (Sat, 12 Nov 2011)

Changed paths: M data/filetype_extensions.conf A data/filetypes.objectivec M src/document.c M src/filetypes.c M src/filetypes.h M src/highlighting.c M src/highlightingmappings.h M tagmanager/Makefile.am M tagmanager/makefile.win32 A tagmanager/objc.c M tagmanager/parsers.h M wscript

Log Message: ----------- Add Objective-C support

Based on a patch from Elias Pschernig, thanks. Parser was taken from upstream CTags.

Closes patch#3325139.

Compare: https://github.com/geany/geany/compare/9bffb94...8942bc8