Merged from miles@gnu.org--gnu-2005 (patch 182-184, 691-699)

Patches applied:

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-697
   Checkout man/cc-mode.texi from CVS with RCS keywords disabled

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

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

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

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

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

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

diff --cc configure
index ef24e648937be46901e95851b417d8237ab45b66,9f11d615a046c783b428bf06e88bfe7f1e832a72..9db1d7dfb79df11135ae0311e8971878aba84790
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -8072,7 -8354,7 +8304,7 @@@ _ACEO
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
--#include <X11/Intrinsic.h>
++#include <X11/Xlib.h>
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@@ -8099,7 -8381,7 +8331,7 @@@ els
  sed 's/^/| /' conftest.$ac_ext >&5
  
    for ac_dir in $ac_x_header_dirs; do
--  if test -r "$ac_dir/X11/Intrinsic.h"; then
++  if test -r "$ac_dir/X11/Xlib.h"; then
      ac_x_includes=$ac_dir
      break
    fi
@@@ -8113,18 -8395,18 +8345,18 @@@ if test "$ac_x_libraries" = no; the
    # See if we find them without any special options.
    # Don't add to $LIBS permanently.
    ac_save_LIBS=$LIBS
--  LIBS="-lXt $LIBS"
++  LIBS="-lX11 $LIBS"
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
--#include <X11/Intrinsic.h>
++#include <X11/Xlib.h>
  int
  main ()
  {
--XtMalloc (0)
++XrmInitialize ()
    ;
    return 0;
  }
@@@ -8162,7 -8445,7 +8394,7 @@@ for ac_dir in `echo "$ac_x_includes $ac
  do
    # Don't even attempt the hair of trying to link an X program!
    for ac_extension in a so sl; do
--    if test -r $ac_dir/libXt.$ac_extension; then
++    if test -r $ac_dir/libX11.$ac_extension; then
        ac_x_libraries=$ac_dir
        break 2
      fi
@@@ -21664,18 -22175,18 +21896,24 @@@ els
    ac_cv_func_fork_works=cross
  else
    cat >conftest.$ac_ext <<_ACEOF
--/* By Ruediger Kuhlmann. */
--      #include <sys/types.h>
--      #if HAVE_UNISTD_H
--      # include <unistd.h>
--      #endif
--      /* Some systems only have a dummy stub for fork() */
--      int main ()
--      {
--      if (fork() < 0)
--        exit (1);
--      exit (0);
--      }
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++
++        /* By Ruediger Kuhlmann. */
++        if (fork() < 0)
++          exit (1);
++        exit (0);
++
++  ;
++  return 0;
++}
  _ACEOF
  rm -f conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

diff --cc configure.in
Simple merge

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

diff --cc lisp/help-fns.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc man/cc-mode.texi
index 0d6e88f20eaed96f87f661e4b58dcb83e0af796e,92d4ac20aa0db99162371c93b9f10a55d406ca8d..3d9eafb0da57c4c32c31fcba9639eef1270f8072
--- 1/man/cc-mode.texi
--- 2/man/cc-mode.texi
+++ b/man/cc-mode.texi
@@@ -208,7 -208,7 +208,7 @@@ license to the document, as described i
  @vskip 0pt plus 1filll
  @insertcopying
  
- This manual was generated from $Revision: 1.32 $ of $RCSfile: cc-mode.texi,v $, which can be
 -This manual was generated from $Revision: 5.241 $ of $RCSfile: cc-mode.texi,v $, which can be
++This manual was generated from $Revision$ of $RCSfile$, which can be
  downloaded from
  @url{http://cvs.sf.net/viewcvs.py/cc-mode/cc-mode/cc-mode.texi}.
  @end titlepage

diff --cc src/Makefile.in
index 4b40e5acecbaecc3d794696f60137b163cdfab09,878b34fb7a34b3e662b2eda06d3b02f10f9b9639..61f1d0d6698aa06786a144d62dfefcb830a7d588
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -904,12 -915,13 +919,15 @@@ SOME_MACHINE_LISP = ${dotdot}/lisp/mous
    ${dotdot}/lisp/ls-lisp.elc ${dotdot}/lisp/dos-fns.elc \
    ${dotdot}/lisp/w32-fns.elc ${dotdot}/lisp/dos-w32.elc \
    ${dotdot}/lisp/disp-table.elc ${dotdot}/lisp/dos-vars.elc \
-   ${dotdot}/lisp/tooltip.elc \
+   ${dotdot}/lisp/tooltip.elc ${dotdot}/lisp/image.elc \
+   ${dotdot}/lisp/dnd.elc ${dotdot}/lisp/mwheel.elc \
+   ${dotdot}/lisp/tool-bar.elc \
+   ${dotdot}/lisp/x-dnd.elc \
    ${dotdot}/lisp/international/ccl.elc \
    ${dotdot}/lisp/international/codepage.elc \
-   ${dotdot}/lisp/mouse.elc ${dotdot}/lisp/international/fontset.elc \
-   ${dotdot}/lisp/dnd.elc ${dotdot}/lisp/x-dnd.elc \
+   ${dotdot}/lisp/international/fontset.elc
++  ${dotdot}/lisp/mouse.elc \
 +  ${dotdot}/lisp/term/x-win.elc
  
  /* Construct full set of libraries to be linked.
     Note that SunOS needs -lm to come before -lc; otherwise, you get

diff --cc src/macterm.c
Simple merge

diff --cc src/process.c
Simple merge