]> asedeno.scripts.mit.edu Git - git.git/commitdiff
xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines
authorPetr Baudis <pasky@suse.cz>
Wed, 25 Oct 2006 00:28:55 +0000 (02:28 +0200)
committerJunio C Hamano <junkio@cox.net>
Wed, 25 Oct 2006 19:57:33 +0000 (12:57 -0700)
This removes the '#' and '(' tests and adds a '$' test instead although I have
no idea what it is actually good for - but hey, if that's what GNU diff does...

Pasky only went and did as Junio sayeth.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
xdiff/xemit.c

index 154c26fdcdbef9095e254d7b469daf11c5653a04..07995ec33e9079cbbb579947e55fe46c1521d28f 100644 (file)
@@ -86,8 +86,7 @@ static void xdl_find_func(xdfile_t *xf, long i, char *buf, long sz, long *ll) {
                if (len > 0 &&
                    (isalpha((unsigned char)*rec) || /* identifier? */
                     *rec == '_' ||     /* also identifier? */
-                    *rec == '(' ||     /* lisp defun? */
-                    *rec == '#')) {    /* #define? */
+                    *rec == '$')) {    /* mysterious GNU diff's invention */
                        if (len > sz)
                                len = sz;
                        while (0 < len && isspace((unsigned char)rec[len - 1]))