summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--bin/hilex/c.l3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/hilex/c.l b/bin/hilex/c.l
index f7370b01..1c703814 100644
--- a/bin/hilex/c.l
+++ b/bin/hilex/c.l
@@ -42,7 +42,8 @@ width "*"|[0-9]+
 	BEGIN(pop = MacroDefine);
 	return Macro;
 }
-^[#%][[:blank:]]*{ident} {
+^[#%][[:blank:]]*{ident} |
+^"%"[%{}] {
 	BEGIN(pop = MacroLine);
 	return Macro;
 }
8-12shared: make cgit_diff_tree_cb publicJohn Keeping This will allow us to use this nice wrapper function elsewhere, avoiding dealing with the diff queue when we only need to inspect a filepair. Signed-off-by: John Keeping <john@keeping.me.uk> 2015-08-12t0110: Chain together using &&Jason A. Donenfeld 2015-08-12about: always ensure page has a trailing slashJason A. Donenfeld Otherwise we can't easily embed links to other /about/ pages. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2015-08-12filters: apply HTML escapingLazaros Koromilas http://www.w3.org/International/questions/qa-escapes#use 2015-08-12git: update to v2.5.0Christian Hesse Update to git version v2.5.0. * Upstream commit 5455ee0573a22bb793a7083d593ae1ace909cd4c (Merge branch 'bc/object-id') changed API: for_each_ref() callback functions were taught to name the objects not with "unsigned char sha1[20]" but with "struct object_id". * Upstream commit dcf692625ac569fefbe52269061230f4fde10e47 (path.c: make get_pathname() call sites return const char *) Signed-off-by: Christian Hesse <mail@eworm.de> 2015-08-12Fix processing of repo.hide and repo.ignoreDaniel Reichelt