Merged from miles@gnu.org--gnu-2005 (patch 39-44, 184-191)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-184
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-185
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-186
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-187
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-188
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-189
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-190
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-191
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-39
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-40
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-41
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-42
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-43
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-44
   Merge from emacs--cvs-trunk--0

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

diff --cc etc/TODO
Simple merge

diff --cc lib-src/emacsclient.c
index fbe7197,90c0228..3cc4cbe
--- 1/lib-src/emacsclient.c
--- 2/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@@ -41,12 -41,8 +41,12 @@@ Boston, MA 02111-1307, USA.  *
  # include <pwd.h>
  #endif /* not VMS */
  
 +#include <signal.h>
 +#include <errno.h>
 +
 +\f
  char *getenv (), *getwd ();
- char *getcwd ();
+ char *(getcwd) ();
  
  #ifndef VERSION
  #define VERSION "unspecified"

diff --cc lisp/bindings.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/font-lock.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/coding.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/macterm.h
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/xfaces.c
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xmenu.c
Simple merge