Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

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

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-27
   Use the same directory explicit id-tags as Emacs where possible

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-28
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-29
   Update from CVS

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

diff --cc admin/FOR-RELEASE
index 05bbd0b,65ff3a3..61cc822
--- 1/admin/FOR-RELEASE
--- 2/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@@ -44,156 -44,111 +44,109 @@@ isearch faces
  
  ** Check the Emacs manual.
  
 -Each manual section should be proof-read by two people.  Write you
 -name/initials in the DONE1 or DONE2 column when you have proof-read
 -the corresponding manual section.
 +Write you name/initials in the DONE column when you have
 +proof-read the corresponding manual section.
  
 -DONE1 DONE2   SECTION
 +DONE  SECTION
  ---------------------------------------------
 -              man/abbrevs.texi
 -              man/anti.texi
 -LT            man/basic.texi
 -LT            man/buffers.texi
 -              man/building.texi
 -              man/calendar.texi
 -              man/cmdargs.texi
 -LT            man/commands.texi
 -              man/custom.texi
 -              man/dired.texi
 -LT            man/display.texi
 -LT            man/emacs.texi
 -LT            man/entering.texi
 -LT            man/files.texi
 -LT            man/fixit.texi
 -LT            man/frames.texi
 -              man/glossary.texi
 -LT            man/help.texi
 -LT            man/indent.texi
 -LT            man/killing.texi
 -LT            man/kmacro.texi
 -              man/macos.texi
 -              man/maintaining.texi
 -LT            man/major.texi
 -LT            man/mark.texi
 -LT            man/mini.texi
 -              man/misc.texi
 -              man/msdog.texi
 -LT            man/mule.texi
 -LT            man/m-x.texi
 -              man/picture.texi
 -              man/programs.texi
 -LT            man/regs.texi
 -              man/rmail.texi
 -LT            man/screen.texi
 -LT            man/search.texi
 -              man/sending.texi
 -LT            man/text.texi
 -              man/trouble.texi
 -LT            man/windows.texi
 -              man/xresources.texi
 +      man/abbrevs.texi
-       man/ack.texi
-       man/ada-mode.texi
 +      man/anti.texi
-       man/autotype.texi
-       man/back.texi
-       man/basic.texi
-       man/buffers.texi
++LT    man/basic.texi
++LT    man/buffers.texi
 +      man/building.texi
-       man/calc.texi
 +      man/calendar.texi
-       man/cc-mode.texi
-       man/cl.texi
 +      man/cmdargs.texi
-       man/commands.texi
++LT    man/commands.texi
 +      man/custom.texi
 +      man/dired.texi
-       man/dired-x.texi
-       man/display.texi
-       man/doclicense.texi
-       man/ebrowse.texi
-       man/ediff.texi
-       man/emacs-mime.texi
-       man/emacs.texi
-       man/emacs-xtra.texi
-       man/entering.texi
-       man/eshell.texi
-       man/eudc.texi
-       man/faq.texi
-       man/files.texi
-       man/fixit.texi
-       man/flymake.texi
-       man/forms.texi
-       man/frames.texi
++LT    man/display.texi
++LT    man/emacs.texi
++LT    man/entering.texi
++LT    man/files.texi
++LT    man/fixit.texi
++LT    man/frames.texi
 +      man/glossary.texi
-       man/gnus-faq.texi
-       man/gnus.texi
-       man/gnu.texi
-       man/help.texi
-       man/idlwave.texi
-       man/indent.texi
-       man/info.texi
-       man/killing.texi
-       man/kmacro.texi
++LT    man/help.texi
++LT    man/indent.texi
++LT    man/killing.texi
++LT    man/kmacro.texi
 +      man/macos.texi
 +      man/maintaining.texi
-       man/major.texi
-       man/mark.texi
-       man/message.texi
-       man/mh-e.texi
-       man/mini.texi
++LT    man/major.texi
++LT    man/mark.texi
++LT    man/mini.texi
 +      man/misc.texi
 +      man/msdog.texi
-       man/mule.texi
-       man/m-x.texi
-       man/pcl-cvs.texi
-       man/pgg.texi
++LT    man/mule.texi
++LT    man/m-x.texi
 +      man/picture.texi
 +      man/programs.texi
-       man/reftex.texi
-       man/regs.texi
++LT    man/regs.texi
 +      man/rmail.texi
-       man/screen.texi
-       man/sc.texi
-       man/search.texi
++LT    man/screen.texi
++LT    man/search.texi
 +      man/sending.texi
-       man/ses.texi
-       man/sieve.texi
-       man/smtpmail.texi
-       man/speedbar.texi
-       man/texinfo.tex
-       man/text.texi
-       man/tramp.texi
-       man/trampver.texi
++LT    man/text.texi
 +      man/trouble.texi
-       man/viper.texi
-       man/vip.texi
-       man/widget.texi
-       man/windows.texi
-       man/woman.texi
++LT    man/windows.texi
 +      man/xresources.texi
  
  ** Check the Emacs Lisp manual.
  
 -Each manual section should be proof-read by two people.  Write you
 -name/initials in the DONE1 or DONE2 column when you have proof-read
 -the corresponding manual section.
 +Write you name/initials in the DONE column when you have
 +proof-read the corresponding manual section.
  
 -DONE1 DONE2   SECTION
 +DONE  SECTION
  ---------------------------------------------
