Merge branch 'maint'

diff --git a/xdiff/xemit.c b/xdiff/xemit.c
index 714c563547462d962b4a6b69b524092e1bc2a036..154c26fdcdbef9095e254d7b469daf11c5653a04 100644 (file)
--- a/xdiff/xemit.c
+++ b/xdiff/xemit.c
@@ -90,7 +90,7 @@ static void xdl_find_func(xdfile_t *xf, long i, char *buf, long sz, long *ll) {
                     *rec == '#')) {    /* #define? */
                        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;