summaryrefslogtreecommitdiff
path: root/nt
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2006-02-08 04:26:44 +0000
committerMiles Bader <miles@gnu.org>2006-02-08 04:26:44 +0000
commit380874900ca183ec2fdce91949d841328852d7a8 (patch)
tree6918a4182f8657251e83223511aa7827fb8820ed /nt
parent72b464afc12a7532fc8555352db04c65647c15ae (diff)
parentc96ec15a58817ac97db5348187e2d8695f609cb5 (diff)
downloademacs-380874900ca183ec2fdce91949d841328852d7a8.tar.gz
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 43-57) - Update from CVS - Merge from erc--emacs--0 - Make constrain-to-field notice overlays - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 18-21) - Update from CVS - Merge from emacs--devo--0
Diffstat (limited to 'nt')
-rw-r--r--nt/ChangeLog2
-rw-r--r--nt/INSTALL3
-rw-r--r--nt/README3
-rw-r--r--nt/addpm.c3
-rw-r--r--nt/addsection.c3
-rw-r--r--nt/cmdproxy.c3
-rw-r--r--nt/config.nt2
-rwxr-xr-xnt/configure.bat4
-rw-r--r--nt/ddeclient.c3
-rw-r--r--nt/emacs.rc2
-rw-r--r--nt/envadd.bat2
-rw-r--r--nt/gmake.defs4
-rwxr-xr-xnt/inc/grp.h2
-rw-r--r--nt/inc/sys/socket.h3
-rw-r--r--nt/makefile.w32-in2
-rw-r--r--nt/multi-install-info.bat2
-rw-r--r--nt/nmake.defs2
-rw-r--r--nt/paths.h2
-rw-r--r--nt/preprep.c3
-rw-r--r--nt/runemacs.c2
20 files changed, 30 insertions, 22 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index cc161f830e6..097f1f1e2af 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1204,7 +1204,7 @@
;; End:
Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted provided the copyright notice and this notice are preserved.
diff --git a/nt/INSTALL b/nt/INSTALL
index d756585ce20..c0706e3dadf 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -1,7 +1,8 @@
Building and Installing Emacs
on Windows NT/2K/XP and Windows 95/98/ME
- Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
See the end of the file for copying permissions.
If you used WinZip to unpack the distribution, we suggest to
diff --git a/nt/README b/nt/README
index 0bb1625fecd..b1d7cb5ae57 100644
--- a/nt/README
+++ b/nt/README
@@ -1,6 +1,7 @@
Emacs for Windows NT/2000 and Windows 95/98/ME
- Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
See the end of the INSTALL file in this directory for copying permissions.
This directory contains support for compiling and running GNU Emacs on
diff --git a/nt/addpm.c b/nt/addpm.c
index 0827d2453c0..65a403b7eaf 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -1,5 +1,6 @@
/* Add entries to the GNU Emacs Program Manager folder.
- Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/nt/addsection.c b/nt/addsection.c
index 5a58f3e1c07..b6d119fe6a8 100644
--- a/nt/addsection.c
+++ b/nt/addsection.c
@@ -1,5 +1,6 @@
/* Add an uninitialized data section to an executable.
- Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index be7c7531bf6..0b47ecd52b9 100644
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -1,5 +1,6 @@
/* Proxy shell designed for use with Emacs on Windows 95 and NT.
- Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
Accepts subset of Unix sh(1) command-line options, for compatability
with elisp code written for Unix. When possible, executes external
diff --git a/nt/config.nt b/nt/config.nt
index 0f66a441c7b..482d2e6052b 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1,6 +1,6 @@
/* GNU Emacs site configuration template file. -*- C -*-
Copyright (C) 1988, 1993, 1994, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/nt/configure.bat b/nt/configure.bat
index b5f78f2ab51..ffc11542ce0 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -1,8 +1,8 @@
@echo off
rem ----------------------------------------------------------------------
rem Configuration script for MS Windows 95/98/Me and NT/2000/XP
-rem Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-rem Free Software Foundation, Inc.
+rem Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+rem 2006 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.
diff --git a/nt/ddeclient.c b/nt/ddeclient.c
index 540cac24ebf..bd192c61f47 100644
--- a/nt/ddeclient.c
+++ b/nt/ddeclient.c
@@ -1,5 +1,6 @@
/* Simple client interface to DDE servers.
- Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/nt/emacs.rc b/nt/emacs.rc
index fd75506b97f..486b1eecf23 100644
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -26,7 +26,7 @@ BEGIN
VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0"
VALUE "FileVersion", "22, 0, 50, 0\0"
VALUE "InternalName", "Emacs\0"
- VALUE "LegalCopyright", "Copyright (C) 2002, 2003, 2004, 2005\0"
+ VALUE "LegalCopyright", "Copyright (C) 2002, 2003, 2004, 2005, 2006\0"
VALUE "OriginalFilename", "emacs.exe"
VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0"
VALUE "ProductVersion", "22, 0, 50, 0\0"
diff --git a/nt/envadd.bat b/nt/envadd.bat
index d48e6cc8bf1..ece62f971bd 100644
--- a/nt/envadd.bat
+++ b/nt/envadd.bat
@@ -1,7 +1,7 @@
rem Hack to change/add environment variables in the makefiles for the
rem Windows platform.
rem
-rem Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+rem Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
rem
rem This file is part of GNU Emacs.
rem
diff --git a/nt/gmake.defs b/nt/gmake.defs
index 9b93aa92074..56799f783e1 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -1,6 +1,6 @@
# -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
-# Copyright (c) 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006 Free Software Foundation, Inc.
#
# GNU Emacs 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/nt/inc/grp.h b/nt/inc/grp.h
index 39f98d31cdc..04c2982086b 100755
--- a/nt/inc/grp.h
+++ b/nt/inc/grp.h
@@ -1,5 +1,5 @@
/* Replacement grp.h file for building GNU Emacs on Windows.
- Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h
index 19b8a65adda..c0a3bc26ec4 100644
--- a/nt/inc/sys/socket.h
+++ b/nt/inc/sys/socket.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index fb1ea246663..ca1e22b93bb 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -1,6 +1,6 @@
# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
# Copyright (C) 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# Top level makefile for building GNU Emacs on Windows NT
#
diff --git a/nt/multi-install-info.bat b/nt/multi-install-info.bat
index f06f94c9ca4..0b21962a458 100644
--- a/nt/multi-install-info.bat
+++ b/nt/multi-install-info.bat
@@ -3,7 +3,7 @@
rem Hack to run install-info with multiple info files on the command
rem line on the Windows platform.
rem
-rem Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+rem Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
rem
rem This file is part of GNU Emacs.
rem
diff --git a/nt/nmake.defs b/nt/nmake.defs
index 76a3462969e..94fa9f431e9 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -1,6 +1,6 @@
# -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
# Copyright (C) 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# GNU Emacs 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/nt/paths.h b/nt/paths.h
index 0bb883067c3..f3d272da350 100644
--- a/nt/paths.h
+++ b/nt/paths.h
@@ -1,5 +1,5 @@
/* Copyright (C) 1993, 1995, 1997, 1999, 2001, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/nt/preprep.c b/nt/preprep.c
index e99fe38a484..fb686f42b96 100644
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -1,5 +1,6 @@
/* Pro-process emacs.exe for profiling by MSVC.
- Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2003, 2004, 2005,
+ 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/nt/runemacs.c b/nt/runemacs.c
index 709389deb8f..a998134ec72 100644
--- a/nt/runemacs.c
+++ b/nt/runemacs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
View Lorry Controller Status