Merged in changes from CVS trunk. Plus added lisp/term tweaks.

Patches applied:

 * lorentey@elte.hu--2004/emacs--cvs-trunk--0--base-0
   tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-474

 * lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-1
   Add CVS metadata files.

 * lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-2
   Update from CVS.


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-393

28 files changed, 86 insertions, 27 deletions

diff --git a/mac/ChangeLog b/mac/ChangeLog
index a53b3cd89d4..acc89f75bd1 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * Emacs.app/Contents/Info.plist (mail-to, mail-selection): New
+        NSServices.
+
 2005-07-04  Lute Kamstra  <lute@gnu.org>
 
         Update FSF's address in GPL notices.
@@ -759,7 +764,7 @@
 ;; coding: iso-2022-7bit-unix
 ;; End:
 
-    Copyright (C) 2001 Free Software Foundation, Inc.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005 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/mac/Emacs.app/Contents/Info.plist b/mac/Emacs.app/Contents/Info.plist
index 7f79e8f6ab0..176dbf81276 100644
--- a/mac/Emacs.app/Contents/Info.plist
+++ b/mac/Emacs.app/Contents/Info.plist
@@ -75,6 +75,44 @@
                                 <string>NSStringPboardType</string>
                         </array>
                 </dict>
+                <dict>
+                        <key>NSKeyEquivalent</key>
+                        <dict/>
+                        <key>NSMenuItem</key>
+                        <dict>
+                                <key>default</key>
+                                <string>Emacs/Send Selection</string>
+                        </dict>
+                        <key>NSMessage</key>
+                        <string>mail-selection</string>
+                        <key>NSPortName</key>
+                        <string>Emacs</string>
+                        <key>NSReturnTypes</key>
+                        <array/>
+                        <key>NSSendTypes</key>
+                        <array>
+                                <string>NSStringPboardType</string>
+                        </array>
+                </dict>
+                <dict>
+                        <key>NSKeyEquivalent</key>
+                        <dict/>
+                        <key>NSMenuItem</key>
+                        <dict>
+                                <key>default</key>
+                                <string>Emacs/Send To</string>
+                        </dict>
+                        <key>NSMessage</key>
+                        <string>mail-to</string>
+                        <key>NSPortName</key>
+                        <string>Emacs</string>
+                        <key>NSReturnTypes</key>
+                        <array/>
+                        <key>NSSendTypes</key>
+                        <array>
+                                <string>NSStringPboardType</string>
+                        </array>
+                </dict>
         </array>
 </dict>
 </plist>
diff --git a/mac/INSTALL b/mac/INSTALL
index 9dcf1324f7d..c8af7e5f484 100644
--- a/mac/INSTALL
+++ b/mac/INSTALL
@@ -1,6 +1,6 @@
 * BUILDING EMACS ON MAC OS 8/9 AND MAC OS X     -*- outline -*-
 
-Copyright (c) 2001, 2002, 2004 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim
    copies of this document as received, in any medium, provided that
diff --git a/mac/README b/mac/README
index 6a352e04af6..18e0942b365 100644
--- a/mac/README
+++ b/mac/README
@@ -1,6 +1,6 @@
 Emacs for Mac OS 8/9 and Mac OS X
 
-Copyright (c) 2001-4 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim
    copies of this document as received, in any medium, provided that
