Merged from emacs@sv.gnu.org.

Patches applied:

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

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

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

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

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

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

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

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

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

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

diff --cc configure
Simple merge

diff --cc configure.in
Simple merge

diff --cc lisp/ChangeLog
index 896fec114bb8149df48cc11cb7fd737b3cfb5a0c,ad94208356614621adda3f64053e1ac6994ce4a3..0ae22128fe1d72cdf1dc886d10db3901712fd6a9
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,3 -1,45 +1,34 @@@
 -2006-10-30  Kenichi Handa  <handa@m17n.org>
 -
 -      * files.el (revert-buffer): If a unibyte buffer is being reverted
 -      with a coding system for multibyte, set buffer multibyte before
 -      calling insert-file-contents.
 -
 -2006-10-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 -
 -      * server.el (server-select-display): Use a dummy buffer to detect when
 -      the frame is later used.
 -      (server-select-display): New function.
 -      (server-process-filter): Use it to detect unused temp frames.
 -
+ 2006-10-29  Stephen Leake  <stephen_leake@stephe_leake.org>
+ 
+       * progmodes/ada-mode.el: Change maintainer, apply
 -      whitespace-clean, checkdoc.  Minor improvements to many doc strings.
++      whitespace-clean, checkdoc.  Minor improvements to many doc
++      strings.
+       (ada-mode-version): New function.
+       (ada-create-menu): Menu operations are available for all supported
+       compilers.
+ 
+ 2006-10-29  Lars Hansen  <larsh@soem.dk>
+       * net/tramp.el (with-parsed-tramp-file-name): Correct debug
+       spec.  Highlight as keyword.
+       (tramp-do-copy-or-rename-file): Correct data for 'file-already-exists.
+       Don't call tramp-method-out-of-band-p for local files.
+       (tramp-touch): Quote file name.
+ 
+ 2006-10-28  Glenn Morris  <rgm@gnu.org>
+ 
+       * calendar/calendar.el (cal-html-cursor-month)
+       (cal-html-cursor-year): Add autoloads for this new package.
 -      (calendar-mode-map): Bind cal-html-cursor-month, cal-html-cursor-year.
++      (calendar-mode-map): Bind cal-html-cursor-month,
++      cal-html-cursor-year.
+ 
+ 2006-10-28  Anna Bigatti  <bigatti@dima.unige.it>
+ 
+       * calendar/cal-html.el: New file.
+ 
+ 2006-10-28  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * emacs-lisp/authors.el (authors-aliases): Update.
+ 
  2006-10-27  Chong Yidong  <cyd@stupidchicken.com>
  
        * version.el (emacs-version): Bump version number to 22.0.90.

diff --cc src/window.c
Simple merge