From dfbefc803e8ec8768d170609bbbdaad9fd6cba7f Mon Sep 17 00:00:00 2001 From: Sup Yut Sum Date: Mon, 2 Jun 2014 12:13:25 +0800 Subject: userdiff: support Java try keyword try keyword is enhanced in Java 7, see try-with-resources Statement try (XX yy = new XX()) { } catch (Exception e){ } Signed-off-by: Sup Yut Sum Signed-off-by: Junio C Hamano --- userdiff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userdiff.c b/userdiff.c index 96eda6c2be..49e898bc8a 100644 --- a/userdiff.c +++ b/userdiff.c @@ -39,7 +39,7 @@ IPATTERN("fortran", PATTERNS("html", "^[ \t]*(<[Hh][1-6][ \t].*>.*)$", "[^<>= \t]+"), PATTERNS("java", - "!^[ \t]*(catch|do|for|if|instanceof|new|return|switch|throw|while)\n" + "!^[ \t]*(try|catch|do|for|if|instanceof|new|return|switch|throw|while)\n" "^[ \t]*(([A-Za-z_][A-Za-z_0-9]*[ \t]+)+[A-Za-z_][A-Za-z_0-9]*[ \t]*\\([^;]*)$", /* -- */ "[a-zA-Z_][a-zA-Z0-9_]*" -- cgit v1.2.1