diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-09-25 00:21:58 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-09-25 00:23:18 -0700 |
| commit | 1657ba799a873a7758219dc0bdebf6ab91908fa2 (patch) | |
| tree | 3605280690680eb218a5353dff1d981ae112593b /build-aux | |
| parent | da38b6a7cdcdc7670a3e9088777b3f2829b08bbd (diff) | |
| download | emacs-1657ba799a873a7758219dc0bdebf6ab91908fa2.tar.gz | |
Merge from gnulib
This incorporates:
2015-09-25 c-ctype: rewrite to use inline functions
2015-09-24 maint: add coding cookies to non-ASCII sources
2015-09-24 gitlog-to-changelog: trim only trailing whitespaces
* build-aux/gitlog-to-changelog, doc/misc/texinfo.tex:
* lib/acl-internal.c, lib/acl-internal.h, lib/c-ctype.c:
* lib/c-ctype.h, lib/get-permissions.c, lib/qcopy-acl.c:
* lib/set-permissions.c:
Copy from gnulib.
Diffstat (limited to 'build-aux')
| -rwxr-xr-x | build-aux/gitlog-to-changelog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index 0cab1bf17cd..a0e0a05df8f 100755 --- a/build-aux/gitlog-to-changelog +++ b/build-aux/gitlog-to-changelog @@ -333,7 +333,7 @@ sub git_dir_option($) $rest =~ s/^\s*\(cherry picked from commit [\da-f]+\)\n//m; } - my @line = split /\s*\n/, $rest; + my @line = split /[ \t]*\n/, $rest; my $author_line = shift @line; defined $author_line or die "$ME:$.: unexpected EOF\n"; |