Merge branch 'maint'

* maint:
xdiff-interface.c: always trim trailing space from xfuncname matches
diff.c: call regfree to free memory allocated by regcomp when necessary

diff --cc diff.c
Simple merge