aboutsummaryrefslogtreecommitdiffstats
path: root/nt
diff options
context:
space:
mode:
authorPaul Eggert2013-01-02 08:13:04 -0800
committerPaul Eggert2013-01-02 08:13:04 -0800
commit0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch)
tree08e9265a1dd95974dc72622a9bef194682c0c716 /nt
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 'nt')
-rw-r--r--nt/ChangeLog2
-rw-r--r--nt/INSTALL2
-rw-r--r--nt/README2
-rw-r--r--nt/README.W322
-rw-r--r--nt/addpm.c2
-rw-r--r--nt/addsection.c2
-rw-r--r--nt/cmdproxy.c2
-rw-r--r--nt/config.nt2
-rw-r--r--nt/ddeclient.c2
-rw-r--r--nt/envadd.bat2
-rw-r--r--nt/gmake.defs2
-rw-r--r--nt/icons/README2
-rw-r--r--nt/inc/grp.h2
-rw-r--r--nt/inc/inttypes.h2
-rw-r--r--nt/inc/langinfo.h2
-rw-r--r--nt/inc/ms-w32.h2
-rw-r--r--nt/inc/nl_types.h2
-rw-r--r--nt/inc/stdint.h2
-rw-r--r--nt/inc/sys/socket.h2
-rw-r--r--nt/inc/sys/stat.h2
-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.h4
-rw-r--r--nt/preprep.c2
-rw-r--r--nt/runemacs.c2
-rw-r--r--nt/zipdist.bat2
27 files changed, 28 insertions, 28 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 16c96d4e9ce..b44a4121b36 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -2915,7 +2915,7 @@
2915;; add-log-time-zone-rule: t 2915;; add-log-time-zone-rule: t
2916;; End: 2916;; End:
2917 2917
2918 Copyright (C) 1995-1999, 2001-2012 Free Software Foundation, Inc. 2918 Copyright (C) 1995-1999, 2001-2013 Free Software Foundation, Inc.
2919 2919
2920 This file is part of GNU Emacs. 2920 This file is part of GNU Emacs.
2921 2921
diff --git a/nt/INSTALL b/nt/INSTALL
index 2293610adf3..487e5ec0bf8 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -1,7 +1,7 @@
1 Building and Installing Emacs on Windows 1 Building and Installing Emacs on Windows
2 (from 95 to 7 and beyond) 2 (from 95 to 7 and beyond)
3 3
4 Copyright (C) 2001-2012 Free Software Foundation, Inc. 4 Copyright (C) 2001-2013 Free Software Foundation, Inc.
5 See the end of the file for license conditions. 5 See the end of the file for license conditions.
6 6
7* For the impatient 7* For the impatient
diff --git a/nt/README b/nt/README
index 483398698e4..c112c828fca 100644
--- a/nt/README
+++ b/nt/README
@@ -1,6 +1,6 @@
1 Emacs for Windows NT/2000 and Windows 95/98/ME 1 Emacs for Windows NT/2000 and Windows 95/98/ME
2 2
3 Copyright (C) 2001-2012 Free Software Foundation, Inc. 3 Copyright (C) 2001-2013 Free Software Foundation, Inc.
4 See the end of the file for license conditions. 4 See the end of the file for license conditions.
5 5
6 This directory contains support for compiling and running GNU Emacs on 6 This directory contains support for compiling and running GNU Emacs on
diff --git a/nt/README.W32 b/nt/README.W32
index e2197ba5adf..3e51b30af50 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -1,4 +1,4 @@
1Copyright (C) 2001-2012 Free Software Foundation, Inc. 1Copyright (C) 2001-2013 Free Software Foundation, Inc.
2See the end of the file for license conditions. 2See the end of the file for license conditions.
3 3
4 Emacs for Windows 4 Emacs for Windows
diff --git a/nt/addpm.c b/nt/addpm.c
index 361726b10e8..6ed625d908f 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -1,5 +1,5 @@
1/* Add entries to the GNU Emacs Program Manager folder. 1/* Add entries to the GNU Emacs Program Manager folder.
2 Copyright (C) 1995, 2001-2012 Free Software Foundation, Inc. 2 Copyright (C) 1995, 2001-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/nt/addsection.c b/nt/addsection.c
index d720dec428f..ee68ebee9b2 100644
--- a/nt/addsection.c
+++ b/nt/addsection.c
@@ -1,5 +1,5 @@
1/* Add an uninitialized data section to an executable. 1/* Add an uninitialized data section to an executable.
2 Copyright (C) 1999, 2001-2012 Free Software Foundation, Inc. 2 Copyright (C) 1999, 2001-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/nt/cmdproxy.c b/nt/cmdproxy.c
index 7c522440072..7d810e3365c 100644
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -1,5 +1,5 @@
1/* Proxy shell designed for use with Emacs on Windows 95 and NT. 1/* Proxy shell designed for use with Emacs on Windows 95 and NT.
2 Copyright (C) 1997, 2001-2012 Free Software Foundation, Inc. 2 Copyright (C) 1997, 2001-2013 Free Software Foundation, Inc.
3 3
4 Accepts subset of Unix sh(1) command-line options, for compatibility 4 Accepts subset of Unix sh(1) command-line options, for compatibility
5 with elisp code written for Unix. When possible, executes external 5 with elisp code written for Unix. When possible, executes external
diff --git a/nt/config.nt b/nt/config.nt
index f3e61e9427f..f425f6a98ea 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1,6 +1,6 @@
1/* GNU Emacs site configuration template file. 1/* GNU Emacs site configuration template file.
2 2
3Copyright (C) 1988, 1993-1994, 2001-2012 Free Software Foundation, Inc. 3Copyright (C) 1988, 1993-1994, 2001-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/nt/ddeclient.c b/nt/ddeclient.c
index 7648667b4a0..675f0c55985 100644
--- a/nt/ddeclient.c
+++ b/nt/ddeclient.c
@@ -1,5 +1,5 @@
1/* Simple client interface to DDE servers. 1/* Simple client interface to DDE servers.
2 Copyright (C) 1998, 2001-2012 Free Software Foundation, Inc. 2 Copyright (C) 1998, 2001-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/nt/envadd.bat b/nt/envadd.bat
index cca44d9ea97..bcb9b6fabe1 100644
--- a/nt/envadd.bat
+++ b/nt/envadd.bat
@@ -1,7 +1,7 @@
1rem Hack to change/add environment variables in the makefiles for the 1rem Hack to change/add environment variables in the makefiles for the
2rem Windows platform. 2rem Windows platform.
3 3
4rem Copyright (C) 2003-2012 Free Software Foundation, Inc. 4rem Copyright (C) 2003-2013 Free Software Foundation, Inc.
5 5
6rem This file is part of GNU Emacs. 6rem This file is part of GNU Emacs.
7 7
diff --git a/nt/gmake.defs b/nt/gmake.defs
index 3d545fab975..6d55cdcc84a 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -1,5 +1,5 @@
1# -*- Makefile -*- definition file for building GNU Emacs on Windows NT. 1# -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
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/nt/icons/README b/nt/icons/README
index a3acb66178c..0254080400d 100644
--- a/nt/icons/README
+++ b/nt/icons/README
@@ -2,7 +2,7 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
2 2
3File: emacs.ico 3File: emacs.ico
4Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp> 4Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
5Copyright (C) 2008-2012 Free Software Foundation, Inc. 5Copyright (C) 2008-2013 Free Software Foundation, Inc.
6License: GNU General Public License version 3 or later 6License: GNU General Public License version 3 or later
7 7
8 8
diff --git a/nt/inc/grp.h b/nt/inc/grp.h
index 3d369044974..02c0ef7f3a0 100644
--- a/nt/inc/grp.h
+++ b/nt/inc/grp.h
@@ -1,6 +1,6 @@
1/* Replacement grp.h file for building GNU Emacs on Windows. 1/* Replacement grp.h file for building GNU Emacs on Windows.
2 2
3Copyright (C) 2003-2012 Free Software Foundation, Inc. 3Copyright (C) 2003-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/nt/inc/inttypes.h b/nt/inc/inttypes.h
index 688b9bc9223..4629ccb038c 100644
--- a/nt/inc/inttypes.h
+++ b/nt/inc/inttypes.h
@@ -1,6 +1,6 @@
1/* Replacement inntypes.h file for building GNU Emacs on Windows with MSVC. 1/* Replacement inntypes.h file for building GNU Emacs on Windows with MSVC.
2 2
3Copyright (C) 2011-2012 Free Software Foundation, Inc. 3Copyright (C) 2011-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/nt/inc/langinfo.h b/nt/inc/langinfo.h
index 7ab36f0a998..93a56e548c7 100644
--- a/nt/inc/langinfo.h
+++ b/nt/inc/langinfo.h
@@ -1,6 +1,6 @@
1/* Replacement langinfo.h file for building GNU Emacs on Windows. 1/* Replacement langinfo.h file for building GNU Emacs on Windows.
2 2
3Copyright (C) 2006-2012 Free Software Foundation, Inc. 3Copyright (C) 2006-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/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index 78e1d544cde..c10c4d9e02d 100644
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -1,6 +1,6 @@
1/* System description file for Windows NT. 1/* System description file for Windows NT.
2 2
3Copyright (C) 1993-1995, 2001-2012 Free Software Foundation, Inc. 3Copyright (C) 1993-1995, 2001-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/nt/inc/nl_types.h b/nt/inc/nl_types.h
index 3d3a162bada..e3eb9eb5477 100644
--- a/nt/inc/nl_types.h
+++ b/nt/inc/nl_types.h
@@ -1,6 +1,6 @@
1/* Replacement nl_types.h file for building GNU Emacs on Windows. 1/* Replacement nl_types.h file for building GNU Emacs on Windows.
2 2
3Copyright (C) 2006-2012 Free Software Foundation, Inc. 3Copyright (C) 2006-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/nt/inc/stdint.h b/nt/inc/stdint.h
index 97c9bbdaee9..c8704e25910 100644
--- a/nt/inc/stdint.h
+++ b/nt/inc/stdint.h
@@ -1,6 +1,6 @@
1/* Replacement stdint.h file for building GNU Emacs on Windows. 1/* Replacement stdint.h file for building GNU Emacs on Windows.
2 2
3Copyright (C) 2011-2012 Free Software Foundation, Inc. 3Copyright (C) 2011-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/nt/inc/sys/socket.h b/nt/inc/sys/socket.h
index 95fee4c4659..6029778394b 100644
--- a/nt/inc/sys/socket.h
+++ b/nt/inc/sys/socket.h
@@ -1,4 +1,4 @@
1/* Copyright (C) 1995, 2001-2012 Free Software Foundation, Inc. 1/* Copyright (C) 1995, 2001-2013 Free Software Foundation, Inc.
2 2
3This file is part of GNU Emacs. 3This file is part of GNU Emacs.
4 4
diff --git a/nt/inc/sys/stat.h b/nt/inc/sys/stat.h
index 78be6eb57b1..45689d24776 100644
--- a/nt/inc/sys/stat.h
+++ b/nt/inc/sys/stat.h
@@ -1,7 +1,7 @@
1/* sys/stat.h supplied with MSVCRT uses too narrow data types for 1/* sys/stat.h supplied with MSVCRT uses too narrow data types for
2 inode and user/group id, so we replace them with our own. 2 inode and user/group id, so we replace them with our own.
3 3
4Copyright (C) 2008-2012 Free Software Foundation, Inc. 4Copyright (C) 2008-2013 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/nt/makefile.w32-in b/nt/makefile.w32-in
index 7377d7e33b9..9336ddb5002 100644
--- a/nt/makefile.w32-in
+++ b/nt/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# Top level makefile for building GNU Emacs on Windows NT 4# Top level makefile for building GNU Emacs on Windows NT
5# 5#
diff --git a/nt/multi-install-info.bat b/nt/multi-install-info.bat
index 0fff904c60e..9bb723a4d89 100644
--- a/nt/multi-install-info.bat
+++ b/nt/multi-install-info.bat
@@ -3,7 +3,7 @@
3rem Hack to run install-info with multiple info files on the command 3rem Hack to run install-info with multiple info files on the command
4rem line on the Windows platform. 4rem line on the Windows platform.
5 5
6rem Copyright (C) 2003-2012 Free Software Foundation, Inc. 6rem Copyright (C) 2003-2013 Free Software Foundation, Inc.
7 7
8rem This file is part of GNU Emacs. 8rem This file is part of GNU Emacs.
9 9
diff --git a/nt/nmake.defs b/nt/nmake.defs
index 2c6bc66b673..69e8bb67340 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -1,5 +1,5 @@
1# -*- Makefile -*- definition file for building GNU Emacs on Windows NT. 1# -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
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/nt/paths.h b/nt/paths.h
index 801d187646f..e9601a7ce32 100644
--- a/nt/paths.h
+++ b/nt/paths.h
@@ -1,7 +1,7 @@
1/* paths.h file for MS Windows 1/* paths.h file for MS Windows
2 2
3Copyright (C) 1993, 1995, 1997, 1999, 2001-2012 3Copyright (C) 1993, 1995, 1997, 1999, 2001-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/nt/preprep.c b/nt/preprep.c
index 6976567e038..8604dd40c1f 100644
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -1,5 +1,5 @@
1/* Pre-process emacs.exe for profiling by MSVC. 1/* Pre-process emacs.exe for profiling by MSVC.
2 Copyright (C) 1999, 2001-2012 Free Software Foundation, Inc. 2 Copyright (C) 1999, 2001-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/nt/runemacs.c b/nt/runemacs.c
index dbb18bcd82c..b090ffdd639 100644
--- a/nt/runemacs.c
+++ b/nt/runemacs.c
@@ -1,6 +1,6 @@
1/* runemacs --- Simple program to start Emacs with its console window hidden. 1/* runemacs --- Simple program to start Emacs with its console window hidden.
2 2
3Copyright (C) 2001-2012 Free Software Foundation, Inc. 3Copyright (C) 2001-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/nt/zipdist.bat b/nt/zipdist.bat
index e196299b6d6..2953e40ae89 100644
--- a/nt/zipdist.bat
+++ b/nt/zipdist.bat
@@ -1,5 +1,5 @@
1@echo off 1@echo off
2rem Copyright (C) 2001-2012 Free Software Foundation, Inc. 2rem Copyright (C) 2001-2013 Free Software Foundation, Inc.
3 3
4rem Author: Christoph Scholtes cschol2112 at gmail.com 4rem Author: Christoph Scholtes cschol2112 at gmail.com
5 5