Merge from origin/emacs-27

186152ba40 Pacify gcc -Wunused-function on Ubuntu 18.04.3 4cd143aded Fix copyright years by hand 365e01cc9f Update copyright year to 2020 cd2c156163 ; * etc/NEWS: Make the description of XDG fallback more ac... # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex
author: Paul Eggert 2020-01-01 01:08:16 +0000
committer: Paul Eggert 2020-01-01 01:08:16 +0000
commit: c6fb86b40bebf597fccbe4eba58ceea83bd9700f (patch)
tree: ab703ac6f4e85e6df08c467bc48cb7ae670f5ba9 /build-aux
parent: 47f66e1aaf01d72e3b0db6eadbab378bfac96681 (diff)
parent: 186152ba400b58d2d278c52d2e3d896decae767e (diff)
download: emacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.tar.gz
emacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.zip
12 files changed, 12 insertions, 12 deletions
diff --git a/build-aux/config.guess b/build-aux/config.guess
index 7f9ebbe3109..4c8498faf3e 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2019 Free Software Foundation, Inc.
+#   Copyright 1992-2020 Free Software Foundation, Inc.
 timestamp='2019-09-10'
diff --git a/build-aux/config.sub b/build-aux/config.sub
index 0f2234c174d..df031b3c853 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2019 Free Software Foundation, Inc.
+#   Copyright 1992-2020 Free Software Foundation, Inc.
 timestamp='2019-06-30'
diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg
index 4ed261425d3..e84be4cbafe 100755
--- a/build-aux/git-hooks/commit-msg
+++ b/build-aux/git-hooks/commit-msg
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Check the format of GNU Emacs change log entries.
-# Copyright 2014-2019 Free Software Foundation, Inc.
+# Copyright 2014-2020 Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
diff --git a/build-aux/git-hooks/pre-commit b/build-aux/git-hooks/pre-commit
index e29a69f25b8..59fdaf58c1a 100755
--- a/build-aux/git-hooks/pre-commit
+++ b/build-aux/git-hooks/pre-commit
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Check file names in git commits for GNU Emacs.
-# Copyright 2014-2019 Free Software Foundation, Inc.
+# Copyright 2014-2020 Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
diff --git a/build-aux/git-hooks/prepare-commit-msg b/build-aux/git-hooks/prepare-commit-msg
index 3562a802234..dbb1264b495 100755
--- a/build-aux/git-hooks/prepare-commit-msg
+++ b/build-aux/git-hooks/prepare-commit-msg
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Check the format of GNU Emacs change log entries.
-# Copyright 2019 Free Software Foundation, Inc.
+# Copyright 2019-2020 Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index 163c48c8e21..511276757f5 100755
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -3,7 +3,7 @@
 # Convert git log output to ChangeLog format.
-# Copyright (C) 2008-2019 Free Software Foundation, Inc.
+# Copyright (C) 2008-2020 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/build-aux/gitlog-to-emacslog b/build-aux/gitlog-to-emacslog
index 7cd7c58c355..23702807efc 100755
--- a/build-aux/gitlog-to-emacslog
+++ b/build-aux/gitlog-to-emacslog
@@ -2,7 +2,7 @@
 # Convert git log output to ChangeLog format for GNU Emacs.
-# Copyright (C) 2014-2019 Free Software Foundation, Inc.
+# Copyright (C) 2014-2020 Free Software Foundation, Inc.
 # Author: Paul Eggert
diff --git a/build-aux/make-info-dir b/build-aux/make-info-dir
index 2dcac87b489..ee2197beb34 100755
--- a/build-aux/make-info-dir
+++ b/build-aux/make-info-dir
@@ -2,7 +2,7 @@
 ### make-info-dir - create info/dir, for systems without install-info
-## Copyright (C) 2013-2019 Free Software Foundation, Inc.
+## Copyright (C) 2013-2020 Free Software Foundation, Inc.
 ## Author: Glenn Morris <rgm@gnu.org>
 ## Maintainer: emacs-devel@gnu.org
diff --git a/build-aux/move-if-change b/build-aux/move-if-change
index 9073f1a5001..653dc981599 100755
--- a/build-aux/move-if-change
+++ b/build-aux/move-if-change
@@ -8,7 +8,7 @@ VERSION='2018-03-07 03:47'; # UTC
 # If you change this file with Emacs, please let the write hook
 # do its job.  Otherwise, update this string manually.
-# Copyright (C) 2002-2019 Free Software Foundation, Inc.
+# Copyright (C) 2002-2020 Free Software Foundation, Inc.
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/build-aux/msys-to-w32 b/build-aux/msys-to-w32
index 758d172355d..4e0b2aaebad 100755
--- a/build-aux/msys-to-w32
+++ b/build-aux/msys-to-w32
@@ -2,7 +2,7 @@
 # Convert a MSYS path list to Windows-native format.
 # Status is zero if successful, nonzero otherwise.
