diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-01-09 15:21:44 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-01-09 15:22:37 -0800 |
| commit | 7668717d6fecd610d71b54a33708038b2ede8cce (patch) | |
| tree | cb635acfc8273c0adf5ef567e57de345244eb76f /build-aux/update-copyright | |
| parent | 9e4d523427782ea4e49f4f13b2b99b09660516cc (diff) | |
| download | emacs-7668717d6fecd610d71b54a33708038b2ede8cce.tar.gz | |
Merge from Gnulib
This incorporates:
2018-01-05 maint: Add encoding marker for Emacs to non-ASCII sources
2018-01-04 update-copyright: Handle use of ©
2018-01-04 pthread_sigmask: Avoid compilation error on mingw
2018-01-02 stat-time: silence -Wunused-parameter regression
* build-aux/config.guess, build-aux/config.sub:
* build-aux/update-copyright, doc/misc/texinfo.tex, lib/gnulib.mk.in:
* lib/md5.c, lib/md5.h, lib/sha1.c, lib/sha1.h, lib/sha256.c:
* lib/sha256.h, lib/sha512.c, lib/sha512.h, lib/signal.in.h:
* lib/stat-time.h: Copy from Gnulib, or regenerate.
Diffstat (limited to 'build-aux/update-copyright')
| -rwxr-xr-x | build-aux/update-copyright | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/build-aux/update-copyright b/build-aux/update-copyright index 5b11e306cdc..3bb26abea1b 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" "$@"' if 0; # Update an FSF copyright year list to include the current year. -my $VERSION = '2017-09-13.06:45'; # UTC +my $VERSION = '2018-01-04.14:48'; # UTC # Copyright (C) 2009-2018 Free Software Foundation, Inc. # @@ -81,6 +81,7 @@ my $VERSION = '2017-09-13.06:45'; # UTC # B. (c) # C. @copyright{} # D. © +# E. © # # 4. The "Copyright" appears at the beginning of a line, except that it # may be prefixed by any sequence (e.g., a comment) of no more than @@ -124,7 +125,7 @@ use strict; use warnings; my $copyright_re = 'Copyright'; -my $circle_c_re = '(?:\([cC]\)|@copyright\{}|\\\\\(co|©)'; +my $circle_c_re = '(?:\([cC]\)|@copyright\{}|\\\\\(co|©|©)'; my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER}; $holder ||= 'Free Software Foundation, Inc.'; my $prefix_max = 5; @@ -263,7 +264,9 @@ else print STDERR "$ARGV: warning: copyright statement not found\n"; } +# Hey Emacs! # Local variables: +# coding: utf-8 # mode: perl # indent-tabs-mode: nil # eval: (add-hook 'write-file-hooks 'time-stamp) |