aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2021-01-01 01:28:16 -0800
committerPaul Eggert2021-01-01 01:28:16 -0800
commit50f3949119cd5bb2f058b90d14b2940a3a8a7a0e (patch)
tree30c689b699955bd45e493e6be9d755889a8aa146
parentc63ce13206de9a6d4018e97b98b1f6966ee666d8 (diff)
parent33d159c36f42cadccb02d95099bafac26458d3e8 (diff)
downloademacs-50f3949119cd5bb2f058b90d14b2940a3a8a7a0e.tar.gz
emacs-50f3949119cd5bb2f058b90d14b2940a3a8a7a0e.zip
Merge from origin/emacs-27
33d159c36f Fix copyright years by hand
-rw-r--r--config.bat2
-rw-r--r--configure.ac4
-rw-r--r--doc/lispref/tips.texi2
-rw-r--r--etc/images/README6
-rw-r--r--etc/images/checked.xpm2
-rw-r--r--etc/images/gnus/README4
-rw-r--r--etc/images/gud/README4
-rw-r--r--etc/images/icons/README6
-rw-r--r--etc/images/mh-logo.xpm2
-rw-r--r--etc/images/unchecked.xpm2
-rw-r--r--etc/refcards/README2
-rw-r--r--etc/refcards/gnus-refcard.tex2
-rw-r--r--etc/refcards/ru-refcard.tex2
-rw-r--r--etc/tutorials/TUTORIAL.cn2
-rw-r--r--etc/tutorials/TUTORIAL.he2
-rw-r--r--etc/tutorials/TUTORIAL.nl2
-rw-r--r--etc/tutorials/TUTORIAL.ro2
-rwxr-xr-xlib-src/rcs2log2
-rw-r--r--lisp/emacs-lisp/cl-preloaded.el2
-rw-r--r--lisp/epa-mail.el2
-rw-r--r--lisp/net/tramp-sh.el4
-rw-r--r--lisp/profiler.el6
-rw-r--r--lisp/progmodes/cc-mode.el8
-rw-r--r--lisp/progmodes/compile.el8
-rw-r--r--msdos/README2
-rw-r--r--msdos/autogen/Makefile.in4
-rw-r--r--msdos/depfiles.bat2
-rw-r--r--msdos/sed2v2.inp2
-rwxr-xr-xnt/configure.bat2
-rw-r--r--nt/emacs.rc.in2
-rw-r--r--nt/emacsclient.rc.in2
-rw-r--r--nt/icons/README4
-rw-r--r--test/lisp/cedet/srecode-utest-getset.el2
-rw-r--r--test/manual/cedet/tests/test-fmt.cpp2
34 files changed, 52 insertions, 52 deletions
diff --git a/config.bat b/config.bat
index 6938e556711..cba73360992 100644
--- a/config.bat
+++ b/config.bat
@@ -1,7 +1,7 @@
1@echo off 1@echo off
2rem ---------------------------------------------------------------------- 2rem ----------------------------------------------------------------------
3rem Configuration script for MSDOS 3rem Configuration script for MSDOS
4rem Copyright (C) 1994-1999, 2001-2020 Free Software Foundation, Inc. 4rem Copyright (C) 1994-1999, 2001-2021 Free Software Foundation, Inc.
5 5
6rem This file is part of GNU Emacs. 6rem This file is part of GNU Emacs.
7 7
diff --git a/configure.ac b/configure.ac
index 0505a63b6ab..574024af965 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5215,7 +5215,7 @@ fi
5215 5215
5216version=$PACKAGE_VERSION 5216version=$PACKAGE_VERSION
5217 5217
5218copyright="Copyright (C) 2020 Free Software Foundation, Inc." 5218copyright="Copyright (C) 2021 Free Software Foundation, Inc."
5219AC_DEFINE_UNQUOTED(COPYRIGHT, ["$copyright"], 5219AC_DEFINE_UNQUOTED(COPYRIGHT, ["$copyright"],
5220 [Short copyright string for this version of Emacs.]) 5220 [Short copyright string for this version of Emacs.])
5221AC_SUBST(copyright) 5221AC_SUBST(copyright)
@@ -5589,7 +5589,7 @@ AC_SUBST(WINDOW_SYSTEM_OBJ)
5589 5589
5590AH_TOP([/* GNU Emacs site configuration template file. 5590AH_TOP([/* GNU Emacs site configuration template file.
5591 5591
5592Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2020 5592Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2021
5593 Free Software Foundation, Inc. 5593 Free Software Foundation, Inc.
5594 5594
5595This file is part of GNU Emacs. 5595This file is part of GNU Emacs.
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index 715c440fbb0..4a7793a976d 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -989,7 +989,7 @@ explains these conventions, starting with an example:
989@group 989@group
990;;; foo.el --- Support for the Foo programming language -*- lexical-binding: t; -*- 990;;; foo.el --- Support for the Foo programming language -*- lexical-binding: t; -*-
991 991
992;; Copyright (C) 2010-2020 Your Name 992;; Copyright (C) 2010-2021 Your Name
993@end group 993@end group
994 994
995;; Author: Your Name <yourname@@example.com> 995;; Author: Your Name <yourname@@example.com>
diff --git a/etc/images/README b/etc/images/README
index f6e4f69668f..00aac4f510a 100644
--- a/etc/images/README
+++ b/etc/images/README
@@ -31,15 +31,15 @@ File: mh-logo.xpm
31 31
32Files: gnus.pbm 32Files: gnus.pbm
33 Author: Luis Fernandes <elf@ee.ryerson.ca> 33 Author: Luis Fernandes <elf@ee.ryerson.ca>
34 Copyright (C) 2001-2020 Free Software Foundation, Inc. 34 Copyright (C) 2001-2021 Free Software Foundation, Inc.
35 35
36Files: splash.png, splash.svg, splash.pbm, splash.xpm 36Files: splash.png, splash.svg, splash.pbm, splash.xpm
37 Author: Francesc Rocher <francesc.rocher@gmail.com> 37 Author: Francesc Rocher <francesc.rocher@gmail.com>
38 Copyright (C) 2008-2020 Free Software Foundation, Inc. 38 Copyright (C) 2008-2021 Free Software Foundation, Inc.
39 39
40Files: checked.xpm, unchecked.xpm 40Files: checked.xpm, unchecked.xpm
41 Author: Chong Yidong <cyd@stupidchicken.com> 41 Author: Chong Yidong <cyd@stupidchicken.com>
42 Copyright (C) 2010-2020 Free Software Foundation, Inc. 42 Copyright (C) 2010-2021 Free Software Foundation, Inc.
43 43
44 44
45* The following icons are from GTK+ 2.x. They are not part of Emacs, but 45* The following icons are from GTK+ 2.x. They are not part of Emacs, but
diff --git a/etc/images/checked.xpm b/etc/images/checked.xpm
index 9f60b368422..3e7e76f254e 100644
--- a/etc/images/checked.xpm
+++ b/etc/images/checked.xpm
@@ -1,5 +1,5 @@
1/* XPM */ 1/* XPM */
2/* Copyright (C) 2010-2020 Free Software Foundation, Inc. 2/* Copyright (C) 2010-2021 Free Software Foundation, Inc.
3 * 3 *
4 * Author: Chong Yidong <cyd@stupidchicken.com> 4 * Author: Chong Yidong <cyd@stupidchicken.com>
5 * 5 *
diff --git a/etc/images/gnus/README b/etc/images/gnus/README
index 4ca948ecd73..4acfc0c7db9 100644
--- a/etc/images/gnus/README
+++ b/etc/images/gnus/README
@@ -21,11 +21,11 @@ Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm
21 unsubscribe.pbm unsubscribe.xpm uu-decode.pbm uu-decode.xpm 21 unsubscribe.pbm unsubscribe.xpm uu-decode.pbm uu-decode.xpm
22 uu-post.pbm uu-post.xpm 22 uu-post.pbm uu-post.xpm
23Author: Luis Fernandes <elf@ee.ryerson.ca> 23Author: Luis Fernandes <elf@ee.ryerson.ca>
24Copyright (C) 2001-2020 Free Software Foundation, Inc. 24Copyright (C) 2001-2021 Free Software Foundation, Inc.
25 25
26Files: gnus.png, gnus.svg 26Files: gnus.png, gnus.svg
27 Author: Francesc Rocher <rocher@member.fsf.org> 27 Author: Francesc Rocher <rocher@member.fsf.org>
28 Copyright (C) 2008-2020 Free Software Foundation, Inc. 28 Copyright (C) 2008-2021 Free Software Foundation, Inc.
29 29
30 30
31* The following icons are from GNOME 2.x. They are not part of Emacs, 31* The following icons are from GNOME 2.x. They are not part of Emacs,
diff --git a/etc/images/gud/README b/etc/images/gud/README
index b56a5883f2b..0ef5258b9a8 100644
--- a/etc/images/gud/README
+++ b/etc/images/gud/README
@@ -31,7 +31,7 @@ their copyright assignment included the icons.
31The following icons are converted from the Insight Windows style icon 31The following icons are converted from the Insight Windows style icon
32set in src/gdb/gdbtk/library/images2. 32set in src/gdb/gdbtk/library/images2.
33 33
34Copyright (C) 2002-2020 Free Software Foundation, Inc. 34Copyright (C) 2002-2021 Free Software Foundation, Inc.
35License: GNU General Public License version 3 or later (see COPYING) 35License: GNU General Public License version 3 or later (see COPYING)
36 36
37 cont.pbm and cont.xpm were converted from continue.gif 37 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)
47The following icons are created from the Insight Windows style icon 47The following icons are created from the Insight Windows style icon
48set in src/gdb/gdbtk/library/images2. 48set in src/gdb/gdbtk/library/images2.
49 49
50Copyright (C) 2002-2020 Free Software Foundation, Inc. 50Copyright (C) 2002-2021 Free Software Foundation, Inc.
51License: GNU General Public License version 3 or later (see COPYING) 51License: GNU General Public License version 3 or later (see COPYING)
52 52
53 rcont.xpm rfinish.xpm 53 rcont.xpm rfinish.xpm
diff --git a/etc/images/icons/README b/etc/images/icons/README
index 56096aa773b..a0a2e9303d5 100644
--- a/etc/images/icons/README
+++ b/etc/images/icons/README
@@ -14,7 +14,7 @@ Files: hicolor/16x16/apps/emacs23.png hicolor/24x24/apps/emacs23.png
14 hicolor/128x128/apps/emacs23.png hicolor/scalable/apps/emacs23.svg 14 hicolor/128x128/apps/emacs23.png hicolor/scalable/apps/emacs23.svg
15 15
16Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp> 16Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
17Copyright (C) 2007-2020 Free Software Foundation, Inc. 17Copyright (C) 2007-2021 Free Software Foundation, Inc.
18License: GNU General Public License version 3 or later (see COPYING) 18License: GNU General Public License version 3 or later (see COPYING)
19 19
20 20
@@ -22,7 +22,7 @@ Files: hicolor/16x16/apps/emacs22.png hicolor/24x24/apps/emacs22.png
22 hicolor/32x32/apps/emacs22.png hicolor/48x48/apps/emacs22.png 22 hicolor/32x32/apps/emacs22.png hicolor/48x48/apps/emacs22.png
23 23
24Author: Andrew Zhilin <andrew_zhilin@yahoo.com> 24Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
25Copyright (C) 2005-2020 Free Software Foundation, Inc. 25Copyright (C) 2005-2021 Free Software Foundation, Inc.
26License: GNU General Public License version 3 or later (see COPYING) 26License: GNU General Public License version 3 or later (see COPYING)
27 27
28Files: allout-widgets-dark-bg/closed.png 28Files: allout-widgets-dark-bg/closed.png
@@ -71,5 +71,5 @@ Files: allout-widgets-dark-bg/closed.png
71 allout-widgets-light-bg/through-descender.xpm 71 allout-widgets-light-bg/through-descender.xpm
72 72
73Author: Ken Manheimer <ken.manheimer@gmail.com> 73Author: Ken Manheimer <ken.manheimer@gmail.com>
74Copyright (C) 2011-2020 Free Software Foundation, Inc. 74Copyright (C) 2011-2021 Free Software Foundation, Inc.
75License: GNU General Public License version 3 or later (see COPYING) 75License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/mh-logo.xpm b/etc/images/mh-logo.xpm
index 97848e06ce9..fd7598d5a6b 100644
--- a/etc/images/mh-logo.xpm
+++ b/etc/images/mh-logo.xpm
@@ -1,7 +1,7 @@
1/* XPM */ 1/* XPM */
2/* MH-E Logo 2/* MH-E Logo
3 * 3 *
4 * Copyright (C) 2003-2020 Free Software Foundation, Inc. 4 * Copyright (C) 2003-2021 Free Software Foundation, Inc.
5 * 5 *
6 * Author: Satyaki Das 6 * Author: Satyaki Das
7 * 7 *
diff --git a/etc/images/unchecked.xpm b/etc/images/unchecked.xpm
index 128fcd1b47c..5e18534e77e 100644
--- a/etc/images/unchecked.xpm
+++ b/etc/images/unchecked.xpm
@@ -1,5 +1,5 @@
1/* XPM */ 1/* XPM */
2/* Copyright (C) 2010-2020 Free Software Foundation, Inc. 2/* Copyright (C) 2010-2021 Free Software Foundation, Inc.
3 * 3 *
4 * Author: Chong Yidong <cyd@stupidchicken.com> 4 * Author: Chong Yidong <cyd@stupidchicken.com>
5 * 5 *
diff --git a/etc/refcards/README b/etc/refcards/README
index e22b518cc6d..30c82bc7140 100644
--- a/etc/refcards/README
+++ b/etc/refcards/README
@@ -32,7 +32,7 @@ it is reproduced here for convenience.
32 32
33File: gnus-logo.eps, gnus-logo.pdf 33File: gnus-logo.eps, gnus-logo.pdf
34 Author: Luis Fernandes <elf@ee.ryerson.ca> 34 Author: Luis Fernandes <elf@ee.ryerson.ca>
35 Copyright (C) 2001-2020 Free Software Foundation, Inc. 35 Copyright (C) 2001-2021 Free Software Foundation, Inc.
36 License: GNU General Public License version 3 or later (see COPYING) 36 License: GNU General Public License version 3 or later (see COPYING)
37 37
38 38
diff --git a/etc/refcards/gnus-refcard.tex b/etc/refcards/gnus-refcard.tex
index 895186decfe..4a1760c1b26 100644
--- a/etc/refcards/gnus-refcard.tex
+++ b/etc/refcards/gnus-refcard.tex
@@ -120,7 +120,7 @@
120%% Gnus logo by Luis Fernandes. 120%% Gnus logo by Luis Fernandes.
121\newcommand{\Copyright}{% 121\newcommand{\Copyright}{%
122 \begin{center} 122 \begin{center}
123 Copyright \copyright\ 1995, 2000, 2002--2020 Free Software Foundation, Inc.\\* 123 Copyright \copyright\ 1995, 2000, 2002--2021 Free Software Foundation, Inc.\\*
124 \end{center} 124 \end{center}
125 125
126 Released under the terms of the GNU General Public License version 3 or later. 126 Released under the terms of the GNU General Public License version 3 or later.
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex
index bab486351ac..179be0af885 100644
--- a/etc/refcards/ru-refcard.tex
+++ b/etc/refcards/ru-refcard.tex
@@ -41,7 +41,7 @@
41\setlength{\ColThreeWidth}{25mm} 41\setlength{\ColThreeWidth}{25mm}
42 42
43\newcommand{\versionemacs}[0]{28} % version of Emacs this is for 43\newcommand{\versionemacs}[0]{28} % version of Emacs this is for
44\newcommand{\cyear}[0]{2020} % copyright year 44\newcommand{\cyear}[0]{2021} % copyright year
45 45
46\newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill 46\newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill
47 \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc. 47 \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc.
diff --git a/etc/tutorials/TUTORIAL.cn b/etc/tutorials/TUTORIAL.cn
index 2bf19546188..742de090da8 100644
--- a/etc/tutorials/TUTORIAL.cn
+++ b/etc/tutorials/TUTORIAL.cn
@@ -1026,7 +1026,7 @@ using, writing, and sharing free software!
1026 1026
1027本篇指南是 GNU Emacs 的一部分,并允许在下列条件的约束下发行其拷贝: 1027本篇指南是 GNU Emacs 的一部分,并允许在下列条件的约束下发行其拷贝:
1028 1028
1029 Copyright (C) 1985, 1996, 1998, 2001-2020 Free Software Foundation, 1029 Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation,
1030 Inc. 1030 Inc.
1031 1031
1032 本文件为 GNU Emacs 的一部分。 1032 本文件为 GNU Emacs 的一部分。
diff --git a/etc/tutorials/TUTORIAL.he b/etc/tutorials/TUTORIAL.he
index 1478fdea735..5cd1cac8fd1 100644
--- a/etc/tutorials/TUTORIAL.he
+++ b/etc/tutorials/TUTORIAL.he
@@ -1004,7 +1004,7 @@ find-file.
1004גירסה זו של השיעור הינה חלק מחבילת GNU Emacs. היא מוגנת בזכויות יוצרים 1004גירסה זו של השיעור הינה חלק מחבילת GNU Emacs. היא מוגנת בזכויות יוצרים
1005וניתנת להעתקה והפצת עותקים בתנאים מסויימים כדלקמן: 1005וניתנת להעתקה והפצת עותקים בתנאים מסויימים כדלקמן:
1006 1006
1007 Copyright (C) 2010-2020 Free Software Foundation, Inc. 1007 Copyright (C) 2010-2021 Free Software Foundation, Inc.
1008 1008
1009‏GNU Emacs הינו תכנה חפשית; זכותכם להפיצו ו\או לשנותו בכפוף לתנאי 1009‏GNU Emacs הינו תכנה חפשית; זכותכם להפיצו ו\או לשנותו בכפוף לתנאי
1010הרשיון GNU General Public License, כפי שהוא יוצא לאור ע״י Free 1010הרשיון GNU General Public License, כפי שהוא יוצא לאור ע״י Free
diff --git a/etc/tutorials/TUTORIAL.nl b/etc/tutorials/TUTORIAL.nl
index 1b7f19a3b5a..0853e5ffbb7 100644
--- a/etc/tutorials/TUTORIAL.nl
+++ b/etc/tutorials/TUTORIAL.nl
@@ -1239,7 +1239,7 @@ Engels origineel van de copyrightmelding en condities:
1239This version of the tutorial is a part of GNU Emacs. It is copyrighted 1239This version of the tutorial is a part of GNU Emacs. It is copyrighted
1240and comes with permission to distribute copies on certain conditions: 1240and comes with permission to distribute copies on certain conditions:
1241 1241
1242 Copyright (C) 1985, 1996, 1998, 2001-2020 Free Software Foundation, Inc. 1242 Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation, Inc.
1243 1243
1244 This file is part of GNU Emacs. 1244 This file is part of GNU Emacs.
1245 1245
diff --git a/etc/tutorials/TUTORIAL.ro b/etc/tutorials/TUTORIAL.ro
index ab0902dc00f..f9e67caa1ea 100644
--- a/etc/tutorials/TUTORIAL.ro
+++ b/etc/tutorials/TUTORIAL.ro
@@ -1082,7 +1082,7 @@ continuare noţita de copyright originală în limba engleză.
1082This version of the tutorial, like GNU Emacs, is copyrighted, and 1082This version of the tutorial, like GNU Emacs, is copyrighted, and
1083comes with permission to distribute copies on certain conditions: 1083comes with permission to distribute copies on certain conditions:
1084 1084
1085Copyright (C) 1998, 2001-2020 Free Software Foundation, Inc. 1085Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc.
1086 1086
1087 Permission is granted to anyone to make or distribute verbatim copies 1087 Permission is granted to anyone to make or distribute verbatim copies
1088 of this document as received, in any medium, provided that the 1088 of this document as received, in any medium, provided that the
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index e090bb2b1f1..7a033672f6d 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -20,7 +20,7 @@
20# along with this program. If not, see <https://www.gnu.org/licenses/>. 20# along with this program. If not, see <https://www.gnu.org/licenses/>.
21 21
22 22
23Copyright='Copyright (C) 2020 Free Software Foundation, Inc. 23Copyright='Copyright (C) 2021 Free Software Foundation, Inc.
24This program comes with NO WARRANTY, to the extent permitted by law. 24This program comes with NO WARRANTY, to the extent permitted by law.
25You may redistribute copies of this program 25You may redistribute copies of this program
26under the terms of the GNU General Public License. 26under the terms of the GNU General Public License.
diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el
index eed43c5ed38..7365e23186a 100644
--- a/lisp/emacs-lisp/cl-preloaded.el
+++ b/lisp/emacs-lisp/cl-preloaded.el
@@ -1,6 +1,6 @@
1;;; cl-preloaded.el --- Preloaded part of the CL library -*- lexical-binding: t; -*- 1;;; cl-preloaded.el --- Preloaded part of the CL library -*- lexical-binding: t; -*-
2 2
3;; Copyright (C) 2015-2020 Free Software Foundation, Inc 3;; Copyright (C) 2015-2021 Free Software Foundation, Inc
4 4
5;; Author: Stefan Monnier <monnier@iro.umontreal.ca> 5;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
6;; Package: emacs 6;; Package: emacs
diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el
index 6cc7ac9768e..7e100569b0f 100644
--- a/lisp/epa-mail.el
+++ b/lisp/epa-mail.el
@@ -243,7 +243,7 @@ If no one is selected, symmetric encryption will be performed. "
243 (setq epa-last-coding-system-specified 243 (setq epa-last-coding-system-specified
244 (or coding-system-for-write 244 (or coding-system-for-write
245 (select-safe-coding-system (point) (point-max))))) 245 (select-safe-coding-system (point) (point-max)))))
246 246
247 ;; Insert contents of requested attachments, if any. 247 ;; Insert contents of requested attachments, if any.
248 (when (and (eq major-mode 'mail-mode) mail-encode-mml) 248 (when (and (eq major-mode 'mail-mode) mail-encode-mml)
249 (mml-to-mime) 249 (mml-to-mime)
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index b69925437a0..865ea4e92a4 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -781,7 +781,7 @@ characters need to be doubled.")
781(defconst tramp-perl-encode 781(defconst tramp-perl-encode
782 "%p -e ' 782 "%p -e '
783# This script contributed by Juanma Barranquero <lektu@terra.es>. 783# This script contributed by Juanma Barranquero <lektu@terra.es>.
784# Copyright (C) 2002-2020 Free Software Foundation, Inc. 784# Copyright (C) 2002-2021 Free Software Foundation, Inc.
785use strict; 785use strict;
786 786
787my %%trans = do { 787my %%trans = do {
@@ -820,7 +820,7 @@ characters need to be doubled.")
820(defconst tramp-perl-decode 820(defconst tramp-perl-decode
821 "%p -e ' 821 "%p -e '
822# This script contributed by Juanma Barranquero <lektu@terra.es>. 822# This script contributed by Juanma Barranquero <lektu@terra.es>.
823# Copyright (C) 2002-2020 Free Software Foundation, Inc. 823# Copyright (C) 2002-2021 Free Software Foundation, Inc.
824use strict; 824use strict;
825 825
826my %%trans = do { 826my %%trans = do {
diff --git a/lisp/profiler.el b/lisp/profiler.el
index 75fa48426e9..64d71f4aab2 100644
--- a/lisp/profiler.el
+++ b/lisp/profiler.el
@@ -500,10 +500,10 @@ RET: expand or collapse"))
500(defun profiler-report-header-line-format (fmt &rest args) 500(defun profiler-report-header-line-format (fmt &rest args)
501 (let* ((header (apply #'profiler-format fmt args)) 501 (let* ((header (apply #'profiler-format fmt args))
502 (escaped (replace-regexp-in-string "%" "%%" header))) 502 (escaped (replace-regexp-in-string "%" "%%" header)))
503 (concat 503 (concat
504 (propertize " " 504 (propertize " "
505 'display '(space :align-to 0) 505 'display '(space :align-to 0)
506 'face 'fixed-pitch) 506 'face 'fixed-pitch)
507 escaped))) 507 escaped)))
508 508
509(defun profiler-report-line-format (tree) 509(defun profiler-report-line-format (tree)
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 0f37db6a5ed..cfb23d0d45e 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -731,8 +731,8 @@ that requires a literal mode spec at compile time."
731;; ;; Put submode indicators onto minor-mode-alist, but only once. 731;; ;; Put submode indicators onto minor-mode-alist, but only once.
732;; (or (assq 'c-submode-indicators minor-mode-alist) 732;; (or (assq 'c-submode-indicators minor-mode-alist)
733;; (setq minor-mode-alist 733;; (setq minor-mode-alist
734;; (cons '(c-submode-indicators c-submode-indicators) 734;; (cons '(c-submode-indicators c-submode-indicators)
735;; minor-mode-alist))) 735;; minor-mode-alist)))
736 (c-update-modeline) 736 (c-update-modeline)
737 737
738 ;; Install the functions that ensure that various internal caches 738 ;; 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."
1258 ;; Set both the syntax-table and the c-fl-syn-tab text properties at POS to 1258 ;; Set both the syntax-table and the c-fl-syn-tab text properties at POS to
1259 ;; VALUE (which should not be nil). 1259 ;; VALUE (which should not be nil).
1260 ;; `(let ((-pos- ,pos) 1260 ;; `(let ((-pos- ,pos)
1261 ;; (-value- ,value)) 1261 ;; (-value- ,value))
1262 (c-put-char-property pos 'syntax-table value) 1262 (c-put-char-property pos 'syntax-table value)
1263 (c-put-char-property pos 'c-fl-syn-tab value) 1263 (c-put-char-property pos 'c-fl-syn-tab value)
1264 (cond 1264 (cond
@@ -1488,7 +1488,7 @@ Note that the style variables are always made local to the buffer."
1488 ((and 1488 ((and
1489 (c-is-escaped end) 1489 (c-is-escaped end)
1490 (or (eq beg end) ; .... by inserting stuff between \ and \n? 1490 (or (eq beg end) ; .... by inserting stuff between \ and \n?
1491 (c-will-be-unescaped beg))) ; ... by removing an odd number of \s? 1491 (c-will-be-unescaped beg))) ; ... by removing an odd number of \s?
1492 (goto-char (1+ end))) ; To after the NL which is being unescaped. 1492 (goto-char (1+ end))) ; To after the NL which is being unescaped.
1493 (t 1493 (t
1494 (goto-char end))) 1494 (goto-char end)))
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 9db7bcde206..94e4f3c6fa7 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1577,10 +1577,10 @@ to `compilation-error-regexp-alist' if RULES is nil."
1577 (put-text-property 1577 (put-text-property
1578 (match-beginning mn) (match-end mn) 1578 (match-beginning mn) (match-end mn)
1579 'font-lock-face face)) 1579 'font-lock-face face))
1580 ((and (listp face) 1580 ((and (listp face)
1581 (eq (car face) 'face) 1581 (eq (car face) 'face)
1582 (or (symbolp (cadr face)) 1582 (or (symbolp (cadr face))
1583 (stringp (cadr face)))) 1583 (stringp (cadr face))))
1584 (compilation--put-prop mn 'font-lock-face (cadr face)) 1584 (compilation--put-prop mn 'font-lock-face (cadr face))
1585 (add-text-properties 1585 (add-text-properties
1586 (match-beginning mn) (match-end mn) 1586 (match-beginning mn) (match-end mn)
diff --git a/msdos/README b/msdos/README
index a41c363cba9..9feaed89459 100644
--- a/msdos/README
+++ b/msdos/README
@@ -10,7 +10,7 @@ The files emacs.ico and emacs.pif are for using the DJGPP version on
10Windows 3.X. Since these are binary files, their copyright notice is 10Windows 3.X. Since these are binary files, their copyright notice is
11reproduced here: 11reproduced here:
12 12
13# Copyright (C) 1993, 2002-2020 Free Software Foundation, Inc. 13# Copyright (C) 1993, 2002-2021 Free Software Foundation, Inc.
14# 14#
15# This file is part of GNU Emacs. 15# This file is part of GNU Emacs.
16# 16#
diff --git a/msdos/autogen/Makefile.in b/msdos/autogen/Makefile.in
index 1c9dfa9d48c..0bdc4087522 100644
--- a/msdos/autogen/Makefile.in
+++ b/msdos/autogen/Makefile.in
@@ -13,7 +13,7 @@
13 13
14@SET_MAKE@ 14@SET_MAKE@
15 15
16# Copyright (C) 2002-2020 Free Software Foundation, Inc. 16# Copyright (C) 2002-2021 Free Software Foundation, Inc.
17# 17#
18# This file is free software; you can redistribute it and/or modify 18# This file is free software; you can redistribute it and/or modify
19# it under the terms of the GNU General Public License as published by 19# it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@
36# Generated by gnulib-tool. 36# Generated by gnulib-tool.
37# 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 37# 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
38 38
39# Copyright (C) 2002-2020 Free Software Foundation, Inc. 39# Copyright (C) 2002-2021 Free Software Foundation, Inc.
40# 40#
41# This file is free software; you can redistribute it and/or modify 41# This file is free software; you can redistribute it and/or modify
42# it under the terms of the GNU General Public License as published by 42# it under the terms of the GNU General Public License as published by
diff --git a/msdos/depfiles.bat b/msdos/depfiles.bat
index f3c4b33d186..131f2fc04d4 100644
--- a/msdos/depfiles.bat
+++ b/msdos/depfiles.bat
@@ -1,7 +1,7 @@
1@echo off 1@echo off
2rem ---------------------------------------------------------------------- 2rem ----------------------------------------------------------------------
3rem Auxiliary script for MSDOS, run by ../config.bat 3rem Auxiliary script for MSDOS, run by ../config.bat
4rem Copyright (C) 2011-2020 Free Software Foundation, Inc. 4rem Copyright (C) 2011-2021 Free Software Foundation, Inc.
5 5
6rem This file is part of GNU Emacs. 6rem This file is part of GNU Emacs.
7 7
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index 73de4f23513..ce45a7c80e9 100644
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -27,7 +27,7 @@
27#ifndef MSDOS\ 27#ifndef MSDOS\
28#define MSDOS\ 28#define MSDOS\
29#endif 29#endif
30/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2020 Free Software Foundation, Inc."/ 30/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2021 Free Software Foundation, Inc."/
31/^#undef DIRECTORY_SEP *$/s!^.*$!#define DIRECTORY_SEP '/'! 31/^#undef DIRECTORY_SEP *$/s!^.*$!#define DIRECTORY_SEP '/'!
32/^#undef DOS_NT *$/s/^.*$/#define DOS_NT/ 32/^#undef DOS_NT *$/s/^.*$/#define DOS_NT/
33/^#undef FLOAT_CHECK_DOMAIN *$/s/^.*$/#define FLOAT_CHECK_DOMAIN/ 33/^#undef FLOAT_CHECK_DOMAIN *$/s/^.*$/#define FLOAT_CHECK_DOMAIN/
diff --git a/nt/configure.bat b/nt/configure.bat
index 8d436690e4f..0cb1a632e2b 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -1,7 +1,7 @@
1@echo off 1@echo off
2rem ---------------------------------------------------------------------- 2rem ----------------------------------------------------------------------
3rem This was the old configuration script for MS Windows operating systems 3rem This was the old configuration script for MS Windows operating systems
4rem Copyright (C) 1999-2020 Free Software Foundation, Inc. 4rem Copyright (C) 1999-2021 Free Software Foundation, Inc.
5 5
6rem This file is part of GNU Emacs. 6rem This file is part of GNU Emacs.
7 7
diff --git a/nt/emacs.rc.in b/nt/emacs.rc.in
index b551e588cad..ed217887c5d 100644
--- a/nt/emacs.rc.in
+++ b/nt/emacs.rc.in
@@ -31,7 +31,7 @@ BEGIN
31 VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" 31 VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
32 VALUE "FileVersion", "@comma_space_version@\0" 32 VALUE "FileVersion", "@comma_space_version@\0"
33 VALUE "InternalName", "Emacs\0" 33 VALUE "InternalName", "Emacs\0"
34 VALUE "LegalCopyright", "Copyright (C) 2001-2020\0" 34 VALUE "LegalCopyright", "Copyright (C) 2001-2021\0"
35 VALUE "OriginalFilename", "emacs.exe" 35 VALUE "OriginalFilename", "emacs.exe"
36 VALUE "ProductName", "Emacs\0" 36 VALUE "ProductName", "Emacs\0"
37 VALUE "ProductVersion", "@comma_space_version@\0" 37 VALUE "ProductVersion", "@comma_space_version@\0"
diff --git a/nt/emacsclient.rc.in b/nt/emacsclient.rc.in
index ebb117f0e6b..c061f06528e 100644
--- a/nt/emacsclient.rc.in
+++ b/nt/emacsclient.rc.in
@@ -25,7 +25,7 @@ BEGIN
25 VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" 25 VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0"
26 VALUE "FileVersion", "@comma_space_version@\0" 26 VALUE "FileVersion", "@comma_space_version@\0"
27 VALUE "InternalName", "EmacsClient\0" 27 VALUE "InternalName", "EmacsClient\0"
28 VALUE "LegalCopyright", "Copyright (C) 2001-2020\0" 28 VALUE "LegalCopyright", "Copyright (C) 2001-2021\0"
29 VALUE "OriginalFilename", "emacsclientw.exe" 29 VALUE "OriginalFilename", "emacsclientw.exe"
30 VALUE "ProductName", "EmacsClient\0" 30 VALUE "ProductName", "EmacsClient\0"
31 VALUE "ProductVersion", "@comma_space_version@\0" 31 VALUE "ProductVersion", "@comma_space_version@\0"
diff --git a/nt/icons/README b/nt/icons/README
index 1250334d96f..a8849b2eeec 100644
--- a/nt/icons/README
+++ b/nt/icons/README
@@ -8,7 +8,7 @@ License: GNU General Public License version 3 or later
8 8
9File: emacs22.ico 9File: emacs22.ico
10Author: Andrew Zhilin 10Author: Andrew Zhilin
11Copyright (C) 2005-2020 Free Software Foundation, Inc. 11Copyright (C) 2005-2021 Free Software Foundation, Inc.
12License: GNU General Public License version 3 or later (see COPYING) 12License: GNU General Public License version 3 or later (see COPYING)
13 13
14 14
@@ -17,7 +17,7 @@ Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico
17 gnu5w32.ico gnu5w32t.ico gnu6w48.ico gnu6w48t.ico 17 gnu5w32.ico gnu5w32t.ico gnu6w48.ico gnu6w48t.ico
18 gnu7.ico gnu8.ico gnu9.ico 18 gnu7.ico gnu8.ico gnu9.ico
19Author: Rob Davenport <rgd at bigfoot.com> 19Author: Rob Davenport <rgd at bigfoot.com>
20Copyright (C) 1999, 2001-2020 Free Software Foundation, Inc. 20Copyright (C) 1999, 2001-2021 Free Software Foundation, Inc.
21License: GNU General Public License version 3 or later (see COPYING) 21License: GNU General Public License version 3 or later (see COPYING)
22 22
23 <http://users.adelphia.net/~rob.davenport/gnuicons.html> 23 <http://users.adelphia.net/~rob.davenport/gnuicons.html>
diff --git a/test/lisp/cedet/srecode-utest-getset.el b/test/lisp/cedet/srecode-utest-getset.el
index fc66ac4edf2..0497dea505d 100644
--- a/test/lisp/cedet/srecode-utest-getset.el
+++ b/test/lisp/cedet/srecode-utest-getset.el
@@ -1,6 +1,6 @@
1;;; srecode/test-getset.el --- Test the getset inserter. -*- lexical-binding:t -*- 1;;; srecode/test-getset.el --- Test the getset inserter. -*- lexical-binding:t -*-
2 2
3;; Copyright (C) 2008, 2009, 2011, 2019-2020 Free Software Foundation, Inc 3;; Copyright (C) 2008, 2009, 2011, 2019-2021 Free Software Foundation, Inc.
4 4
5;; This file is part of GNU Emacs. 5;; This file is part of GNU Emacs.
6 6
diff --git a/test/manual/cedet/tests/test-fmt.cpp b/test/manual/cedet/tests/test-fmt.cpp
index 31cd6296f3d..ab869c1ce00 100644
--- a/test/manual/cedet/tests/test-fmt.cpp
+++ b/test/manual/cedet/tests/test-fmt.cpp
@@ -1,6 +1,6 @@
1/** test-fmt.cpp --- Signatures, and format answers for testing 1/** test-fmt.cpp --- Signatures, and format answers for testing
2 * 2 *
3 * Copyright (C) 2012, 2016, 2019-2020 Free Software Foundation 3 * Copyright (C) 2012, 2016, 2019-2021 Free Software Foundation, Inc.
4 * 4 *
5 * Author: Eric M. Ludlam <zappo@gnu.org> 5 * Author: Eric M. Ludlam <zappo@gnu.org>
6 * 6 *