aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorPaul Eggert2013-01-02 08:13:04 -0800
committerPaul Eggert2013-01-02 08:13:04 -0800
commit0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch)
tree08e9265a1dd95974dc72622a9bef194682c0c716 /lib-src
parentaca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff)
parentd8fb8cce84b923a3289b69549e30958710ac3ebb (diff)
downloademacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz
emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.zip
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog2
-rw-r--r--lib-src/Makefile.in4
-rw-r--r--lib-src/ebrowse.c2
-rw-r--r--lib-src/emacsclient.c2
-rw-r--r--lib-src/etags.c4
-rwxr-xr-xlib-src/grep-changelog2
-rw-r--r--lib-src/hexl.c2
-rw-r--r--lib-src/make-docfile.c4
-rw-r--r--lib-src/makefile.w32-in2
-rw-r--r--lib-src/movemail.c4
-rw-r--r--lib-src/ntlib.c2
-rw-r--r--lib-src/ntlib.h2
-rw-r--r--lib-src/pop.c4
-rw-r--r--lib-src/pop.h2
-rw-r--r--lib-src/profile.c3
-rwxr-xr-xlib-src/rcs2log2
-rw-r--r--lib-src/test-distrib.c3
-rw-r--r--lib-src/update-game-score.c2
18 files changed, 25 insertions, 23 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 33eac5b9b67..92b970eb778 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -8483,7 +8483,7 @@
8483;; coding: utf-8 8483;; coding: utf-8
8484;; End: 8484;; End:
8485 8485
8486 Copyright (C) 1988-1999, 2001-2012 Free Software Foundation, Inc. 8486 Copyright (C) 1988-1999, 2001-2013 Free Software Foundation, Inc.
8487 8487
8488 This file is part of GNU Emacs. 8488 This file is part of GNU Emacs.
8489 8489
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index d271bb3a4fa..8a6960ee2fe 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -1,6 +1,6 @@
1# Makefile for lib-src subdirectory in GNU Emacs. 1# Makefile for lib-src subdirectory in GNU Emacs.
2# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2012 2# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2013 Free Software
3# Free Software Foundation, Inc. 3# 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/ebrowse.c b/lib-src/ebrowse.c
index 056ed471fde..3a237daf5f8 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
3Copyright (C) 1992-2012 Free Software Foundation, Inc. 3Copyright (C) 1992-2013 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/emacsclient.c b/lib-src/emacsclient.c
index 021ac6eb247..6feaf18ba60 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
3Copyright (C) 1986-1987, 1994, 1999-2012 Free Software Foundation, Inc. 3Copyright (C) 1986-1987, 1994, 1999-2013 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/etags.c b/lib-src/etags.c
index d393c4d2e4a..ec96f45fc94 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -28,8 +28,8 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
28IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 29
30 30
31Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2012 31Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2013 Free Software
32 Free Software Foundation, Inc. 32Foundation, Inc.
33 33
34This file is not considered part of GNU Emacs. 34This file is not considered part of GNU Emacs.
35 35
diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog
index 5477de7b577..ace4d48df3e 100755
--- a/lib-src/grep-changelog
+++ b/lib-src/grep-changelog
@@ -1,6 +1,6 @@
1#! /usr/bin/perl 1#! /usr/bin/perl
2 2
3# Copyright (C) 1999-2012 Free Software Foundation, Inc. 3# Copyright (C) 1999-2013 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/hexl.c b/lib-src/hexl.c
index 08da0075269..3208a895aa2 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-2012 Free Software Foundation, Inc. 2 Copyright (C) 1989, 2001-2013 Free Software Foundation, Inc.
3 3
4Author: Keith Gabryelski 4Author: 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 68e7029ee85..54a53c0d441 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1,7 +1,7 @@
1/* Generate doc-string file for GNU Emacs from source files. 1/* Generate doc-string file for GNU Emacs from source files.
2 2
3Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2012 3Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2013 Free Software
4 Free Software Foundation, Inc. 4Foundation, Inc.
5 5
6This file is part of GNU Emacs. 6This file is part of GNU Emacs.
7 7
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 51367f6a24b..8d016bc16be 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -1,5 +1,5 @@
1# -*- Makefile -*- for GNU Emacs on the Microsoft Windows API. 1# -*- Makefile -*- for GNU Emacs on the Microsoft Windows API.
2# Copyright (C) 2000-2012 Free Software Foundation, Inc. 2# Copyright (C) 2000-2013 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/movemail.c b/lib-src/movemail.c
index f2b2484c8e3..616cbde5394 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -1,8 +1,8 @@
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
4Copyright (C) 1986, 1992-1994, 1996, 1999, 2001-2012 4Copyright (C) 1986, 1992-1994, 1996, 1999, 2001-2013 Free Software
5 Free Software Foundation, Inc. 5Foundation, Inc.
6 6
7This file is part of GNU Emacs. 7This file is part of GNU Emacs.
8 8
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index 4e125eb6d73..f43117457cb 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
3Copyright (C) 1994, 2001-2012 Free Software Foundation, Inc. 3Copyright (C) 1994, 2001-2013 Free Software Foundation, Inc.
4 4
5Author: Geoff Voelker (voelker@cs.washington.edu) 5Author: Geoff Voelker (voelker@cs.washington.edu)
6Created: 10-8-94 6Created: 10-8-94
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index 7502a8a8b34..1b2f57f35e5 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-2012 Free Software Foundation, Inc. 2 Copyright (C) 1994, 2002-2013 Free Software Foundation, Inc.
3 3
4This file is part of GNU Emacs. 4This file is part of GNU Emacs.
5 5
diff --git a/lib-src/pop.c b/lib-src/pop.c
index bfbcb8c9466..ba384db3d19 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1,7 +1,7 @@
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
3Copyright (C) 1991, 1993, 1996-1997, 1999, 2001-2012 3Copyright (C) 1991, 1993, 1996-1997, 1999, 2001-2013 Free Software
4 Free Software Foundation, Inc. 4Foundation, Inc.
5 5
6Author: Jonathan Kamens <jik@security.ov.com> 6Author: Jonathan Kamens <jik@security.ov.com>
7 7
diff --git a/lib-src/pop.h b/lib-src/pop.h
index 682a7f93dc5..dbc7c8dbe64 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-2012 Free Software Foundation, Inc. 2 Copyright (C) 1991, 1993, 2001-2013 Free Software Foundation, Inc.
3 3
4Author: Jonathan Kamens <jik@security.ov.com> 4Author: Jonathan Kamens <jik@security.ov.com>
5 5
diff --git a/lib-src/profile.c b/lib-src/profile.c
index 3489e492543..ab17b52ca28 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -1,5 +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-2012 Free Software Foundation, Inc. 2 Copyright (C) 1992, 1994, 1999, 2001-2013 Free Software Foundation,
3 Inc.
3 4
4Author: Boaz Ben-Zvi <boaz@lcs.mit.edu> 5Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>
5 6
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 3ed54684a7e..724bd4d696c 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-2012 Free Software Foundation, Inc. 5# Copyright (C) 1992-1998, 2001-2013 Free Software Foundation, Inc.
6 6
7# Author: Paul Eggert <eggert@twinsun.com> 7# Author: Paul Eggert <eggert@twinsun.com>
8 8
diff --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c
index b404c8230d1..42aef07870f 100644
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -1,6 +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-1995, 1999, 2001-2012 Free Software Foundation, Inc. 3Copyright (C) 1987, 1993-1995, 1999, 2001-2013 Free Software Foundation,
4Inc.
4 5
5This file is part of GNU Emacs. 6This file is part of GNU Emacs.
6 7
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index 59cab61aa29..29c81a8936c 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-2012 Free Software Foundation, Inc. 3Copyright (C) 2002-2013 Free Software Foundation, Inc.
4 4
5Author: Colin Walters <walters@debian.org> 5Author: Colin Walters <walters@debian.org>
6 6
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-17 00:11:32 +0000