aboutsummaryrefslogtreecommitdiffstats
path: root/msdos
diff options
context:
space:
mode:
authorPaul Eggert2013-01-02 08:13:04 -0800
committerPaul Eggert2013-01-02 08:13:04 -0800
commit0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch)
tree08e9265a1dd95974dc72622a9bef194682c0c716 /msdos
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 'msdos')
-rw-r--r--msdos/ChangeLog2
-rw-r--r--msdos/INSTALL3
-rw-r--r--msdos/README2
-rw-r--r--msdos/inttypes.h2
-rw-r--r--msdos/mainmake.v22
-rw-r--r--msdos/sed1v2.inp2
-rw-r--r--msdos/sed1x.inp2
-rw-r--r--msdos/sed2v2.inp3
-rw-r--r--msdos/sed2x.inp2
-rw-r--r--msdos/sed3v2.inp2
-rw-r--r--msdos/sed4.inp2
-rw-r--r--msdos/sed5x.inp2
-rw-r--r--msdos/sed6.inp2
-rw-r--r--msdos/sedalloc.inp2
-rw-r--r--msdos/sedleim.inp2
-rw-r--r--msdos/sedlibcf.inp2
-rw-r--r--msdos/sedlibmk.inp2
-rw-r--r--msdos/sedlisp.inp2
18 files changed, 20 insertions, 18 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index c530dff150c..6575282689c 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1485,7 +1485,7 @@
1485;; coding: utf-8 1485;; coding: utf-8
1486;; End: 1486;; End:
1487 1487
1488 Copyright (C) 1994-1999, 2001-2012 Free Software Foundation, Inc. 1488 Copyright (C) 1994-1999, 2001-2013 Free Software Foundation, Inc.
1489 1489
1490 This file is part of GNU Emacs. 1490 This file is part of GNU Emacs.
1491 1491
diff --git a/msdos/INSTALL b/msdos/INSTALL
index 6915b48ae9a..344e5a908f0 100644
--- a/msdos/INSTALL
+++ b/msdos/INSTALL
@@ -1,6 +1,7 @@
1GNU Emacs Installation Guide for the DJGPP (a.k.a. MS-DOS) port 1GNU Emacs Installation Guide for the DJGPP (a.k.a. MS-DOS) port
2 2
3Copyright (C) 1992, 1994, 1996-1997, 2000-2012 Free Software Foundation, Inc. 3Copyright (C) 1992, 1994, 1996-1997, 2000-2013 Free Software Foundation,
4Inc.
4See the end of the file for license conditions. 5See the end of the file for license conditions.
5 6
6The DJGPP port of GNU Emacs builds and runs on plain DOS and also on 7The DJGPP port of GNU Emacs builds and runs on plain DOS and also on
diff --git a/msdos/README b/msdos/README
index 6e7c872ff3f..ba97312130a 100644
--- a/msdos/README
+++ b/msdos/README
@@ -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 4
diff --git a/msdos/inttypes.h b/msdos/inttypes.h
index dba56f83760..2f45b56a3fc 100644
--- a/msdos/inttypes.h
+++ b/msdos/inttypes.h
@@ -1,6 +1,6 @@
1/* Replacement inntypes.h file for building GNU Emacs on MS-DOS with DJGPP. 1/* Replacement inntypes.h file for building GNU Emacs on MS-DOS with DJGPP.
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/msdos/mainmake.v2 b/msdos/mainmake.v2
index 3df6ca17827..e6c1567deab 100644
--- a/msdos/mainmake.v2
+++ b/msdos/mainmake.v2
@@ -1,6 +1,6 @@
1# Top-level Makefile for Emacs under MS-DOS/DJGPP v2.0 or higher. -*-makefile-*- 1# Top-level Makefile for Emacs under MS-DOS/DJGPP v2.0 or higher. -*-makefile-*-
2 2
3# Copyright (C) 1996-2012 Free Software Foundation, Inc. 3# Copyright (C) 1996-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/msdos/sed1v2.inp b/msdos/sed1v2.inp
index c7199621634..f55e291e0e3 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -2,7 +2,7 @@
2# Configuration script for src/Makefile under DJGPP v2.x 2# Configuration script for src/Makefile under DJGPP v2.x
3# ---------------------------------------------------------------------- 3# ----------------------------------------------------------------------
4# 4#
5# Copyright (C) 1996-1997, 1999-2012 Free Software Foundation, Inc. 5# Copyright (C) 1996-1997, 1999-2013 Free Software Foundation, Inc.
6# 6#
7# This file is part of GNU Emacs. 7# This file is part of GNU Emacs.
8# 8#
diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp
index 638c9450848..9134bc73d28 100644
--- a/msdos/sed1x.inp
+++ b/msdos/sed1x.inp
@@ -2,7 +2,7 @@
2# Extra configuration script for src/makefile for DesqView/X 2# Extra configuration script for src/makefile for DesqView/X
3# ---------------------------------------------------------------------- 3# ----------------------------------------------------------------------
4# 4#
5# Copyright (C) 1994-1997, 1999-2012 Free Software Foundation, Inc. 5# Copyright (C) 1994-1997, 1999-2013 Free Software Foundation, Inc.
6# 6#
7# This file is part of GNU Emacs. 7# This file is part of GNU Emacs.
8# 8#
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index d03d4ced9d9..607ff4d7e8b 100644
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -2,7 +2,8 @@
2# Configuration script for src/config.h under DJGPP v2.x 2# Configuration script for src/config.h under DJGPP v2.x
3# ---------------------------------------------------------------------- 3# ----------------------------------------------------------------------
4# 4#
5# Copyright (C) 1993-1997, 1999-2000, 2002-2012 Free Software Foundation, Inc. 5# Copyright (C) 1993-1997, 1999-2000, 2002-2013 Free Software
6# Foundation, Inc.
6# 7#
7# This file is part of GNU Emacs. 8# This file is part of GNU Emacs.
8# 9#
diff --git a/msdos/sed2x.inp b/msdos/sed2x.inp
index fa920246c96..4975f0b530e 100644
--- a/msdos/sed2x.inp
+++ b/msdos/sed2x.inp
@@ -2,7 +2,7 @@
2# Extra configuration script for src/config.h for DesqView/X 2# Extra configuration script for src/config.h for DesqView/X
3# ---------------------------------------------------------------------- 3# ----------------------------------------------------------------------
4# 4#
5# Copyright (C) 1994, 2001-2012 Free Software Foundation, Inc. 5# Copyright (C) 1994, 2001-2013 Free Software Foundation, Inc.
6# 6#
7# This file is part of GNU Emacs. 7# This file is part of GNU Emacs.
8# 8#
diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp
index cd58e47305c..50d2602b319 100644
--- a/msdos/sed3v2.inp
+++ b/msdos/sed3v2.inp
@@ -2,7 +2,7 @@
2# Configuration script for lib-src/makefile under DJGPP v2 2# Configuration script for lib-src/makefile under DJGPP v2
3# ---------------------------------------------------------------------- 3# ----------------------------------------------------------------------
4# 4#
5# Copyright (C) 1996, 1998, 2000-2012 Free Software Foundation, Inc. 5# Copyright (C) 1996, 1998, 2000-2013 Free Software Foundation, Inc.
6# 6#
7# This file is part of GNU Emacs. 7# This file is part of GNU Emacs.
8# 8#
diff --git a/msdos/sed4.inp b/msdos/sed4.inp
index 73d025463d8..7be1bea2792 100644
--- a/msdos/sed4.inp
+++ b/msdos/sed4.inp
@@ -2,7 +2,7 @@
2# Configuration script for src/paths.h 2# Configuration script for src/paths.h
3# ---------------------------------------------------------------------- 3# ----------------------------------------------------------------------
4# 4#
5# Copyright (C) 1994, 2001-2012 Free Software Foundation, Inc. 5# Copyright (C) 1994, 2001-2013 Free Software Foundation, Inc.
6# 6#
7# This file is part of GNU Emacs. 7# This file is part of GNU Emacs.
8# 8#
diff --git a/msdos/sed5x.inp b/msdos/sed5x.inp
index 9ac6621c911..fe71199e9f5 100644
--- a/msdos/sed5x.inp
+++ b/msdos/sed5x.inp
@@ -2,7 +2,7 @@
2# Configuration script for oldxmenu/makefile for DesqView/X 2# Configuration script for oldxmenu/makefile for DesqView/X
3# ---------------------------------------------------------------------- 3# ----------------------------------------------------------------------
4# 4#
5# Copyright (C) 1994, 2001-2012 Free Software Foundation, Inc. 5# Copyright (C) 1994, 2001-2013 Free Software Foundation, Inc.
6# 6#
7# This file is part of GNU Emacs. 7# This file is part of GNU Emacs.
8# 8#
diff --git a/msdos/sed6.inp b/msdos/sed6.inp
index 22052140b82..a39061e8674 100644
--- a/msdos/sed6.inp
+++ b/msdos/sed6.inp
@@ -3,7 +3,7 @@
3# doc/lispintro/Makefile, and doc/misc/Makefile under DJGPP v2.x 3# doc/lispintro/Makefile, and doc/misc/Makefile under DJGPP v2.x
4# --------------------------------------------------------------------------- 4# ---------------------------------------------------------------------------
5# 5#
6# Copyright (C) 1997, 2000-2012 Free Software Foundation, Inc. 6# Copyright (C) 1997, 2000-2013 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/msdos/sedalloc.inp b/msdos/sedalloc.inp
index b3b45b8f5de..86985c4a387 100644
--- a/msdos/sedalloc.inp
+++ b/msdos/sedalloc.inp
@@ -2,7 +2,7 @@
2# Configuration script for SYSTEM_MALLOC/REL_ALLOC in src/config.h 2# Configuration script for SYSTEM_MALLOC/REL_ALLOC in src/config.h
3# ---------------------------------------------------------------------- 3# ----------------------------------------------------------------------
4# 4#
5# Copyright (C) 2008-2012 Free Software Foundation, Inc. 5# Copyright (C) 2008-2013 Free Software Foundation, Inc.
6# 6#
7# This file is part of GNU Emacs. 7# This file is part of GNU Emacs.
8# 8#
diff --git a/msdos/sedleim.inp b/msdos/sedleim.inp
index 461a2b7a9ec..9b5d70a7408 100644
--- a/msdos/sedleim.inp
+++ b/msdos/sedleim.inp
@@ -2,7 +2,7 @@
2# Configuration script for leim/Makefile under DJGPP v2.x 2# Configuration script for leim/Makefile under DJGPP v2.x
3# ---------------------------------------------------------------------- 3# ----------------------------------------------------------------------
4# 4#
5# Copyright (C) 1999-2012 Free Software Foundation, Inc. 5# Copyright (C) 1999-2013 Free Software Foundation, Inc.
6# 6#
7# This file is part of GNU Emacs. 7# This file is part of GNU Emacs.
8# 8#
diff --git a/msdos/sedlibcf.inp b/msdos/sedlibcf.inp
index 739808c1350..9ad3654c0c3 100644
--- a/msdos/sedlibcf.inp
+++ b/msdos/sedlibcf.inp
@@ -5,7 +5,7 @@
5# files whose names are invalid on DOS 8+3 filesystems. 5# files whose names are invalid on DOS 8+3 filesystems.
6# ---------------------------------------------------------------------- 6# ----------------------------------------------------------------------
7# 7#
8# Copyright (C) 2011-2012 Free Software Foundation, Inc. 8# Copyright (C) 2011-2013 Free Software Foundation, Inc.
9# 9#
10# This file is part of GNU Emacs. 10# This file is part of GNU Emacs.
11# 11#
diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp
index d723c4bcc28..6c380fba844 100644
--- a/msdos/sedlibmk.inp
+++ b/msdos/sedlibmk.inp
@@ -2,7 +2,7 @@
2# Configuration script for lib/Makefile under DJGPP v2.x 2# Configuration script for lib/Makefile under DJGPP v2.x
3# ---------------------------------------------------------------------- 3# ----------------------------------------------------------------------
4# 4#
5# Copyright (C) 2011-2012 Free Software Foundation, Inc. 5# Copyright (C) 2011-2013 Free Software Foundation, Inc.
6# 6#
7# This file is part of GNU Emacs. 7# This file is part of GNU Emacs.
8# 8#
diff --git a/msdos/sedlisp.inp b/msdos/sedlisp.inp
index 2055c6edf4d..4975fb5ea71 100644
--- a/msdos/sedlisp.inp
+++ b/msdos/sedlisp.inp
@@ -2,7 +2,7 @@
2# Configuration script for lisp/Makefile under DJGPP v2.x 2# Configuration script for lisp/Makefile under DJGPP v2.x
3# ---------------------------------------------------------------------- 3# ----------------------------------------------------------------------
4# 4#
5# Copyright (C) 2000-2012 Free Software Foundation, Inc. 5# Copyright (C) 2000-2013 Free Software Foundation, Inc.
6# 6#
7# This file is part of GNU Emacs. 7# This file is part of GNU Emacs.
8# 8#
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-25 00:30:24 +0000