Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987

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 @@
 ;; End:
 
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
-	2006, 2007 Free Software Foundation, Inc.
+	2006, 2007, 2008 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
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 @@
 <!--
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
   Free Software Foundation, Inc.
 
 This 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 @@
 * BUILDING EMACS ON MAC OS Classic AND MAC OS X     -*- outline -*-
 
 Copyright (C) 2001, 2002, 2003, 2004, 2005,
-   2006, 2007 Free Software Foundation, Inc.
+   2006, 2007, 2008 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/mac/README b/mac/README
index f02527d6383..bc6b075f598 100644
--- a/mac/README
+++ b/mac/README
@@ -1,7 +1,7 @@
 Emacs for Mac OS Classic and Mac OS X
 
 Copyright (C) 2001, 2002, 2003, 2004, 2005,
-   2006, 2007 Free Software Foundation, Inc.
+   2006, 2007, 2008 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
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 @@
 <!--
 Copyright (C) 2001, 2002, 2003, 2004, 2005,
-   2006, 2007 Free Software Foundation, Inc.
+   2006, 2007, 2008 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
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 @@
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-      2006, 2007 Free Software Foundation, Inc.
+      2006, 2007, 2008 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
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 @@
 
 /* GNU Emacs site configuration template file.  -*- C -*-
    Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006, 2007  Free Software Foundation, Inc.
+      2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
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 @@
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-      2006, 2007 Free Software Foundation, Inc.
+      2006, 2007, 2008 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
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 @@
 /* Replacement dirent.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006, 2007  Free Software Foundation, Inc.
+      2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
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 @@
 
 /* Handcrafted epaths.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006, 2007  Free Software Foundation, Inc.
+      2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
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 @@
 /* Replacement grp.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
+     Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
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 @@
 /* Handcrafted m-mac.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006, 2007  Free Software Foundation, Inc.
+      2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
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 @@
 /* Replacement pwd.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006, 2007  Free Software Foundation, Inc.
+      2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
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 @@
 /* Handcrafted s-mac.h file for building GNU Emacs on Mac OS 9.
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006, 2007  Free Software Foundation, Inc.
+      2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
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 @@
 /* Replacement sys/file.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006, 2007  Free Software Foundation, Inc.
+      2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
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 @@
 /* Replacement sys/ioctl.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006, 2007  Free Software Foundation, Inc.
+      2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
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 @@
 /* Replacement sys/param.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006, 2007  Free Software Foundation, Inc.
+      2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
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 @@
 /* Replacement sys/stat.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006, 2007  Free Software Foundation, Inc.
+      2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
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 @@
 /* Replacement sys/time.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
-      2006, 2007  Free Software Foundation, Inc.
+      2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
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 @@
 /* Replacement sys/types.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006, 2007  Free Software Foundation, Inc.
+      2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
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 @@
 /* Replacement termio.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006, 2007  Free Software Foundation, Inc.
+      2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
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 @@
 /* Replacement utime.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
-      2006, 2007  Free Software Foundation, Inc.
+      2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
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 @@
 /* Replacement utsname.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
-      2006, 2007  Free Software Foundation, Inc.
+      2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
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 @@
 ####     files inside /usr.  This will replace the default version of
 ####     emacs included with Mac OS X.
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
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 @@
 #    Make file for building GNU Emacs on the Macintosh.
 #    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-#       2005, 2006, 2007  Free Software Foundation, Inc.
+#       2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 #
 #    Author: Andrew Choi <akochoi@users.sourceforge.net>
 #
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 @@
    under MPW.
 
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006, 2007  Free Software Foundation, Inc.
+      2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
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 @@
 /* Implementation of chdir on the Mac for use with make-docfile.
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006, 2007  Free Software Foundation, Inc.
+      2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.