mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-22 10:26:20 +00:00
Code Issues Releases Activity

Merge from origin/emacs-27

Browse Source 
33d159c36f Fix copyright years by hand
This commit is contained in:
Paul Eggert 2021-01-01 01:28:16 -08:00
commit 50f3949119
34 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.bat
View File

@ -1,7 +1,7 @@
@echo off
rem ----------------------------------------------------------------------
rem Configuration script for MSDOS
rem Copyright (C) 1994-1999, 2001-2020 Free Software Foundation, Inc.
rem Copyright (C) 1994-1999, 2001-2021 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.

4
configure.ac
View File

@ -5215,7 +5215,7 @@ fi
version=$PACKAGE_VERSION
copyright="Copyright (C) 2020 Free Software Foundation, Inc."
copyright="Copyright (C) 2021 Free Software Foundation, Inc."
AC_DEFINE_UNQUOTED(COPYRIGHT, ["$copyright"],
[Short copyright string for this version of Emacs.])
AC_SUBST(copyright)
@ -5589,7 +5589,7 @@ AC_SUBST(WINDOW_SYSTEM_OBJ)
AH_TOP([/* GNU Emacs site configuration template file.
Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2020
Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2021
Free Software Foundation, Inc.
This file is part of GNU Emacs.

2
doc/lispref/tips.texi
View File

@ -989,7 +989,7 @@ explains these conventions, starting with an example:
@group
;;; foo.el --- Support for the Foo programming language -*- lexical-binding: t; -*-
;; Copyright (C) 2010-2020 Your Name
;; Copyright (C) 2010-2021 Your Name
@end group
;; Author: Your Name <yourname@@example.com>

6
etc/images/README
View File

@ -31,15 +31,15 @@ File: mh-logo.xpm
Files: gnus.pbm
Author: Luis Fernandes <elf@ee.ryerson.ca>
Copyright (C) 2001-2020 Free Software Foundation, Inc.
Copyright (C) 2001-2021 Free Software Foundation, Inc.
Files: splash.png, splash.svg, splash.pbm, splash.xpm
Author: Francesc Rocher <francesc.rocher@gmail.com>
Copyright (C) 2008-2020 Free Software Foundation, Inc.
Copyright (C) 2008-2021 Free Software Foundation, Inc.
Files: checked.xpm, unchecked.xpm
Author: Chong Yidong <cyd@stupidchicken.com>
Copyright (C) 2010-2020 Free Software Foundation, Inc.
Copyright (C) 2010-2021 Free Software Foundation, Inc.
* The following icons are from GTK+ 2.x. They are not part of Emacs, but

2
etc/images/checked.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
/* Copyright (C) 2010-2020 Free Software Foundation, Inc.
/* Copyright (C) 2010-2021 Free Software Foundation, Inc.
*
* Author: Chong Yidong <cyd@stupidchicken.com>
*

4
etc/images/gnus/README
View File

@ -21,11 +21,11 @@ Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm
unsubscribe.pbm unsubscribe.xpm uu-decode.pbm uu-decode.xpm
uu-post.pbm uu-post.xpm
Author: Luis Fernandes <elf@ee.ryerson.ca>
Copyright (C) 2001-2020 Free Software Foundation, Inc.
Copyright (C) 2001-2021 Free Software Foundation, Inc.
Files: gnus.png, gnus.svg
Author: Francesc Rocher <rocher@member.fsf.org>
Copyright (C) 2008-2020 Free Software Foundation, Inc.
Copyright (C) 2008-2021 Free Software Foundation, Inc.
* The following icons are from GNOME 2.x. They are not part of Emacs,

4
etc/images/gud/README
View File

@ -31,7 +31,7 @@ their copyright assignment included the icons.
The following icons are converted from the Insight Windows style icon
set in src/gdb/gdbtk/library/images2.
Copyright (C) 2002-2020 Free Software Foundation, Inc.
Copyright (C) 2002-2021 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING)
cont.pbm and cont.xpm were converted from continue.gif
@ -47,7 +47,7 @@ License: GNU General Public License version 3 or later (see COPYING)
The following icons are created from the Insight Windows style icon
set in src/gdb/gdbtk/library/images2.
Copyright (C) 2002-2020 Free Software Foundation, Inc.
Copyright (C) 2002-2021 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING)
rcont.xpm rfinish.xpm

6
etc/images/icons/README
View File

@ -14,7 +14,7 @@ Files: hicolor/16x16/apps/emacs23.png hicolor/24x24/apps/emacs23.png
hicolor/128x128/apps/emacs23.png hicolor/scalable/apps/emacs23.svg
Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Copyright (C) 2007-2020 Free Software Foundation, Inc.
Copyright (C) 2007-2021 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING)
@ -22,7 +22,7 @@ Files: hicolor/16x16/apps/emacs22.png hicolor/24x24/apps/emacs22.png
hicolor/32x32/apps/emacs22.png hicolor/48x48/apps/emacs22.png
Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
Copyright (C) 2005-2020 Free Software Foundation, Inc.
Copyright (C) 2005-2021 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING)
Files: allout-widgets-dark-bg/closed.png
@ -71,5 +71,5 @@ Files: allout-widgets-dark-bg/closed.png
allout-widgets-light-bg/through-descender.xpm
Author: Ken Manheimer <ken.manheimer@gmail.com>
Copyright (C) 2011-2020 Free Software Foundation, Inc.
Copyright (C) 2011-2021 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING)

2
etc/images/mh-logo.xpm
View File

@ -1,7 +1,7 @@
/* XPM */
/* MH-E Logo
*
* Copyright (C) 2003-2020 Free Software Foundation, Inc.
* Copyright (C) 2003-2021 Free Software Foundation, Inc.
*
* Author: Satyaki Das
*

2
etc/images/unchecked.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
/* Copyright (C) 2010-2020 Free Software Foundation, Inc.
/* Copyright (C) 2010-2021 Free Software Foundation, Inc.
*
* Author: Chong Yidong <cyd@stupidchicken.com>
*

2
etc/refcards/README
View File

@ -32,7 +32,7 @@ it is reproduced here for convenience.
File: gnus-logo.eps, gnus-logo.pdf
Author: Luis Fernandes <elf@ee.ryerson.ca>
Copyright (C) 2001-2020 Free Software Foundation, Inc.
Copyright (C) 2001-2021 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING)

2
etc/refcards/gnus-refcard.tex
View File

@ -120,7 +120,7 @@
%% Gnus logo by Luis Fernandes.
\newcommand{\Copyright}{%
\begin{center}
Copyright \copyright\ 1995, 2000, 2002--2020 Free Software Foundation, Inc.\\*
Copyright \copyright\ 1995, 2000, 2002--2021 Free Software Foundation, Inc.\\*
\end{center}
Released under the terms of the GNU General Public License version 3 or later.

2
etc/refcards/ru-refcard.tex
View File

@ -41,7 +41,7 @@
\setlength{\ColThreeWidth}{25mm}
\newcommand{\versionemacs}[0]{28} % version of Emacs this is for
\newcommand{\cyear}[0]{2020} % copyright year
\newcommand{\cyear}[0]{2021} % copyright year
\newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill
\centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc.

2
etc/tutorials/TUTORIAL.cn
View File

@ -1026,7 +1026,7 @@ using, writing, and sharing free software!
本篇指南是 GNU Emacs 的一部分，并允许在下列条件的约束下发行其拷贝：
Copyright (C) 1985, 1996, 1998, 2001-2020 Free Software Foundation,
Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation,
Inc.
本文件为 GNU Emacs 的一部分。

2
etc/tutorials/TUTORIAL.he
View File

@ -1004,7 +1004,7 @@ find-file.
גירסה זו של השיעור הינה חלק מחבילת GNU Emacs. היא מוגנת בזכויות יוצרים
וניתנת להעתקה והפצת עותקים בתנאים מסויימים כדלקמן:
Copyright (C) 2010-2020 Free Software Foundation, Inc.
Copyright (C) 2010-2021 Free Software Foundation, Inc.
‏GNU Emacs הינו תכנה חפשית; זכותכם להפיצו ו\או לשנותו בכפוף לתנאי
הרשיון GNU General Public License, כפי שהוא יוצא לאור ע״י Free

2
etc/tutorials/TUTORIAL.nl
View File

@ -1239,7 +1239,7 @@ Engels origineel van de copyrightmelding en condities:
This version of the tutorial is a part of GNU Emacs. It is copyrighted
and comes with permission to distribute copies on certain conditions:
Copyright (C) 1985, 1996, 1998, 2001-2020 Free Software Foundation, Inc.
Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation, Inc.
This file is part of GNU Emacs.

2
etc/tutorials/TUTORIAL.ro
View File

@ -1082,7 +1082,7 @@ continuare noţita de copyright originală în limba engleză.
This version of the tutorial, like GNU Emacs, is copyrighted, and
comes with permission to distribute copies on certain conditions:
Copyright (C) 1998, 2001-2020 Free Software Foundation, Inc.
Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the

2
lib-src/rcs2log
View File

@ -20,7 +20,7 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
Copyright='Copyright (C) 2020 Free Software Foundation, Inc.
Copyright='Copyright (C) 2021 Free Software Foundation, Inc.
This program comes with NO WARRANTY, to the extent permitted by law.
You may redistribute copies of this program
under the terms of the GNU General Public License.

2
lisp/emacs-lisp/cl-preloaded.el
View File

@ -1,6 +1,6 @@
;;; cl-preloaded.el --- Preloaded part of the CL library -*- lexical-binding: t; -*-
;; Copyright (C) 2015-2020 Free Software Foundation, Inc
;; Copyright (C) 2015-2021 Free Software Foundation, Inc
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Package: emacs

2
lisp/epa-mail.el
View File

@ -243,7 +243,7 @@ If no one is selected, symmetric encryption will be performed. "
(setq epa-last-coding-system-specified
(or coding-system-for-write
(select-safe-coding-system (point) (point-max)))))
;; Insert contents of requested attachments, if any.
(when (and (eq major-mode 'mail-mode) mail-encode-mml)
(mml-to-mime)

4
lisp/net/tramp-sh.el
View File

@ -781,7 +781,7 @@ characters need to be doubled.")
(defconst tramp-perl-encode
"%p -e '
# This script contributed by Juanma Barranquero <lektu@terra.es>.
# Copyright (C) 2002-2020 Free Software Foundation, Inc.
# Copyright (C) 2002-2021 Free Software Foundation, Inc.
use strict;
my %%trans = do {
@ -820,7 +820,7 @@ characters need to be doubled.")
(defconst tramp-perl-decode
"%p -e '
# This script contributed by Juanma Barranquero <lektu@terra.es>.
# Copyright (C) 2002-2020 Free Software Foundation, Inc.
# Copyright (C) 2002-2021 Free Software Foundation, Inc.
use strict;
my %%trans = do {

6
lisp/profiler.el
View File

@ -500,10 +500,10 @@ RET: expand or collapse"))
(defun profiler-report-header-line-format (fmt &rest args)
(let* ((header (apply #'profiler-format fmt args))
(escaped (replace-regexp-in-string "%" "%%" header)))
(concat
(propertize " "
(concat
(propertize " "
'display '(space :align-to 0)
'face 'fixed-pitch)
'face 'fixed-pitch)
escaped)))
(defun profiler-report-line-format (tree)

8
lisp/progmodes/cc-mode.el
View File

@ -731,8 +731,8 @@ that requires a literal mode spec at compile time."
;; ;; Put submode indicators onto minor-mode-alist, but only once.
;; (or (assq 'c-submode-indicators minor-mode-alist)
;; (setq minor-mode-alist
;; (cons '(c-submode-indicators c-submode-indicators)
;; minor-mode-alist)))
;; (cons '(c-submode-indicators c-submode-indicators)
;; minor-mode-alist)))
(c-update-modeline)
;; Install the functions that ensure that various internal caches
@ -1258,7 +1258,7 @@ Note that the style variables are always made local to the buffer."
;; Set both the syntax-table and the c-fl-syn-tab text properties at POS to
;; VALUE (which should not be nil).
;; `(let ((-pos- ,pos)
;; (-value- ,value))
;; (-value- ,value))
(c-put-char-property pos 'syntax-table value)
(c-put-char-property pos 'c-fl-syn-tab value)
(cond
@ -1488,7 +1488,7 @@ Note that the style variables are always made local to the buffer."
((and
(c-is-escaped end)
(or (eq beg end) ; .... by inserting stuff between \ and \n?
(c-will-be-unescaped beg))) ; ... by removing an odd number of \s?
(c-will-be-unescaped beg))) ; ... by removing an odd number of \s?
(goto-char (1+ end))) ; To after the NL which is being unescaped.
(t
(goto-char end)))

8
lisp/progmodes/compile.el
View File

@ -1577,10 +1577,10 @@ to `compilation-error-regexp-alist' if RULES is nil."
(put-text-property
(match-beginning mn) (match-end mn)
'font-lock-face face))
((and (listp face)
(eq (car face) 'face)
(or (symbolp (cadr face))
(stringp (cadr face))))
((and (listp face)
(eq (car face) 'face)
(or (symbolp (cadr face))
(stringp (cadr face))))
(compilation--put-prop mn 'font-lock-face (cadr face))
(add-text-properties
(match-beginning mn) (match-end mn)

2
msdos/README
View File

@ -10,7 +10,7 @@ The files emacs.ico and emacs.pif are for using the DJGPP version on
Windows 3.X. Since these are binary files, their copyright notice is
reproduced here:
# Copyright (C) 1993, 2002-2020 Free Software Foundation, Inc.
# Copyright (C) 1993, 2002-2021 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#

4
msdos/autogen/Makefile.in
View File

@ -13,7 +13,7 @@
@SET_MAKE@
# Copyright (C) 2002-2020 Free Software Foundation, Inc.
# Copyright (C) 2002-2021 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -36,7 +36,7 @@
# Generated by gnulib-tool.
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt byteswap c-ctype c-strcase careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings
# Copyright (C) 2002-2020 Free Software Foundation, Inc.
# Copyright (C) 2002-2021 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by

2
msdos/depfiles.bat
View File

@ -1,7 +1,7 @@
@echo off
rem ----------------------------------------------------------------------
rem Auxiliary script for MSDOS, run by ../config.bat
rem Copyright (C) 2011-2020 Free Software Foundation, Inc.
rem Copyright (C) 2011-2021 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.

2
msdos/sed2v2.inp
View File

@ -27,7 +27,7 @@
#ifndef MSDOS\
#define MSDOS\
#endif
/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2020 Free Software Foundation, Inc."/
/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2021 Free Software Foundation, Inc."/
/^#undef DIRECTORY_SEP *$/s!^.*$!#define DIRECTORY_SEP '/'!
/^#undef DOS_NT *$/s/^.*$/#define DOS_NT/
/^#undef FLOAT_CHECK_DOMAIN *$/s/^.*$/#define FLOAT_CHECK_DOMAIN/

2
nt/configure.bat
View File

@ -1,7 +1,7 @@
@echo off
rem ----------------------------------------------------------------------
rem This was the old configuration script for MS Windows operating systems
rem Copyright (C) 1999-2020 Free Software Foundation, Inc.
rem Copyright (C) 1999-2021 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.

2
nt/emacs.rc.in
View File

@ -31,7 +31,7 @@ BEGIN
VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
VALUE "FileVersion", "@comma_space_version@\0"
VALUE "InternalName", "Emacs\0"
VALUE "LegalCopyright", "Copyright (C) 2001-2020\0"
VALUE "LegalCopyright", "Copyright (C) 2001-2021\0"
VALUE "OriginalFilename", "emacs.exe"
VALUE "ProductName", "Emacs\0"
VALUE "ProductVersion", "@comma_space_version@\0"

2
nt/emacsclient.rc.in
View File

@ -25,7 +25,7 @@ BEGIN
VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0"
VALUE "FileVersion", "@comma_space_version@\0"
VALUE "InternalName", "EmacsClient\0"
VALUE "LegalCopyright", "Copyright (C) 2001-2020\0"
VALUE "LegalCopyright", "Copyright (C) 2001-2021\0"
VALUE "OriginalFilename", "emacsclientw.exe"
VALUE "ProductName", "EmacsClient\0"
VALUE "ProductVersion", "@comma_space_version@\0"

4
nt/icons/README
View File

@ -8,7 +8,7 @@ License: GNU General Public License version 3 or later
File: emacs22.ico
Author: Andrew Zhilin
Copyright (C) 2005-2020 Free Software Foundation, Inc.
Copyright (C) 2005-2021 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING)
@ -17,7 +17,7 @@ Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico
gnu5w32.ico gnu5w32t.ico gnu6w48.ico gnu6w48t.ico
gnu7.ico gnu8.ico gnu9.ico
Author: Rob Davenport <rgd at bigfoot.com>
Copyright (C) 1999, 2001-2020 Free Software Foundation, Inc.
Copyright (C) 1999, 2001-2021 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING)
<http://users.adelphia.net/~rob.davenport/gnuicons.html>

2
test/lisp/cedet/srecode-utest-getset.el
View File

@ -1,6 +1,6 @@
;;; srecode/test-getset.el --- Test the getset inserter. -*- lexical-binding:t -*-
;; Copyright (C) 2008, 2009, 2011, 2019-2020 Free Software Foundation, Inc
;; Copyright (C) 2008, 2009, 2011, 2019-2021 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.

2
test/manual/cedet/tests/test-fmt.cpp
View File

@ -1,6 +1,6 @@
/** test-fmt.cpp --- Signatures, and format answers for testing
*
* Copyright (C) 2012, 2016, 2019-2020 Free Software Foundation
* Copyright (C) 2012, 2016, 2019-2021 Free Software Foundation, Inc.
*
* Author: Eric M. Ludlam <zappo@gnu.org>
*