aboutsummaryrefslogtreecommitdiffstats
path: root/mac
diff options
context:
space:
mode:
authorMiles Bader2008-01-08 20:46:54 +0000
committerMiles Bader2008-01-08 20:46:54 +0000
commit59ce725a3b68cbc324f01bc8dc5f9e07286431d1 (patch)
treec17b8f002edf6892e273ff53214b1b23c880e69f /mac
parent0664ff722152f34c2e87e9e644bbab401530b9d4 (diff)
parentbf515869577b12abd42777fb0647259920c862fc (diff)
downloademacs-59ce725a3b68cbc324f01bc8dc5f9e07286431d1.tar.gz
emacs-59ce725a3b68cbc324f01bc8dc5f9e07286431d1.zip
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
Diffstat (limited to 'mac')
-rw-r--r--mac/ChangeLog2
-rw-r--r--mac/Emacs.app/Contents/Info.plist2
-rw-r--r--mac/INSTALL2
-rw-r--r--mac/README2
-rw-r--r--mac/cw6-mcp.xml2
-rw-r--r--mac/inc/alloca.h2
-rw-r--r--mac/inc/config.h2
-rw-r--r--mac/inc/defs-cw6.h2
-rw-r--r--mac/inc/dirent.h2
-rw-r--r--mac/inc/epaths.h2
-rwxr-xr-xmac/inc/grp.h3
-rw-r--r--mac/inc/m-mac.h2
-rw-r--r--mac/inc/pwd.h2
-rw-r--r--mac/inc/s-mac.h2
-rw-r--r--mac/inc/sys/file.h2
-rw-r--r--mac/inc/sys/ioctl.h2
-rw-r--r--mac/inc/sys/param.h2
-rw-r--r--mac/inc/sys/stat.h2
-rw-r--r--mac/inc/sys/time.h2
-rw-r--r--mac/inc/sys/types.h2
-rw-r--r--mac/inc/termio.h2
-rw-r--r--mac/inc/utime.h2
-rw-r--r--mac/inc/utsname.h2
-rwxr-xr-xmac/make-package3
-rw-r--r--mac/makefile.MPW2
-rw-r--r--mac/src/EmacsMPW.r2
-rw-r--r--mac/src/chdir.c2
27 files changed, 29 insertions, 27 deletions
diff --git a/mac/ChangeLog b/mac/ChangeLog
index af42d1fd126..63c0791e2f9 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -947,7 +947,7 @@
947;; End: 947;; End:
948 948
949 Copyright (C) 2001, 2002, 2003, 2004, 2005, 949 Copyright (C) 2001, 2002, 2003, 2004, 2005,
950 2006, 2007 Free Software Foundation, Inc. 950 2006, 2007, 2008 Free Software Foundation, Inc.
951 951
952 This file is part of GNU Emacs. 952 This file is part of GNU Emacs.
953 953
diff --git a/mac/Emacs.app/Contents/Info.plist b/mac/Emacs.app/Contents/Info.plist
index 5a369772188..625f903a0cf 100644
--- a/mac/Emacs.app/Contents/Info.plist
+++ b/mac/Emacs.app/Contents/Info.plist
@@ -1,5 +1,5 @@
1<!-- 1<!--
2Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 2Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
3 Free Software Foundation, Inc. 3 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
diff --git a/mac/INSTALL b/mac/INSTALL
index 6d78910b464..e7d952a60f1 100644
--- a/mac/INSTALL
+++ b/mac/INSTALL
@@ -1,7 +1,7 @@
1* BUILDING EMACS ON MAC OS Classic AND MAC OS X -*- outline -*- 1* BUILDING EMACS ON MAC OS Classic AND MAC OS X -*- outline -*-
2 2
3Copyright (C) 2001, 2002, 2003, 2004, 2005, 3Copyright (C) 2001, 2002, 2003, 2004, 2005,
4 2006, 2007 Free Software Foundation, Inc. 4 2006, 2007, 2008 Free Software Foundation, Inc.
5See the end of the file for license conditions. 5See the end of the file for license conditions.
6 6
7 7
diff --git a/mac/README b/mac/README
index f02527d6383..bc6b075f598 100644
--- a/mac/README
+++ b/mac/README
@@ -1,7 +1,7 @@
1Emacs for Mac OS Classic and Mac OS X 1Emacs for Mac OS Classic and Mac OS X
2 2
3Copyright (C) 2001, 2002, 2003, 2004, 2005, 3Copyright (C) 2001, 2002, 2003, 2004, 2005,
4 2006, 2007 Free Software Foundation, Inc. 4 2006, 2007, 2008 Free Software Foundation, Inc.
5See the end of the file for license conditions. 5See the end of the file for license conditions.
6 6
7 7
diff --git a/mac/cw6-mcp.xml b/mac/cw6-mcp.xml
index 410f512e37a..09b40039ae8 100644
--- a/mac/cw6-mcp.xml
+++ b/mac/cw6-mcp.xml
@@ -1,6 +1,6 @@
1<!-- 1<!--
2Copyright (C) 2001, 2002, 2003, 2004, 2005, 2Copyright (C) 2001, 2002, 2003, 2004, 2005,
3 2006, 2007 Free Software Foundation, Inc. 3 2006, 2007, 2008 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/mac/inc/alloca.h b/mac/inc/alloca.h
index f0c47e1f7ba..5de835770ed 100644
--- a/mac/inc/alloca.h
+++ b/mac/inc/alloca.h
@@ -1,5 +1,5 @@
1/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 1/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
2 2006, 2007 Free Software Foundation, Inc. 2 2006, 2007, 2008 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/mac/inc/config.h b/mac/inc/config.h
index 49bc7d6bae2..72d4e32bc0b 100644
--- a/mac/inc/config.h
+++ b/mac/inc/config.h
@@ -2,7 +2,7 @@
2 2
3/* GNU Emacs site configuration template file. -*- C -*- 3/* GNU Emacs site configuration template file. -*- C -*-
4 Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2003, 2004, 4 Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2003, 2004,
5 2005, 2006, 2007 Free Software Foundation, Inc. 5 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
6 6
7This file is part of GNU Emacs. 7This file is part of GNU Emacs.
8 8
diff --git a/mac/inc/defs-cw6.h b/mac/inc/defs-cw6.h
index 05dfa901a24..ebd2cbb0c99 100644
--- a/mac/inc/defs-cw6.h
+++ b/mac/inc/defs-cw6.h
@@ -1,5 +1,5 @@
1/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 1/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
2 2006, 2007 Free Software Foundation, Inc. 2 2006, 2007, 2008 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/mac/inc/dirent.h b/mac/inc/dirent.h
index 0efaf879466..06308fafddf 100644
--- a/mac/inc/dirent.h
+++ b/mac/inc/dirent.h
@@ -1,6 +1,6 @@
1/* Replacement dirent.h file for building GNU Emacs on the Macintosh. 1/* Replacement dirent.h file for building GNU Emacs on the Macintosh.
2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
3 2005, 2006, 2007 Free Software Foundation, Inc. 3 2005, 2006, 2007, 2008 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/mac/inc/epaths.h b/mac/inc/epaths.h
index e9ee0a9fb70..90d3b0143e2 100644
--- a/mac/inc/epaths.h
+++ b/mac/inc/epaths.h
@@ -2,7 +2,7 @@
2 2
3/* Handcrafted epaths.h file for building GNU Emacs on the Macintosh. 3/* Handcrafted epaths.h file for building GNU Emacs on the Macintosh.
4 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 4 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
5 2005, 2006, 2007 Free Software Foundation, Inc. 5 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
6 6
7This file is part of GNU Emacs. 7This file is part of GNU Emacs.
8 8
diff --git a/mac/inc/grp.h b/mac/inc/grp.h
index f8e93b5d2c1..66e29450c17 100755
--- a/mac/inc/grp.h
+++ b/mac/inc/grp.h
@@ -1,5 +1,6 @@
1/* Replacement grp.h file for building GNU Emacs on the Macintosh. 1/* Replacement grp.h file for building GNU Emacs on the Macintosh.
2 Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. 2 Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
3 Free Software Foundation, Inc.
3 4
4This file is part of GNU Emacs. 5This file is part of GNU Emacs.
5 6
diff --git a/mac/inc/m-mac.h b/mac/inc/m-mac.h
index 57bb0976b69..701711a6be2 100644
--- a/mac/inc/m-mac.h
+++ b/mac/inc/m-mac.h
@@ -1,6 +1,6 @@
1/* Handcrafted m-mac.h file for building GNU Emacs on the Macintosh. 1/* Handcrafted m-mac.h file for building GNU Emacs on the Macintosh.
2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
3 2005, 2006, 2007 Free Software Foundation, Inc. 3 2005, 2006, 2007, 2008 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/mac/inc/pwd.h b/mac/inc/pwd.h
index c992b5c4ea9..4402a7195a4 100644
--- a/mac/inc/pwd.h
+++ b/mac/inc/pwd.h
@@ -1,6 +1,6 @@
1/* Replacement pwd.h file for building GNU Emacs on the Macintosh. 1/* Replacement pwd.h file for building GNU Emacs on the Macintosh.
2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
3 2005, 2006, 2007 Free Software Foundation, Inc. 3 2005, 2006, 2007, 2008 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/mac/inc/s-mac.h b/mac/inc/s-mac.h
index 4798fb9c3bd..6d9b1ddb016 100644
--- a/mac/inc/s-mac.h
+++ b/mac/inc/s-mac.h
@@ -1,6 +1,6 @@
1/* Handcrafted s-mac.h file for building GNU Emacs on Mac OS 9. 1/* Handcrafted s-mac.h file for building GNU Emacs on Mac OS 9.
2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
3 2005, 2006, 2007 Free Software Foundation, Inc. 3 2005, 2006, 2007, 2008 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/mac/inc/sys/file.h b/mac/inc/sys/file.h
index e720fc1c0ce..c99a293a022 100644
--- a/mac/inc/sys/file.h
+++ b/mac/inc/sys/file.h
@@ -1,6 +1,6 @@
1/* Replacement sys/file.h file for building GNU Emacs on the Macintosh. 1/* Replacement sys/file.h file for building GNU Emacs on the Macintosh.
2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
3 2005, 2006, 2007 Free Software Foundation, Inc. 3 2005, 2006, 2007, 2008 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/mac/inc/sys/ioctl.h b/mac/inc/sys/ioctl.h
index d0caa4b0eb7..279c8a34e9e 100644
--- a/mac/inc/sys/ioctl.h
+++ b/mac/inc/sys/ioctl.h
@@ -1,6 +1,6 @@
1/* Replacement sys/ioctl.h file for building GNU Emacs on the Macintosh. 1/* Replacement sys/ioctl.h file for building GNU Emacs on the Macintosh.
2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
3 2005, 2006, 2007 Free Software Foundation, Inc. 3 2005, 2006, 2007, 2008 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/mac/inc/sys/param.h b/mac/inc/sys/param.h
index 265f5384c9c..71df1e61d20 100644
--- a/mac/inc/sys/param.h
+++ b/mac/inc/sys/param.h
@@ -1,6 +1,6 @@
1/* Replacement sys/param.h file for building GNU Emacs on the Macintosh. 1/* Replacement sys/param.h file for building GNU Emacs on the Macintosh.
2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
3 2005, 2006, 2007 Free Software Foundation, Inc. 3 2005, 2006, 2007, 2008 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/mac/inc/sys/stat.h b/mac/inc/sys/stat.h
index 0e352211e16..12ccfc66d99 100644
--- a/mac/inc/sys/stat.h
+++ b/mac/inc/sys/stat.h
@@ -1,6 +1,6 @@
1/* Replacement sys/stat.h file for building GNU Emacs on the Macintosh. 1/* Replacement sys/stat.h file for building GNU Emacs on the Macintosh.
2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
3 2005, 2006, 2007 Free Software Foundation, Inc. 3 2005, 2006, 2007, 2008 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/mac/inc/sys/time.h b/mac/inc/sys/time.h
index 057ecca42be..8a10304f670 100644
--- a/mac/inc/sys/time.h
+++ b/mac/inc/sys/time.h
@@ -1,6 +1,6 @@
1/* Replacement sys/time.h file for building GNU Emacs on the Macintosh. 1/* Replacement sys/time.h file for building GNU Emacs on the Macintosh.
2 Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2 Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
3 2006, 2007 Free Software Foundation, Inc. 3 2006, 2007, 2008 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/mac/inc/sys/types.h b/mac/inc/sys/types.h
index bec6e4c773b..f76c6834899 100644
--- a/mac/inc/sys/types.h
+++ b/mac/inc/sys/types.h
@@ -1,6 +1,6 @@
1/* Replacement sys/types.h file for building GNU Emacs on the Macintosh. 1/* Replacement sys/types.h file for building GNU Emacs on the Macintosh.
2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
3 2005, 2006, 2007 Free Software Foundation, Inc. 3 2005, 2006, 2007, 2008 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/mac/inc/termio.h b/mac/inc/termio.h
index 34e034c2fd1..a812a67d52b 100644
--- a/mac/inc/termio.h
+++ b/mac/inc/termio.h
@@ -1,6 +1,6 @@
1/* Replacement termio.h file for building GNU Emacs on the Macintosh. 1/* Replacement termio.h file for building GNU Emacs on the Macintosh.
2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
3 2005, 2006, 2007 Free Software Foundation, Inc. 3 2005, 2006, 2007, 2008 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/mac/inc/utime.h b/mac/inc/utime.h
index 2deefbb9617..4a8d0428f63 100644
--- a/mac/inc/utime.h
+++ b/mac/inc/utime.h
@@ -1,6 +1,6 @@
1/* Replacement utime.h file for building GNU Emacs on the Macintosh. 1/* Replacement utime.h file for building GNU Emacs on the Macintosh.
2 Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2 Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
3 2006, 2007 Free Software Foundation, Inc. 3 2006, 2007, 2008 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/mac/inc/utsname.h b/mac/inc/utsname.h
index 174d9cffe85..01c47702c7f 100644
--- a/mac/inc/utsname.h
+++ b/mac/inc/utsname.h
@@ -1,6 +1,6 @@
1/* Replacement utsname.h file for building GNU Emacs on the Macintosh. 1/* Replacement utsname.h file for building GNU Emacs on the Macintosh.
2 Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2 Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
3 2006, 2007 Free Software Foundation, Inc. 3 2006, 2007, 2008 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/mac/make-package b/mac/make-package
index 2d10710da80..a37081e8b3f 100755
--- a/mac/make-package
+++ b/mac/make-package
@@ -18,7 +18,8 @@
18#### files inside /usr. This will replace the default version of 18#### files inside /usr. This will replace the default version of
19#### emacs included with Mac OS X. 19#### emacs included with Mac OS X.
20 20
21# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. 21# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
22# Free Software Foundation, Inc.
22# 23#
23# This file is part of GNU Emacs. 24# This file is part of GNU Emacs.
24# 25#
diff --git a/mac/makefile.MPW b/mac/makefile.MPW
index c7cb790ce92..e2d7d9ac404 100644
--- a/mac/makefile.MPW
+++ b/mac/makefile.MPW
@@ -1,6 +1,6 @@
1# Make file for building GNU Emacs on the Macintosh. 1# Make file for building GNU Emacs on the Macintosh.
2# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
3# 2005, 2006, 2007 Free Software Foundation, Inc. 3# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4# 4#
5# Author: Andrew Choi <akochoi@users.sourceforge.net> 5# Author: Andrew Choi <akochoi@users.sourceforge.net>
6# 6#
diff --git a/mac/src/EmacsMPW.r b/mac/src/EmacsMPW.r
index f017f2bec78..a40d9d43bc7 100644
--- a/mac/src/EmacsMPW.r
+++ b/mac/src/EmacsMPW.r
@@ -2,7 +2,7 @@
2 under MPW. 2 under MPW.
3 3
4 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 4 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
5 2005, 2006, 2007 Free Software Foundation, Inc. 5 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
6 6
7This file is part of GNU Emacs. 7This file is part of GNU Emacs.
8 8
diff --git a/mac/src/chdir.c b/mac/src/chdir.c
index eb0670f3fd5..010e6d9fa01 100644
--- a/mac/src/chdir.c
+++ b/mac/src/chdir.c
@@ -1,6 +1,6 @@
1/* Implementation of chdir on the Mac for use with make-docfile. 1/* Implementation of chdir on the Mac for use with make-docfile.
2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
3 2005, 2006, 2007 Free Software Foundation, Inc. 3 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-27 08:21:01 +0000