Merge branch 'jc/diff-algo-attribute'

[thirdparty/git.git] / userdiff.c

diff --git a/userdiff.c b/userdiff.c
index 8719a5111cb77c94d9d4ae80924831c0c9a42aaf..58a3d59ef8f471b9c6ffc34cad10e56689c3354c 100644 (file)
--- a/userdiff.c
+++ b/userdiff.c
@@ -170,8 +170,8 @@ PATTERNS("html",
         "[^<>= \t]+"),
 PATTERNS("java",
         "!^[ \t]*(catch|do|for|if|instanceof|new|return|switch|throw|while)\n"
-        /* Class, enum, and interface declarations */
-        "^[ \t]*(([a-z]+[ \t]+)*(class|enum|interface)[ \t]+[A-Za-z][A-Za-z0-9_$]*[ \t]+.*)$\n"
+        /* Class, enum, interface, and record declarations */
+        "^[ \t]*(([a-z-]+[ \t]+)*(class|enum|interface|record)[ \t]+.*)$\n"
         /* Method definitions; note that constructor signatures are not */
         /* matched because they are indistinguishable from method calls. */
         "^[ \t]*(([A-Za-z_<>&][][?&<>.,A-Za-z_0-9]*[ \t]+)+[A-Za-z_][A-Za-z_0-9]*[ \t]*\\([^;]*)$",
@@ -315,7 +315,8 @@ struct find_by_namelen_data {
 };
 
 static int userdiff_find_by_namelen_cb(struct userdiff_driver *driver,
-                                      enum userdiff_driver_type type, void *priv)
+                                      enum userdiff_driver_type type UNUSED,
+                                      void *priv)
 {
        struct find_by_namelen_data *cb_data = priv;
 
@@ -414,7 +415,7 @@ struct userdiff_driver *userdiff_find_by_path(struct index_state *istate,
                check = attr_check_initl("diff", NULL);
        if (!path)
                return NULL;
-       git_check_attr(istate, path, check);
+       git_check_attr(istate, NULL, path, check);
 
        if (ATTR_TRUE(check->items[0].value))
                return &driver_true;