X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=xdiff%2Fxemit.c;h=e291dc7608c4ab9b54a5d049bf3b555704e37fe8;hb=4b22f634a3f1752d98e1fc5eee4fa7ce0efe157c;hp=714c563547462d962b4a6b69b524092e1bc2a036;hpb=3939b805f4147a97c08cc50ef7e53cd6c2490c5c;p=git.git

diff --git a/xdiff/xemit.c b/xdiff/xemit.c
index 714c56354..e291dc760 100644
--- a/xdiff/xemit.c
+++ b/xdiff/xemit.c
@@ -86,11 +86,10 @@ 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;
-			if (len && rec[len - 1] == '\n')
+			while (0 < len && isspace((unsigned char)rec[len - 1]))
 				len--;
 			memcpy(buf, rec, len);
 			*ll = len;
@@ -119,7 +118,7 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
 		  xdemitconf_t const *xecfg) {
 	long s1, s2, e1, e2, lctx;
 	xdchange_t *xch, *xche;
-	char funcbuf[40];
+	char funcbuf[80];
 	long funclen = 0;
 
 	if (xecfg->flags & XDL_EMIT_COMMON)