aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorStefan Monnier2011-01-14 12:18:41 -0500
committerStefan Monnier2011-01-14 12:18:41 -0500
commit77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch)
tree258514dac7faab41642d8f319eb113c8a5f09690 /lib-src
parent8faba62c38f67693535c3471d867e66757b3b04e (diff)
parentfb724e553757e9d3344be443ab5f329afc9bf91c (diff)
downloademacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz
emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.zip
Merge from emacs-23
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/emacsclient.c2
-rw-r--r--lib-src/fakemail.c2
-rwxr-xr-xlib-src/grep-changelog2
-rw-r--r--lib-src/hexl.c2
-rw-r--r--lib-src/make-docfile.c2
-rw-r--r--lib-src/makefile.w32-in2
-rw-r--r--lib-src/movemail.c2
-rw-r--r--lib-src/ntlib.c2
-rw-r--r--lib-src/ntlib.h2
-rw-r--r--lib-src/pop.c2
-rw-r--r--lib-src/pop.h2
-rw-r--r--lib-src/profile.c2
-rwxr-xr-xlib-src/rcs-checkin2
-rw-r--r--lib-src/test-distrib.c2
-rw-r--r--lib-src/update-game-score.c2
-rwxr-xr-xlib-src/vcdiff2
16 files changed, 16 insertions, 16 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 48ea3d22dc9..84a2208c3e8 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 Copyright (C) 1986, 1987, 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2 Copyright (C) 1986, 1987, 1994, 1999, 2000, 2001, 2002, 2003, 2004,
3 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 3 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index 16baeb266a8..390047ab077 100644
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -1,6 +1,6 @@
1/* sendmail-like interface to /bin/mail for system V, 1/* sendmail-like interface to /bin/mail for system V,
2 Copyright (C) 1985, 1994, 1999, 2001, 2002, 2003, 2004, 2 Copyright (C) 1985, 1994, 1999, 2001, 2002, 2003, 2004,
3 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 3 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
4 4
5Author: Bill Rozas <jinx@martigny.ai.mit.edu> 5Author: Bill Rozas <jinx@martigny.ai.mit.edu>
6(according to ack.texi) 6(according to ack.texi)
diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog
index b63ae90eafb..e3e73768435 100755
--- a/lib-src/grep-changelog
+++ b/lib-src/grep-changelog
@@ -1,7 +1,7 @@
1#! /usr/bin/perl 1#! /usr/bin/perl
2 2
3# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 3# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
4# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 4# 2005, 2006, 2007, 2008, 2009, 2010, 2011 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/lib-src/hexl.c b/lib-src/hexl.c
index b31ab812534..ce83428fb43 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -1,6 +1,6 @@
1/* Convert files for Emacs Hexl mode. 1/* Convert files for Emacs Hexl mode.
2 Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2 Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
3 2009, 2010 Free Software Foundation, Inc. 3 2009, 2010, 2011 Free Software Foundation, Inc.
4 4
5Author: Keith Gabryelski 5Author: Keith Gabryelski
6(according to authors.el) 6(according to authors.el)
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index e2dc99214d2..af3add0ed76 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 Copyright (C) 1985, 1986, 1992, 1993, 1994, 1997, 1999, 2000, 2001, 2 Copyright (C) 1985, 1986, 1992, 1993, 1994, 1997, 1999, 2000, 2001,
3 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 3 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
4 Free Software Foundation, Inc. 4 Free Software Foundation, Inc.
5 5
6This file is part of GNU Emacs. 6This file is part of GNU Emacs.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 5591f0edbed..3ef08982ec0 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -1,6 +1,6 @@
1# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API. 1# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
2# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
3# 2009, 2010 Free Software Foundation, Inc. 3# 2009, 2010, 2011 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/movemail.c b/lib-src/movemail.c
index f300942427e..bbd6e0a6b8b 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 Copyright (C) 1986, 1992, 1993, 1994, 1996, 1999, 2001, 2002, 2003, 2004, 3 Copyright (C) 1986, 1992, 1993, 1994, 1996, 1999, 2001, 2002, 2003, 2004,
4 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 4 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
5 5
6This file is part of GNU Emacs. 6This file is part of GNU Emacs.
7 7
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index c24b35d9a19..811080eb9db 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 Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2 Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
3 2008, 2009, 2010 Free Software Foundation, Inc. 3 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index 4dd6a32ee32..f2e5a12daf3 100644
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -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 Copyright (C) 1994, 2002, 2003, 2004, 2005, 2006, 2007, 2 Copyright (C) 1994, 2002, 2003, 2004, 2005, 2006, 2007,
3 2008, 2009, 2010 Free Software Foundation, Inc. 3 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 9eabbd2041e..da7b2a5bf9a 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 Copyright (C) 1991, 1993, 1996, 1997, 1999, 2001, 2002, 2003, 2004, 2 Copyright (C) 1991, 1993, 1996, 1997, 1999, 2001, 2002, 2003, 2004,
3 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 3 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
4 4
5Author: Jonathan Kamens <jik@security.ov.com> 5Author: Jonathan Kamens <jik@security.ov.com>
6 6
diff --git a/lib-src/pop.h b/lib-src/pop.h
index 2ba3fab83a0..6915dc8d729 100644
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -1,6 +1,6 @@
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, 2002, 2003, 2004, 2005, 2006, 2007, 2 Copyright (C) 1991, 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
3 2008, 2009, 2010 Free Software Foundation, Inc. 3 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
4 4
5Author: Jonathan Kamens <jik@security.ov.com> 5Author: Jonathan Kamens <jik@security.ov.com>
6 6
diff --git a/lib-src/profile.c b/lib-src/profile.c
index 37653e63c49..e8832a3d776 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -1,6 +1,6 @@
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, 2002, 2003, 2004, 2005, 2006, 2 Copyright (C) 1992, 1994, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
3 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 3 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
4 4
5Author: Boaz Ben-Zvi <boaz@lcs.mit.edu> 5Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>
6 6
diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin
index f82e03bdcf1..be3fa1e5b8c 100755
--- a/lib-src/rcs-checkin
+++ b/lib-src/rcs-checkin
@@ -3,7 +3,7 @@
3# This script accepts any number of file arguments and checks them into RCS. 3# This script accepts any number of file arguments and checks them into RCS.
4 4
5# Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 5# Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006,
6# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 6# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
7 7
8# This file is part of GNU Emacs. 8# This file is part of GNU Emacs.
9 9
diff --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c
index aca46f121fa..23a9716c688 100644
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -1,7 +1,7 @@
1/* test-distrib.c --- testing distribution of nonprinting chars 1/* test-distrib.c --- testing distribution of nonprinting chars
2 2
3Copyright (C) 1987, 1993, 1994, 1995, 1999, 2001, 2002, 2003, 2004, 2005, 3Copyright (C) 1987, 1993, 1994, 1995, 1999, 2001, 2002, 2003, 2004, 2005,
4 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 4 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
5 5
6This file is part of GNU Emacs. 6This file is part of GNU Emacs.
7 7
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index b8e1147d1c1..fdb5a44d456 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
3Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 3Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
4 Free Software Foundation, Inc. 4 Free Software Foundation, Inc.
5 5
6Author: Colin Walters <walters@debian.org> 6Author: Colin Walters <walters@debian.org>
diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 1d08e5d194f..4bf751b0450 100755
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -4,7 +4,7 @@
4# This version is more compatible with rcsdiff(1). 4# This version is more compatible with rcsdiff(1).
5 5
6# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005, 6# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005,
7# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 7# 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
8 8
9# Author: Paul Eggert 9# Author: Paul Eggert
10# (according to authors.el) 10# (according to authors.el)