-# Copyright (C) 2013-2019 Free Software Foundation, Inc.
+# Copyright (C) 2013-2020 Free Software Foundation, Inc.
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/build-aux/update-copyright b/build-aux/update-copyright
index e4809f620d6..4f79b56be78 100755
--- a/build-aux/update-copyright
+++ b/build-aux/update-copyright
@@ -3,7 +3,7 @@
 # Update an FSF copyright year list to include the current year.
-# Copyright (C) 2009-2019 Free Software Foundation, Inc.
+# Copyright (C) 2009-2020 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/build-aux/update-subdirs b/build-aux/update-subdirs
index 75509956276..336029fb710 100755
--- a/build-aux/update-subdirs
+++ b/build-aux/update-subdirs
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Write into $1/subdirs.el a list of subdirs of directory $1.
-# Copyright (C) 1994-1995, 1997, 1999, 2001-2019 Free Software
+# Copyright (C) 1994-1995, 1997, 1999, 2001-2020 Free Software
 # Foundation, Inc.
 # This file is part of GNU Emacs.
author	Paul Eggert	2020-01-01 01:08:16 +0000
committer	Paul Eggert	2020-01-01 01:08:16 +0000
commit	c6fb86b40bebf597fccbe4eba58ceea83bd9700f (patch)
tree	ab703ac6f4e85e6df08c467bc48cb7ae670f5ba9 /build-aux
parent	47f66e1aaf01d72e3b0db6eadbab378bfac96681 (diff)
parent	186152ba400b58d2d278c52d2e3d896decae767e (diff)
download	emacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.tar.gz emacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.zip

diff --git a/build-aux/config.guess b/build-aux/config.guess index 7f9ebbe3109..4c8498faf3e 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess
@@ -1,6 +1,6 @@
1	#! /bin/sh	1	#! /bin/sh
2	# Attempt to guess a canonical system name.	2	# Attempt to guess a canonical system name.
3	# Copyright 1992-2019 Free Software Foundation, Inc.	3	# Copyright 1992-2020 Free Software Foundation, Inc.
4		4
5	timestamp='2019-09-10'	5	timestamp='2019-09-10'
6		6


diff --git a/build-aux/config.sub b/build-aux/config.sub index 0f2234c174d..df031b3c853 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub
@@ -1,6 +1,6 @@
1	#! /bin/sh	1	#! /bin/sh
2	# Configuration validation subroutine script.	2	# Configuration validation subroutine script.
3	# Copyright 1992-2019 Free Software Foundation, Inc.	3	# Copyright 1992-2020 Free Software Foundation, Inc.
4		4
5	timestamp='2019-06-30'	5	timestamp='2019-06-30'
6		6


diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg index 4ed261425d3..e84be4cbafe 100755 --- a/build-aux/git-hooks/commit-msg +++ b/build-aux/git-hooks/commit-msg
@@ -1,7 +1,7 @@
1	#!/bin/sh	1	#!/bin/sh
2	# Check the format of GNU Emacs change log entries.	2	# Check the format of GNU Emacs change log entries.
3		3
4	# Copyright 2014-2019 Free Software Foundation, Inc.	4	# Copyright 2014-2020 Free Software Foundation, Inc.
5		5
6	# This file is part of GNU Emacs.	6	# This file is part of GNU Emacs.
7		7


diff --git a/build-aux/git-hooks/pre-commit b/build-aux/git-hooks/pre-commit index e29a69f25b8..59fdaf58c1a 100755 --- a/build-aux/git-hooks/pre-commit +++ b/build-aux/git-hooks/pre-commit
@@ -1,7 +1,7 @@
1	#!/bin/sh	1	#!/bin/sh
2	# Check file names in git commits for GNU Emacs.	2	# Check file names in git commits for GNU Emacs.
3		3
4	# Copyright 2014-2019 Free Software Foundation, Inc.	4	# Copyright 2014-2020 Free Software Foundation, Inc.
5		5
6	# This file is part of GNU Emacs.	6	# This file is part of GNU Emacs.
7		7


diff --git a/build-aux/git-hooks/prepare-commit-msg b/build-aux/git-hooks/prepare-commit-msg index 3562a802234..dbb1264b495 100755 --- a/build-aux/git-hooks/prepare-commit-msg +++ b/build-aux/git-hooks/prepare-commit-msg
@@ -1,7 +1,7 @@
1	#!/bin/sh	1	#!/bin/sh
2	# Check the format of GNU Emacs change log entries.	2	# Check the format of GNU Emacs change log entries.
3		3
4	# Copyright 2019 Free Software Foundation, Inc.	4	# Copyright 2019-2020 Free Software Foundation, Inc.
5		5
6	# This file is part of GNU Emacs.	6	# This file is part of GNU Emacs.
7		7


diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index 163c48c8e21..511276757f5 100755 --- a/build-aux/gitlog-to-changelog +++ b/build-aux/gitlog-to-changelog
@@ -3,7 +3,7 @@
3		3
4	# Convert git log output to ChangeLog format.	4	# Convert git log output to ChangeLog format.
5		5
6	# Copyright (C) 2008-2019 Free Software Foundation, Inc.	6	# Copyright (C) 2008-2020 Free Software Foundation, Inc.
7	#	7	#
8	# This program is free software: you can redistribute it and/or modify	8	# This program is free software: you can redistribute it and/or modify
9	# it under the terms of the GNU General Public License as published by	9	# it under the terms of the GNU General Public License as published by


