summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSup Yut Sum <ch3cooli@gmail.com>2014-06-02 12:13:25 +0800
committerJunio C Hamano <gitster@pobox.com>2014-06-02 12:31:38 -0700
commitdfbefc803e8ec8768d170609bbbdaad9fd6cba7f (patch)
tree46ef375fb8f029659917b8e77bb1e58a74f1584d
parent86954eaa0c9bb78309d77048ef5c86098d0a1d69 (diff)
downloadgit-ss/userdiff-update-csharp-java.tar.gz
userdiff: support Java try keywordss/userdiff-update-csharp-java
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 <ch3cooli@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--userdiff.c2
1 files changed, 1 insertions, 1 deletions
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_]*"