-       lispref/abbrevs.texi
 -LT            lispref/abbrevs.texi
 -              lispref/advice.texi
 -              lispref/anti.texi
 -LT            lispref/backups.texi
 -LT            lispref/buffers.texi
 -              lispref/calendar.texi
 -LT            lispref/commands.texi
 -LT            lispref/compile.texi
 -LT            lispref/control.texi
 -              lispref/customize.texi
 -              lispref/debugging.texi
 -              lispref/display.texi
 -              lispref/edebug.texi
 -LT            lispref/elisp.texi
 -LT            lispref/errors.texi
 -LT            lispref/eval.texi
 -LT            lispref/files.texi
 -LT            lispref/frames.texi
 -LT            lispref/functions.texi
 -LT            lispref/hash.texi
 -LT            lispref/help.texi
 -              lispref/hooks.texi
 -LT            lispref/internals.texi
 -LT            lispref/intro.texi
 -LT            lispref/keymaps.texi
 -LT            lispref/lists.texi
 -LT            lispref/loading.texi
 -              lispref/locals.texi
 -LT            lispref/macros.texi
 -              lispref/maps.texi
 -LT            lispref/markers.texi
 -LT            lispref/minibuf.texi
 -              lispref/modes.texi
 -LT            lispref/nonascii.texi
 -LT            lispref/numbers.texi
 -LT            lispref/objects.texi
 -LT            lispref/os.texi
 -LT            lispref/positions.texi
 -              lispref/processes.texi
 -LT            lispref/searching.texi
 -LT            lispref/sequences.texi
 -LT            lispref/streams.texi
 -LT            lispref/strings.texi
 -LT            lispref/symbols.texi
 -LT            lispref/syntax.texi
 -              lispref/text.texi
 -LT            lispref/tips.texi
 -LT            lispref/variables.texi
 -LT            lispref/windows.texi
++LT    lispref/abbrevs.texi
 +      lispref/advice.texi
 +      lispref/anti.texi
-       lispref/back.texi
-       lispref/backups.texi
-       lispref/buffers.texi
++LT    lispref/backups.texi
++LT    lispref/buffers.texi
 +      lispref/calendar.texi
-       lispref/commands.texi
-       lispref/compile.texi
-       lispref/control.texi
++LT    lispref/commands.texi
++LT    lispref/compile.texi
++LT    lispref/control.texi
 +      lispref/customize.texi
 +      lispref/debugging.texi
 +      lispref/display.texi
-       lispref/doclicense.texi
 +      lispref/edebug.texi
-       lispref/elisp-covers.texi
-       lispref/elisp.texi
-       lispref/errors.texi
-       lispref/eval.texi
-       lispref/files.texi
-       lispref/frames.texi
-       lispref/front-cover-1.texi
-       lispref/functions.texi
-       lispref/gpl.texi
-       lispref/hash.texi
-       lispref/help.texi
++LT    lispref/elisp.texi
++LT    lispref/errors.texi
++LT    lispref/eval.texi
++LT    lispref/files.texi
++LT    lispref/frames.texi
++LT    lispref/functions.texi
++LT    lispref/hash.texi
++LT    lispref/help.texi
 +      lispref/hooks.texi
-       lispref/index.texi
-       lispref/internals.texi
-       lispref/intro.texi
-       lispref/keymaps.texi
-       lispref/lay-flat.texi
-       lispref/lists.texi
-       lispref/loading.texi
++LT    lispref/internals.texi
++LT    lispref/intro.texi
++LT    lispref/keymaps.texi
++LT    lispref/lists.texi
++LT    lispref/loading.texi
 +      lispref/locals.texi
-       lispref/macros.texi
++LT    lispref/macros.texi
 +      lispref/maps.texi
-       lispref/markers.texi
-       lispref/minibuf.texi
++LT    lispref/markers.texi
++LT    lispref/minibuf.texi
 +      lispref/modes.texi
-       lispref/nonascii.texi
-       lispref/numbers.texi
-       lispref/objects.texi
-       lispref/os.texi
-       lispref/positions.texi
++LT    lispref/nonascii.texi
++LT    lispref/numbers.texi
++LT    lispref/objects.texi
++LT    lispref/os.texi
++LT    lispref/positions.texi
 +      lispref/processes.texi
-       lispref/searching.texi
-       lispref/sequences.texi
-       lispref/streams.texi
-       lispref/strings.texi
-       lispref/symbols.texi
-       lispref/syntax.texi
++LT    lispref/searching.texi
++LT    lispref/sequences.texi
++LT    lispref/streams.texi
++LT    lispref/strings.texi
++LT    lispref/symbols.texi
++LT    lispref/syntax.texi
 +      lispref/text.texi
-       lispref/tips.texi
-       lispref/variables.texi
-       lispref/windows.texi
++LT    lispref/tips.texi
++LT    lispref/variables.texi
++LT    lispref/windows.texi
  
  \f
  Local variables:

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge