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 /oldXMenu
parent: 47f66e1aaf01d72e3b0db6eadbab378bfac96681 (diff)
parent: 186152ba400b58d2d278c52d2e3d896decae767e (diff)
download: emacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.tar.gz
emacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.zip
8 files changed, 8 insertions, 8 deletions
diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index a0d1f70b9d0..c919d65ee7d 100644
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -3,7 +3,7 @@
 #include "copyright.h"
 /*
-Copyright (C) 2001-2019 Free Software Foundation, Inc.
+Copyright (C) 2001-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/oldXMenu/ChangeLog.1 b/oldXMenu/ChangeLog.1
index 0e76897710b..bae205ae623 100644
--- a/oldXMenu/ChangeLog.1
+++ b/oldXMenu/ChangeLog.1
@@ -712,7 +712,7 @@
 ;; coding: utf-8
 ;; End:
-  Copyright (C) 1993-1999, 2001-2019 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2020 Free Software Foundation, Inc.
  This file is part of GNU Emacs.
diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c
index 58d17826623..3d1a3bfc0e4 100644
--- a/oldXMenu/Create.c
+++ b/oldXMenu/Create.c
@@ -3,7 +3,7 @@
 #include "copyright.h"
 /*
-Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
+Copyright (C) 1993-1994, 2001-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/oldXMenu/FindSel.c b/oldXMenu/FindSel.c
index af084104ca4..58c27c5881a 100644
--- a/oldXMenu/FindSel.c
+++ b/oldXMenu/FindSel.c
@@ -3,7 +3,7 @@
 #include "copyright.h"
 /*
-Copyright (C) 2001-2019 Free Software Foundation, Inc.
+Copyright (C) 2001-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/oldXMenu/Internal.c b/oldXMenu/Internal.c
index 074e4f98b94..c81db9838f9 100644
--- a/oldXMenu/Internal.c
+++ b/oldXMenu/Internal.c
@@ -3,7 +3,7 @@
 #include "copyright.h"
 /*
-Copyright (C) 1993, 1996, 2001-2019 Free Software Foundation, Inc.
+Copyright (C) 1993, 1996, 2001-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/oldXMenu/Makefile.in b/oldXMenu/Makefile.in
index db76e7420dd..9c814fd2219 100644
--- a/oldXMenu/Makefile.in
+++ b/oldXMenu/Makefile.in
@@ -15,7 +15,7 @@
 ## without express or implied warranty.
-## Copyright (C) 2001-2019 Free Software Foundation, Inc.
+## Copyright (C) 2001-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/oldXMenu/deps.mk b/oldXMenu/deps.mk
index f5e3a255e86..9744c4818f1 100644
--- a/oldXMenu/deps.mk
+++ b/oldXMenu/deps.mk
@@ -15,7 +15,7 @@
 ## without express or implied warranty.
-## Copyright (C) 2001-2019 Free Software Foundation, Inc.
+## Copyright (C) 2001-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/oldXMenu/insque.c b/oldXMenu/insque.c
index 4732bcedd41..72a0cc8c0c5 100644
--- a/oldXMenu/insque.c
+++ b/oldXMenu/insque.c
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 1993-1998, 2001-2019 Free Software Foundation, Inc.
+Copyright (C) 1993-1998, 2001-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
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 /oldXMenu
parent	47f66e1aaf01d72e3b0db6eadbab378bfac96681 (diff)
parent	186152ba400b58d2d278c52d2e3d896decae767e (diff)
download	emacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.tar.gz emacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.zip

diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c index a0d1f70b9d0..c919d65ee7d 100644 --- a/oldXMenu/Activate.c +++ b/oldXMenu/Activate.c
@@ -3,7 +3,7 @@
3	#include "copyright.h"	3	#include "copyright.h"
4		4
5	/*	5	/*
6	Copyright (C) 2001-2019 Free Software Foundation, Inc.	6	Copyright (C) 2001-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/oldXMenu/ChangeLog.1 b/oldXMenu/ChangeLog.1 index 0e76897710b..bae205ae623 100644 --- a/oldXMenu/ChangeLog.1 +++ b/oldXMenu/ChangeLog.1
@@ -712,7 +712,7 @@
712	;; coding: utf-8	712	;; coding: utf-8
713	;; End:	713	;; End:
714		714
715	Copyright (C) 1993-1999, 2001-2019 Free Software Foundation, Inc.	715	Copyright (C) 1993-1999, 2001-2020 Free Software Foundation, Inc.
716		716
717	This file is part of GNU Emacs.	717	This file is part of GNU Emacs.
718		718


diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c index 58d17826623..3d1a3bfc0e4 100644 --- a/oldXMenu/Create.c +++ b/oldXMenu/Create.c
@@ -3,7 +3,7 @@
3	#include "copyright.h"	3	#include "copyright.h"
4		4
5	/*	5	/*
6	Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.	6	Copyright (C) 1993-1994, 2001-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/oldXMenu/FindSel.c b/oldXMenu/FindSel.c index af084104ca4..58c27c5881a 100644 --- a/oldXMenu/FindSel.c +++ b/oldXMenu/FindSel.c
@@ -3,7 +3,7 @@
3	#include "copyright.h"	3	#include "copyright.h"
4		4
5	/*	5	/*
6	Copyright (C) 2001-2019 Free Software Foundation, Inc.	6	Copyright (C) 2001-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/oldXMenu/Internal.c b/oldXMenu/Internal.c index 074e4f98b94..c81db9838f9 100644 --- a/oldXMenu/Internal.c +++ b/oldXMenu/Internal.c
@@ -3,7 +3,7 @@
3	#include "copyright.h"	3	#include "copyright.h"
4		4
5	/*	5	/*
6	Copyright (C) 1993, 1996, 2001-2019 Free Software Foundation, Inc.	6	Copyright (C) 1993, 1996, 2001-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/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index db76e7420dd..9c814fd2219 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in
@@ -15,7 +15,7 @@
15	## without express or implied warranty.	15	## without express or implied warranty.
16		16
17		17
18	## Copyright (C) 2001-2019 Free Software Foundation, Inc.	18	## Copyright (C) 2001-2020 Free Software Foundation, Inc.
19		19
20	## This program is free software: you can redistribute it and/or modify	20	## This program is free software: you can redistribute it and/or modify
21	## it under the terms of the GNU General Public License as published by	21	## it under the terms of the GNU General Public License as published by


diff --git a/oldXMenu/deps.mk b/oldXMenu/deps.mk index f5e3a255e86..9744c4818f1 100644 --- a/oldXMenu/deps.mk +++ b/oldXMenu/deps.mk
@@ -15,7 +15,7 @@
15	## without express or implied warranty.	15	## without express or implied warranty.
16		16
17		17
18	## Copyright (C) 2001-2019 Free Software Foundation, Inc.	18	## Copyright (C) 2001-2020 Free Software Foundation, Inc.
19		19
20	## This program is free software: you can redistribute it and/or modify	20	## This program is free software: you can redistribute it and/or modify
21	## it under the terms of the GNU General Public License as published by	21	## it under the terms of the GNU General Public License as published by


diff --git a/oldXMenu/insque.c b/oldXMenu/insque.c index 4732bcedd41..72a0cc8c0c5 100644 --- a/oldXMenu/insque.c +++ b/oldXMenu/insque.c
@@ -1,5 +1,5 @@
1	/*	1	/*
2	Copyright (C) 1993-1998, 2001-2019 Free Software Foundation, Inc.	2	Copyright (C) 1993-1998, 2001-2020 Free Software Foundation, Inc.
3		3
4	This program is free software: you can redistribute it and/or modify	4	This program is free software: you can redistribute it and/or modify
5	it under the terms of the GNU General Public License as published by	5	it under the terms of the GNU General Public License as published by