Merge from origin/emacs-25

ef33bc7 Spelling and grammar fixes 9c3dbab Fix copyright years by hand 0e96320 Update copyright year to 2016
author: John Wiegley 2016-01-11 22:48:07 -0800
committer: John Wiegley 2016-01-11 22:48:07 -0800
commit: 1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302 (patch)
tree: fc34bd815956a80c35f1e9a0f836a5378bf4b1ed /lib-src
parent: c043d9731b499a241830d705e9055c9e42ccf28c (diff)
parent: ef33bc7fcf7b2e9fc41706ebce3bfbc814b0e832 (diff)
download: emacs-1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302.tar.gz
emacs-1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302.zip
15 files changed, 16 insertions, 16 deletions
diff --git a/lib-src/ChangeLog.1 b/lib-src/ChangeLog.1
index 5b4154040da..030ef6fbb08 100644
--- a/lib-src/ChangeLog.1
+++ b/lib-src/ChangeLog.1
@@ -8609,7 +8609,7 @@
 ;; coding: utf-8
 ;; End:
-  Copyright (C) 1988-1999, 2001-2015 Free Software Foundation, Inc.
+  Copyright (C) 1988-1999, 2001-2016 Free Software Foundation, Inc.
  This file is part of GNU Emacs.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index b666508e593..150d943b7e2 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -1,6 +1,6 @@
 ### @configure_input@
-# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2015 Free Software
+# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2016 Free Software
 # Foundation, Inc.
 # This file is part of GNU Emacs.
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index f2093ae258f..cb09ab80879 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -1,6 +1,6 @@
 /* ebrowse.c --- parsing files for the ebrowse C++ browser
-Copyright (C) 1992-2015 Free Software Foundation, Inc.
+Copyright (C) 1992-2016 Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index c3e56351a48..c7cef8a2b20 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1,6 +1,6 @@
 /* Client process that communicates with GNU Emacs acting as server.
-Copyright (C) 1986-1987, 1994, 1999-2015 Free Software Foundation, Inc.
+Copyright (C) 1986-1987, 1994, 1999-2016 Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 3cb39689b8d..2192627c7e0 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -28,7 +28,7 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2015 Free Software
+Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2016 Free Software
 Foundation, Inc.
 This file is not considered part of GNU Emacs.
diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index ac493c2740c..833ea50b480 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -1,5 +1,5 @@
 /* Convert files for Emacs Hexl mode.
-   Copyright (C) 1989, 2001-2015 Free Software Foundation, Inc.
+   Copyright (C) 1989, 2001-2016 Free Software Foundation, Inc.
 Author: Keith Gabryelski
 (according to authors.el)
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 3d8f34f1a98..02b5e766ee2 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1,6 +1,6 @@
 /* Generate doc-string file for GNU Emacs from source files.
-Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2015 Free Software
+Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2016 Free Software
 Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 84c8ce24286..eb1962a8f6b 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -1,7 +1,7 @@
 /* movemail foo bar -- move file foo to file bar,
   locking file foo the way /bin/mail respects.
-Copyright (C) 1986, 1992-1994, 1996, 1999, 2001-2015 Free Software
+Copyright (C) 1986, 1992-1994, 1996, 1999, 2001-2016 Free Software
 Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index 37b847ba6e7..931a3abdf93 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -1,6 +1,6 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
-Copyright (C) 1994, 2001-2015 Free Software Foundation, Inc.
+Copyright (C) 1994, 2001-2016 Free Software Foundation, Inc.
 Author: Geoff Voelker (voelker@cs.washington.edu)
 Created: 10-8-94
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index 787a65d987f..a0c0d43bdc6 100644
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -1,5 +1,5 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
-   Copyright (C) 1994, 2002-2015 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002-2016 Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 42d302026ff..57a5e529daf 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1,6 +1,6 @@
 /* pop.c: client routines for talking to a POP3-protocol post-office server
-Copyright (C) 1991, 1993, 1996-1997, 1999, 2001-2015 Free Software
+Copyright (C) 1991, 1993, 1996-1997, 1999, 2001-2016 Free Software
 Foundation, Inc.
 Author: Jonathan Kamens <jik@security.ov.com>
diff --git a/lib-src/pop.h b/lib-src/pop.h
index cd8196939e2..4c67bdcb015 100644
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -1,5 +1,5 @@
 /* pop.h: Header file for the "pop.c" client POP3 protocol.
-   Copyright (C) 1991, 1993, 2001-2015 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1993, 2001-2016 Free Software Foundation, Inc.
 Author:  Jonathan Kamens <jik@security.ov.com>
diff --git a/lib-src/profile.c b/lib-src/profile.c
index ffaa2256567..da6232afbca 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -1,5 +1,5 @@
 /* profile.c --- generate periodic events for profiling of Emacs Lisp code.
-   Copyright (C) 1992, 1994, 1999, 2001-2015 Free Software Foundation,
+   Copyright (C) 1992, 1994, 1999, 2001-2016 Free Software Foundation,
   Inc.
 Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 4ee303d03a1..73213c5a37b 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -2,7 +2,7 @@
 # RCS to ChangeLog generator
-# Copyright (C) 1992-1998, 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 1992-1998, 2001-2016 Free Software Foundation, Inc.
 # Author: Paul Eggert <eggert@twinsun.com>
@@ -20,7 +20,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-Copyright='Copyright (C) 2015 Free Software Foundation, Inc.
+Copyright='Copyright (C) 2016 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.
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index 4f154832c81..3803a31c817 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -1,6 +1,6 @@
 /* update-game-score.c --- Update a score file
-Copyright (C) 2002-2015 Free Software Foundation, Inc.
+Copyright (C) 2002-2016 Free Software Foundation, Inc.
 Author: Colin Walters <walters@debian.org>
author	John Wiegley	2016-01-11 22:48:07 -0800
committer	John Wiegley	2016-01-11 22:48:07 -0800
commit	1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302 (patch)
tree	fc34bd815956a80c35f1e9a0f836a5378bf4b1ed /lib-src
parent	c043d9731b499a241830d705e9055c9e42ccf28c (diff)
parent	ef33bc7fcf7b2e9fc41706ebce3bfbc814b0e832 (diff)
download	emacs-1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302.tar.gz emacs-1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302.zip

diff --git a/lib-src/ChangeLog.1 b/lib-src/ChangeLog.1 index 5b4154040da..030ef6fbb08 100644 --- a/lib-src/ChangeLog.1 +++ b/lib-src/ChangeLog.1
@@ -8609,7 +8609,7 @@
8609	;; coding: utf-8	8609	;; coding: utf-8
8610	;; End:	8610	;; End:
8611		8611
8612	Copyright (C) 1988-1999, 2001-2015 Free Software Foundation, Inc.	8612	Copyright (C) 1988-1999, 2001-2016 Free Software Foundation, Inc.
8613		8613
8614	This file is part of GNU Emacs.	8614	This file is part of GNU Emacs.
8615		8615


diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index b666508e593..150d943b7e2 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in
@@ -1,6 +1,6 @@
1	### @configure_input@	1	### @configure_input@
2		2
3	# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2015 Free Software	3	# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2016 Free Software
4	# Foundation, Inc.	4	# Foundation, Inc.
5		5
6	# This file is part of GNU Emacs.	6	# This file is part of GNU Emacs.


diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index f2093ae258f..cb09ab80879 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c
@@ -1,6 +1,6 @@
1	/* ebrowse.c --- parsing files for the ebrowse C++ browser	1	/* ebrowse.c --- parsing files for the ebrowse C++ browser
2		2
3	Copyright (C) 1992-2015 Free Software Foundation, Inc.	3	Copyright (C) 1992-2016 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/lib-src/emacsclient.c b/lib-src/emacsclient.c index c3e56351a48..c7cef8a2b20 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c
@@ -1,6 +1,6 @@
1	/* Client process that communicates with GNU Emacs acting as server.	1	/* Client process that communicates with GNU Emacs acting as server.
2		2
3	Copyright (C) 1986-1987, 1994, 1999-2015 Free Software Foundation, Inc.	3	Copyright (C) 1986-1987, 1994, 1999-2016 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/lib-src/etags.c b/lib-src/etags.c index 3cb39689b8d..2192627c7e0 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c
@@ -28,7 +28,7 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
28	IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	28	IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29		29
30		30
31	Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2015 Free Software	31	Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2016 Free Software
32	Foundation, Inc.	32	Foundation, Inc.
33		33
34	This file is not considered part of GNU Emacs.	34	This file is not considered part of GNU Emacs.


diff --git a/lib-src/hexl.c b/lib-src/hexl.c index ac493c2740c..833ea50b480 100644 --- a/lib-src/hexl.c +++ b/lib-src/hexl.c
@@ -1,5 +1,5 @@
1	/* Convert files for Emacs Hexl mode.	1	/* Convert files for Emacs Hexl mode.
2	Copyright (C) 1989, 2001-2015 Free Software Foundation, Inc.	2	Copyright (C) 1989, 2001-2016 Free Software Foundation, Inc.
3		3
4	Author: Keith Gabryelski	4	Author: Keith Gabryelski
5	(according to authors.el)	5	(according to authors.el)


diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c index 3d8f34f1a98..02b5e766ee2 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c
@@ -1,6 +1,6 @@
1	/* Generate doc-string file for GNU Emacs from source files.	1	/* Generate doc-string file for GNU Emacs from source files.
2		2
3	Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2015 Free Software	3	Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2016 Free Software
4	Foundation, Inc.	4	Foundation, Inc.
5		5
6	This file is part of GNU Emacs.	6	This file is part of GNU Emacs.


diff --git a/lib-src/movemail.c b/lib-src/movemail.c index 84c8ce24286..eb1962a8f6b 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c
@@ -1,7 +1,7 @@
1	/* movemail foo bar -- move file foo to file bar,	1	/* movemail foo bar -- move file foo to file bar,
2	locking file foo the way /bin/mail respects.	2	locking file foo the way /bin/mail respects.
3		3
4	Copyright (C) 1986, 1992-1994, 1996, 1999, 2001-2015 Free Software	4	Copyright (C) 1986, 1992-1994, 1996, 1999, 2001-2016 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.


diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c index 37b847ba6e7..931a3abdf93 100644 --- a/lib-src/ntlib.c +++ b/lib-src/ntlib.c
@@ -1,6 +1,6 @@
1	/* Utility and Unix shadow routines for GNU Emacs support programs on NT.	1	/* Utility and Unix shadow routines for GNU Emacs support programs on NT.
2		2
3	Copyright (C) 1994, 2001-2015 Free Software Foundation, Inc.	3	Copyright (C) 1994, 2001-2016 Free Software Foundation, Inc.
4		4
5	Author: Geoff Voelker (voelker@cs.washington.edu)	5	Author: Geoff Voelker (voelker@cs.washington.edu)
6	Created: 10-8-94	6	Created: 10-8-94


diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h index 787a65d987f..a0c0d43bdc6 100644 --- a/lib-src/ntlib.h +++ b/lib-src/ntlib.h
@@ -1,5 +1,5 @@
1	/* Utility and Unix shadow routines for GNU Emacs support programs on NT.	1	/* Utility and Unix shadow routines for GNU Emacs support programs on NT.
2	Copyright (C) 1994, 2002-2015 Free Software Foundation, Inc.	2	Copyright (C) 1994, 2002-2016 Free Software Foundation, Inc.
3		3
4	This file is part of GNU Emacs.	4	This file is part of GNU Emacs.
5		5


diff --git a/lib-src/pop.c b/lib-src/pop.c index 42d302026ff..57a5e529daf 100644 --- a/lib-src/pop.c +++ b/lib-src/pop.c
@@ -1,6 +1,6 @@
1	/* pop.c: client routines for talking to a POP3-protocol post-office server	1	/* pop.c: client routines for talking to a POP3-protocol post-office server
2		2
3	Copyright (C) 1991, 1993, 1996-1997, 1999, 2001-2015 Free Software	3	Copyright (C) 1991, 1993, 1996-1997, 1999, 2001-2016 Free Software
4	Foundation, Inc.	4	Foundation, Inc.
5		5
6	Author: Jonathan Kamens <jik@security.ov.com>	6	Author: Jonathan Kamens <jik@security.ov.com>


diff --git a/lib-src/pop.h b/lib-src/pop.h index cd8196939e2..4c67bdcb015 100644 --- a/lib-src/pop.h +++ b/lib-src/pop.h
@@ -1,5 +1,5 @@
1	/* pop.h: Header file for the "pop.c" client POP3 protocol.	1	/* pop.h: Header file for the "pop.c" client POP3 protocol.
2	Copyright (C) 1991, 1993, 2001-2015 Free Software Foundation, Inc.	2	Copyright (C) 1991, 1993, 2001-2016 Free Software Foundation, Inc.
3		3
4	Author: Jonathan Kamens <jik@security.ov.com>	4	Author: Jonathan Kamens <jik@security.ov.com>
5		5


diff --git a/lib-src/profile.c b/lib-src/profile.c index ffaa2256567..da6232afbca 100644 --- a/lib-src/profile.c +++ b/lib-src/profile.c
@@ -1,5 +1,5 @@
1	/* profile.c --- generate periodic events for profiling of Emacs Lisp code.	1	/* profile.c --- generate periodic events for profiling of Emacs Lisp code.
2	Copyright (C) 1992, 1994, 1999, 2001-2015 Free Software Foundation,	2	Copyright (C) 1992, 1994, 1999, 2001-2016 Free Software Foundation,
3	Inc.	3	Inc.
4		4
5	Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>	5	Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>


diff --git a/lib-src/rcs2log b/lib-src/rcs2log index 4ee303d03a1..73213c5a37b 100755 --- a/lib-src/rcs2log +++ b/lib-src/rcs2log
@@ -2,7 +2,7 @@
2		2
3	# RCS to ChangeLog generator	3	# RCS to ChangeLog generator
4		4
5	# Copyright (C) 1992-1998, 2001-2015 Free Software Foundation, Inc.	5	# Copyright (C) 1992-1998, 2001-2016 Free Software Foundation, Inc.
6		6
7	# Author: Paul Eggert <eggert@twinsun.com>	7	# Author: Paul Eggert <eggert@twinsun.com>
8		8
@@ -20,7 +20,7 @@
20	# along with this program. If not, see <http://www.gnu.org/licenses/>.	20	# along with this program. If not, see <http://www.gnu.org/licenses/>.
21		21
22		22
23	Copyright='Copyright (C) 2015 Free Software Foundation, Inc.	23	Copyright='Copyright (C) 2016 Free Software Foundation, Inc.
24	This program comes with NO WARRANTY, to the extent permitted by law.	24	This program comes with NO WARRANTY, to the extent permitted by law.
25	You may redistribute copies of this program	25	You may redistribute copies of this program
26	under the terms of the GNU General Public License.	26	under the terms of the GNU General Public License.


diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c index 4f154832c81..3803a31c817 100644 --- a/lib-src/update-game-score.c +++ b/lib-src/update-game-score.c
@@ -1,6 +1,6 @@
1	/* update-game-score.c --- Update a score file	1	/* update-game-score.c --- Update a score file
2		2
3	Copyright (C) 2002-2015 Free Software Foundation, Inc.	3	Copyright (C) 2002-2016 Free Software Foundation, Inc.
4		4
5	Author: Colin Walters <walters@debian.org>	5	Author: Colin Walters <walters@debian.org>
6		6