diff --git a/build-aux/gitlog-to-emacslog b/build-aux/gitlog-to-emacslog index 7cd7c58c355..23702807efc 100755 --- a/build-aux/gitlog-to-emacslog +++ b/build-aux/gitlog-to-emacslog
@@ -2,7 +2,7 @@
2		2
3	# Convert git log output to ChangeLog format for GNU Emacs.	3	# Convert git log output to ChangeLog format for GNU Emacs.
4		4
5	# Copyright (C) 2014-2019 Free Software Foundation, Inc.	5	# Copyright (C) 2014-2020 Free Software Foundation, Inc.
6		6
7	# Author: Paul Eggert	7	# Author: Paul Eggert
8		8


diff --git a/build-aux/make-info-dir b/build-aux/make-info-dir index 2dcac87b489..ee2197beb34 100755 --- a/build-aux/make-info-dir +++ b/build-aux/make-info-dir
@@ -2,7 +2,7 @@
2		2
3	### make-info-dir - create info/dir, for systems without install-info	3	### make-info-dir - create info/dir, for systems without install-info
4		4
5	## Copyright (C) 2013-2019 Free Software Foundation, Inc.	5	## Copyright (C) 2013-2020 Free Software Foundation, Inc.
6		6
7	## Author: Glenn Morris <rgm@gnu.org>	7	## Author: Glenn Morris <rgm@gnu.org>
8	## Maintainer: emacs-devel@gnu.org	8	## Maintainer: emacs-devel@gnu.org


diff --git a/build-aux/move-if-change b/build-aux/move-if-change index 9073f1a5001..653dc981599 100755 --- a/build-aux/move-if-change +++ b/build-aux/move-if-change
@@ -8,7 +8,7 @@ VERSION='2018-03-07 03:47'; # UTC
8	# If you change this file with Emacs, please let the write hook	8	# If you change this file with Emacs, please let the write hook
9	# do its job. Otherwise, update this string manually.	9	# do its job. Otherwise, update this string manually.
10		10
11	# Copyright (C) 2002-2019 Free Software Foundation, Inc.	11	# Copyright (C) 2002-2020 Free Software Foundation, Inc.
12		12
13	# This program is free software: you can redistribute it and/or modify	13	# This program is free software: you can redistribute it and/or modify
14	# it under the terms of the GNU General Public License as published by	14	# it under the terms of the GNU General Public License as published by


diff --git a/build-aux/msys-to-w32 b/build-aux/msys-to-w32 index 758d172355d..4e0b2aaebad 100755 --- a/build-aux/msys-to-w32 +++ b/build-aux/msys-to-w32
@@ -2,7 +2,7 @@
2	# Convert a MSYS path list to Windows-native format.	2	# Convert a MSYS path list to Windows-native format.
3	# Status is zero if successful, nonzero otherwise.	3	# Status is zero if successful, nonzero otherwise.
4		4
5	# Copyright (C) 2013-2019 Free Software Foundation, Inc.	5	# Copyright (C) 2013-2020 Free Software Foundation, Inc.
6		6
7	# This program is free software: you can redistribute it and/or modify	7	# This program is free software: you can redistribute it and/or modify
8	# it under the terms of the GNU General Public License as published by	8	# it under the terms of the GNU General Public License as published by


diff --git a/build-aux/update-copyright b/build-aux/update-copyright index e4809f620d6..4f79b56be78 100755 --- a/build-aux/update-copyright +++ b/build-aux/update-copyright
@@ -3,7 +3,7 @@
3		3
4	# Update an FSF copyright year list to include the current year.	4	# Update an FSF copyright year list to include the current year.
5		5
6	# Copyright (C) 2009-2019 Free Software Foundation, Inc.	6	# Copyright (C) 2009-2020 Free Software Foundation, Inc.
7	#	7	#
8	# This program is free software: you can redistribute it and/or modify	8	# This program is free software: you can redistribute it and/or modify
9	# it under the terms of the GNU General Public License as published by	9	# it under the terms of the GNU General Public License as published by


diff --git a/build-aux/update-subdirs b/build-aux/update-subdirs index 75509956276..336029fb710 100755 --- a/build-aux/update-subdirs +++ b/build-aux/update-subdirs
@@ -1,7 +1,7 @@
1	#!/bin/sh	1	#!/bin/sh
2	# Write into $1/subdirs.el a list of subdirs of directory $1.	2	# Write into $1/subdirs.el a list of subdirs of directory $1.
3		3
4	# Copyright (C) 1994-1995, 1997, 1999, 2001-2019 Free Software	4	# Copyright (C) 1994-1995, 1997, 1999, 2001-2020 Free Software
5	# Foundation, Inc.	5	# Foundation, Inc.
6		6
7	# This file is part of GNU Emacs.	7	# This file is part of GNU Emacs.