Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-49
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-50
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-51
   Make constrain-to-field notice overlays

 * emacs@sv.gnu.org/emacs--devo--0--patch-52
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-53
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-54
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-55
   Merge from erc--emacs--0

 * emacs@sv.gnu.org/emacs--devo--0--patch-56
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-57
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-58
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-59
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-60
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-61
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-62
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-63
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-64
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-65
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-66
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-67
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-68
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-69
   rcirc: Add flexible response formatting; Add nick abbrevs

 * emacs@sv.gnu.org/emacs--devo--0--patch-70
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-71
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-72
   Update from CVS: man/dired.texi (Tumme): More tumme documentation.

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-18
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-19
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-20
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-21
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-22
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-23
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-24
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-25
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-26
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-27
   Update from CVS: lisp/gnus.el: Remove bogus comment.

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-28
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-29
   Add sendmail.el and smptmail.el from Emacs tree to contrib/

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

28 files changed, 50 insertions, 31 deletions

diff --git a/mac/ChangeLog b/mac/ChangeLog
index 5f538eb09e0..5da9f7aca76 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * makefile.MPW (shortlisp, SOME_MACHINE_LISP): Sync with
+        src/Makefile.in.
+
 2005-12-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * makefile.MPW (macselect.c.x): Depend on keymap.h.
@@ -805,7 +810,8 @@
 ;; coding: iso-2022-7bit-unix
 ;; End:
 
-    Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005,
+        2006 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/Resources/English.lproj/InfoPlist.strings b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
index 8aa3d82c261..db6b39880e2 100644
--- a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
+++ b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
@@ -2,4 +2,4 @@
 
 CFBundleName = "Emacs";
 CFBundleShortVersionString = "22.0.50";
-CFBundleGetInfoString = "22.0.50, Copyright (C) 2005 Free Software Foundation, Inc.";
+CFBundleGetInfoString = "22.0.50, Copyright (C) 2006 Free Software Foundation, Inc.";
diff --git a/mac/INSTALL b/mac/INSTALL
index 9162ae6f08b..e887537354b 100644
--- a/mac/INSTALL
+++ b/mac/INSTALL
@@ -1,6 +1,7 @@
 * BUILDING EMACS ON MAC OS Classic AND MAC OS X     -*- outline -*-
 
-Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2005,
+   2006 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 e63086050f4..63ff2e76dd1 100644
--- a/mac/README
+++ b/mac/README
@@ -1,6 +1,7 @@
 Emacs for Mac OS Classic and Mac OS X
 
-Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2005,
+   2006 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 54bfc4be7e9..c05a57d0b53 100644
--- a/mac/cw6-mcp.xml
+++ b/mac/cw6-mcp.xml
@@ -1,5 +1,6 @@
 <!--
-Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2005,
+   2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/alloca.h b/mac/inc/alloca.h
index 216af944738..851089b3dac 100644
--- a/mac/inc/alloca.h
+++ b/mac/inc/alloca.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
+      2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/config.h b/mac/inc/config.h
index 24fe3b30c98..cdb7fd5b0e8 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, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 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 5073d8059a7..d4e309ebea7 100644
--- a/mac/inc/defs-cw6.h
+++ b/mac/inc/defs-cw6.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
+      2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/dirent.h b/mac/inc/dirent.h
index 17bbb60b8f4..da7b30085dc 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, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/epaths.h b/mac/inc/epaths.h
index c65f8589c6e..8d0539404f4 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, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/grp.h b/mac/inc/grp.h
index 058bc657016..90bb12a4078 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, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006 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 5e1f7db8112..a9a3fc3cd17 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, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/pwd.h b/mac/inc/pwd.h
index df452f30d97..17fcc8ff6ba 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, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 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 d0f00ed6c13..de1f573438a 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, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 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 f2686a5cc13..508a89869a6 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, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 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 bdf68b97357..22335db7c38 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, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 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 8849489f7c6..28f8f1e9d2c 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, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 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 2b8f9bfce79..dd99df5fda2 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, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 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 b28a87e7d32..e584cb89ff7 100644
--- a/mac/inc/sys/time.h
+++ b/mac/inc/sys/time.h
@@ -1,5 +1,6 @@
 /* Replacement sys/time.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2003, 2004, 2005,
+      2006 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 bdc4f6c5be2..34f3cbca87f 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, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/termio.h b/mac/inc/termio.h
index 596d6342177..fe1dd8ed945 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, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/utime.h b/mac/inc/utime.h
index 43281d40bfa..3a7456ee78e 100644
--- a/mac/inc/utime.h
+++ b/mac/inc/utime.h
@@ -1,5 +1,6 @@
 /* Replacement utime.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2003, 2004, 2005,
+      2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/utsname.h b/mac/inc/utsname.h
index fc120b014d7..e0c32e1c1ae 100644
--- a/mac/inc/utsname.h
+++ b/mac/inc/utsname.h
@@ -1,5 +1,6 @@
 /* Replacement utsname.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2003, 2004, 2005,
+      2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/make-package b/mac/make-package
index 85c6646c5da..26663f8eccf 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, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/mac/makefile.MPW b/mac/makefile.MPW
index ec9e4126371..6dc10cbbc81 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, 2002, 2003, 2004,
-#       2005 Free Software Foundation, Inc.
+#       2005, 2006 Free Software Foundation, Inc.
 #
 #    Author: Andrew Choi <akochoi@users.sourceforge.net>
 #
@@ -1039,6 +1039,7 @@ shortlisp = ¶
         {Lisp}help.elc ¶
         {Lisp}indent.elc ¶
         {Lisp}isearch.elc ¶
+        {Lisp}rfn-eshadow.elc ¶
         {Lisp}loadup.el ¶
         {Lisp}loaddefs.el ¶
         {Lisp}bindings.elc ¶
@@ -1113,9 +1114,13 @@ SOME_MACHINE_LISP = {Lisp}mouse.elc ¶
   {Lisp}ls-lisp.elc {Lisp}dos-fns.elc ¶
   {Lisp}w32-fns.elc {Lisp}dos-w32.elc ¶
   {Lisp}disp-table.elc {Lisp}dos-vars.elc ¶
-  {Lisp}tooltip.elc ¶
+  {Lisp}tooltip.elc {Lisp}image.elc ¶
+  {Lisp}dnd.elc {Lisp}mwheel.elc ¶
+  {Lisp}tool-bar.elc ¶
+  {Lisp}x-dnd.elc ¶
   {Lisp}international:ccl.elc ¶
-  {Lisp}international:codepage.elc
+  {Lisp}international:codepage.elc ¶
+  {Lisp}international:fontset.elc
 
 Doc Ä {DocTarget}DOC
 
diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r
index 4984704f9fc..138afca2ead 100644
--- a/mac/src/Emacs.r
+++ b/mac/src/Emacs.r
@@ -1,6 +1,6 @@
 /* Resource definitions for GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -222,7 +222,7 @@ resource 'vers' (1) {
         50,             /* Non-final release # */
         0,              /* Region code */
         "22.0.50",      /* Short version number */
-        "22.0.50, Copyright \0xa9 2005 "
+        "22.0.50, Copyright \0xa9 2006 "
         "Free Software Foundation, Inc." /* Long version number */
 };
 
diff --git a/mac/src/EmacsMPW.r b/mac/src/EmacsMPW.r
index 16866de9574..113524e6d3f 100644
--- a/mac/src/EmacsMPW.r
+++ b/mac/src/EmacsMPW.r
@@ -2,7 +2,7 @@
    under MPW.
 
    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/src/chdir.c b/mac/src/chdir.c
index 61d0b63a78e..324fdd801b2 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, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.