diff --git a/mac/cw6-mcp.xml b/mac/cw6-mcp.xml
index 4d3ae5a8c22..54bfc4be7e9 100644
--- a/mac/cw6-mcp.xml
+++ b/mac/cw6-mcp.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright (C) 2001 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/alloca.h b/mac/inc/alloca.h
index d8494e17b66..216af944738 100644
--- a/mac/inc/alloca.h
+++ b/mac/inc/alloca.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/config.h b/mac/inc/config.h
index 6cd2f52bbba..2bac002cc7c 100644
--- a/mac/inc/config.h
+++ b/mac/inc/config.h
@@ -1,7 +1,8 @@
 /* Handcrafted Emacs site configuration file for Mac OS 9.  -*- C -*- */
 
 /* GNU Emacs site configuration template file.  -*- C -*-
-   Copyright (C) 1988, 1993, 1994, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2003, 2004,
+      2005 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 e7b56444af1..5073d8059a7 100644
--- a/mac/inc/defs-cw6.h
+++ b/mac/inc/defs-cw6.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/dirent.h b/mac/inc/dirent.h
index c29e2a743f3..17bbb60b8f4 100644
--- a/mac/inc/dirent.h
+++ b/mac/inc/dirent.h
@@ -1,5 +1,6 @@
 /* Replacement dirent.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2003, 2004,
+      2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/epaths.h b/mac/inc/epaths.h
index dc9b8ed495f..c65f8589c6e 100644
--- a/mac/inc/epaths.h
+++ b/mac/inc/epaths.h
@@ -1,7 +1,8 @@
 /* Hey Emacs, this is -*- C -*- code!  */
 
 /* Handcrafted epaths.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2003, 2004,
+      2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/grp.h b/mac/inc/grp.h
index c9db51282c0..058bc657016 100755
--- a/mac/inc/grp.h
+++ b/mac/inc/grp.h
@@ -1,5 +1,5 @@
 /* Replacement grp.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005 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 37ce77cea30..5e1f7db8112 100644
--- a/mac/inc/m-mac.h
+++ b/mac/inc/m-mac.h
@@ -1,5 +1,6 @@
 /* Handcrafted m-mac.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2003, 2004,
+      2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/pwd.h b/mac/inc/pwd.h
index ee77176e2af..df452f30d97 100644
--- a/mac/inc/pwd.h
+++ b/mac/inc/pwd.h
@@ -1,5 +1,6 @@
 /* Replacement pwd.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2003, 2004,
+      2005 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 ab8dbcdad89..d0f00ed6c13 100644
--- a/mac/inc/s-mac.h
+++ b/mac/inc/s-mac.h
@@ -1,5 +1,6 @@
 /* Handcrafted s-mac.h file for building GNU Emacs on Mac OS 9.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2003, 2004,
+      2005 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 1b0a0314539..f2686a5cc13 100644
--- a/mac/inc/sys/file.h
+++ b/mac/inc/sys/file.h
@@ -1,5 +1,6 @@
 /* Replacement sys/file.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2003, 2004,
+      2005 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 2682dd45438..bdf68b97357 100644
--- a/mac/inc/sys/ioctl.h
+++ b/mac/inc/sys/ioctl.h
@@ -1,5 +1,6 @@
 /* Replacement sys/ioctl.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2003, 2004,
+      2005 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 b1669947bf9..8849489f7c6 100644
--- a/mac/inc/sys/param.h
+++ b/mac/inc/sys/param.h
@@ -1,5 +1,6 @@
 /* Replacement sys/param.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2003, 2004,
+      2005 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 c1c9f4a7842..2b8f9bfce79 100644
--- a/mac/inc/sys/stat.h
+++ b/mac/inc/sys/stat.h
@@ -1,5 +1,6 @@
 /* Replacement sys/stat.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2003, 2004,
+      2005 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 76b5e3acbc4..b28a87e7d32 100644
--- a/mac/inc/sys/time.h
+++ b/mac/inc/sys/time.h
@@ -1,5 +1,5 @@
 /* Replacement sys/time.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2003, 2004, 2005 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 7055a7a5d0d..bdc4f6c5be2 100644
--- a/mac/inc/sys/types.h
+++ b/mac/inc/sys/types.h
@@ -1,5 +1,6 @@
 /* Replacement sys/types.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2003, 2004,
+      2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/termio.h b/mac/inc/termio.h
index be5b0243e2f..596d6342177 100644
--- a/mac/inc/termio.h
+++ b/mac/inc/termio.h
@@ -1,5 +1,6 @@
 /* Replacement termio.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2003, 2004,
+      2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/utime.h b/mac/inc/utime.h
index dbe9544aca1..43281d40bfa 100644
--- a/mac/inc/utime.h
+++ b/mac/inc/utime.h
@@ -1,5 +1,5 @@
 /* Replacement utime.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/utsname.h b/mac/inc/utsname.h
index 27cfbe4dcaa..fc120b014d7 100644
--- a/mac/inc/utsname.h
+++ b/mac/inc/utsname.h
@@ -1,5 +1,5 @@
 /* Replacement utsname.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/make-package b/mac/make-package
index e8bf66aaaa8..bef6aa9b2de 100755
--- a/mac/make-package
+++ b/mac/make-package
@@ -18,7 +18,7 @@
 ####     files inside /usr.  This will replace the default version of
 ####     emacs included with Mac OS X.
 
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/mac/makefile.MPW b/mac/makefile.MPW
index 1a2c4385658..9d8eda541cf 100644
--- a/mac/makefile.MPW
+++ b/mac/makefile.MPW
@@ -1,5 +1,6 @@
 #    Make file for building GNU Emacs on the Macintosh.
-#    Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+#    Copyright (C) 1999, 2000, 2002, 2003, 2004,
+#       2005 Free Software Foundation, Inc.
 #
 #    Author: Andrew Choi <akochoi@users.sourceforge.net>
 #
diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r
index a36249a42a2..4984704f9fc 100644
--- a/mac/src/Emacs.r
+++ b/mac/src/Emacs.r
@@ -1,5 +1,6 @@
 /* Resource definitions for GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2003, 2004,
+      2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/src/EmacsMPW.r b/mac/src/EmacsMPW.r
index 133ba1a030e..16866de9574 100644
--- a/mac/src/EmacsMPW.r
+++ b/mac/src/EmacsMPW.r
@@ -1,7 +1,8 @@
 /* Resource definitions for GNU Emacs on the Macintosh when building
    under MPW.
 
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2003, 2004,
+      2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/src/chdir.c b/mac/src/chdir.c
index cf7ac5f0375..61d0b63a78e 100644
--- a/mac/src/chdir.c
+++ b/mac/src/chdir.c
@@ -1,5 +1,6 @@
 /* Implementation of chdir on the Mac for use with make-docfile.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2003, 2004,
+      2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.