diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-01-27 22:24:19 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-01-27 22:24:47 -0800 |
| commit | 39c2fa3f4e5bf332cc30266d36d5410c4ffeaac4 (patch) | |
| tree | e3331217ed3d9fab50de7d92fa1f2074138ac407 /build-aux | |
| parent | 0cdd599c54aeda36e7e0696b2f90d2c286153a1d (diff) | |
| download | emacs-39c2fa3f4e5bf332cc30266d36d5410c4ffeaac4.tar.gz | |
Merge from gnulib and try to repair bad merge
This attempts to repair problems introduced by the bad merge
5491fd1098d27b3ba3db054076b9ab60fb3558dc. The easiest way for me
to fix the badly-merged gnulib files was to run
'admin/merge-gnulib', so I did that, which also imported the
following changes:
* build-aux/update-copyright, m4/gnulib.m4:
Update from gnulib, incorporating:
2015-01-15 time: port to MinGW32 3.21
2015-01-15 update-copyright: apply to self
2015-01-11 update-copyright: recognize groff's \(co marker
Diffstat (limited to 'build-aux')
| -rwxr-xr-x | build-aux/update-copyright | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build-aux/update-copyright b/build-aux/update-copyright index 308fbf17f9b..4eb4b93ea6c 100755 --- a/build-aux/update-copyright +++ b/build-aux/update-copyright @@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" ${1+"$@"}' if 0; # Update an FSF copyright year list to include the current year. -my $VERSION = '2013-01-03.09:41'; # UTC +my $VERSION = '2015-01-15.20:53'; # UTC # Copyright (C) 2009-2015 Free Software Foundation, Inc. # @@ -124,7 +124,7 @@ use strict; use warnings; my $copyright_re = 'Copyright'; -my $circle_c_re = '(?:\([cC]\)|@copyright{}|©)'; +my $circle_c_re = '(?:\([cC]\)|@copyright{}|\\\\\(co|©)'; my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER}; $holder ||= 'Free Software Foundation, Inc.'; my $prefix_max = 5; |