Merge from origin/emacs-25

2e2a806 Fix copyright years by hand 5badc81 Update copyright year to 2017
author: Paul Eggert 2017-01-01 01:10:47 -0800
committer: Paul Eggert 2017-01-01 01:10:47 -0800
commit: bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 (patch)
tree: dc5dde303bce1fbe4f04300c3691cc1ee5874f43 /oldXMenu
parent: 772ca5db3eccdc0439d7bd18f98b7fdd38eb6397 (diff)
parent: 2e2a8068031b79a6cc5502b8d4c9d849ebb1dae0 (diff)
download: emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.tar.gz
emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.zip
8 files changed, 8 insertions, 8 deletions
diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index 0b812c5f5f0..876cb3d06ba 100644
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -3,7 +3,7 @@
 #include "copyright.h"
 /*
-Copyright (C) 2001-2016 Free Software Foundation, Inc.
+Copyright (C) 2001-2017 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 ad8f7273721..8fa3794a36e 100644
--- a/oldXMenu/ChangeLog.1
+++ b/oldXMenu/ChangeLog.1
@@ -712,7 +712,7 @@
 ;; coding: utf-8
 ;; End:
-  Copyright (C) 1993-1999, 2001-2016 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2017 Free Software Foundation, Inc.
  This file is part of GNU Emacs.
diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c
index 2fd86b2db01..0e72a2d2e58 100644
--- a/oldXMenu/Create.c
+++ b/oldXMenu/Create.c
@@ -3,7 +3,7 @@
 #include "copyright.h"
 /*
-Copyright (C) 1993-1994, 2001-2016 Free Software Foundation, Inc.
+Copyright (C) 1993-1994, 2001-2017 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 991e1caf87f..7440b3dd9ce 100644
--- a/oldXMenu/FindSel.c
+++ b/oldXMenu/FindSel.c
@@ -3,7 +3,7 @@
 #include "copyright.h"
 /*
-Copyright (C) 2001-2016 Free Software Foundation, Inc.
+Copyright (C) 2001-2017 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 45cdf4d647c..aa9cf167f75 100644
--- a/oldXMenu/Internal.c
+++ b/oldXMenu/Internal.c
@@ -3,7 +3,7 @@
 #include "copyright.h"
 /*
-Copyright (C) 1993, 1996, 2001-2016 Free Software Foundation, Inc.
+Copyright (C) 1993, 1996, 2001-2017 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 a695e731578..46061ab7ae4 100644
--- a/oldXMenu/Makefile.in
+++ b/oldXMenu/Makefile.in
@@ -15,7 +15,7 @@
 ## without express or implied warranty.
-## Copyright (C) 2001-2016 Free Software Foundation, Inc.
+## Copyright (C) 2001-2017 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 4616a7cd80a..bbd98ca7c20 100644
--- a/oldXMenu/deps.mk
+++ b/oldXMenu/deps.mk
@@ -15,7 +15,7 @@
 ## without express or implied warranty.
-## Copyright (C) 2001-2016 Free Software Foundation, Inc.
+## Copyright (C) 2001-2017 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 c044ff0141a..2906f9c0409 100644
--- a/oldXMenu/insque.c
+++ b/oldXMenu/insque.c
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 1993-1998, 2001-2016 Free Software Foundation, Inc.
+Copyright (C) 1993-1998, 2001-2017 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	2017-01-01 01:10:47 -0800
committer	Paul Eggert	2017-01-01 01:10:47 -0800
commit	bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 (patch)
tree	dc5dde303bce1fbe4f04300c3691cc1ee5874f43 /oldXMenu
parent	772ca5db3eccdc0439d7bd18f98b7fdd38eb6397 (diff)
parent	2e2a8068031b79a6cc5502b8d4c9d849ebb1dae0 (diff)
download	emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.tar.gz emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.zip

diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c index 0b812c5f5f0..876cb3d06ba 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-2016 Free Software Foundation, Inc.	6	Copyright (C) 2001-2017 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 ad8f7273721..8fa3794a36e 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-2016 Free Software Foundation, Inc.	715	Copyright (C) 1993-1999, 2001-2017 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 2fd86b2db01..0e72a2d2e58 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-2016 Free Software Foundation, Inc.	6	Copyright (C) 1993-1994, 2001-2017 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 991e1caf87f..7440b3dd9ce 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-2016 Free Software Foundation, Inc.	6	Copyright (C) 2001-2017 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 45cdf4d647c..aa9cf167f75 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-2016 Free Software Foundation, Inc.	6	Copyright (C) 1993, 1996, 2001-2017 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 a695e731578..46061ab7ae4 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-2016 Free Software Foundation, Inc.	18	## Copyright (C) 2001-2017 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 4616a7cd80a..bbd98ca7c20 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-2016 Free Software Foundation, Inc.	18	## Copyright (C) 2001-2017 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 c044ff0141a..2906f9c0409 100644 --- a/oldXMenu/insque.c +++ b/oldXMenu/insque.c
@@ -1,5 +1,5 @@
1	/*	1	/*
2	Copyright (C) 1993-1998, 2001-2016 Free Software Foundation, Inc.	2	Copyright (C) 1993-1998, 2001-2017 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