Merged from miles@gnu.org--gnu-2005 (patch 59, 240-245)

Patches applied:

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

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

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

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

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

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

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

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

diff --cc lisp/files.el
Simple merge

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

diff --cc lisp/startup.el
index 43faae63022ca46c909b42cc51446f69575f43cb,98cadbc9d9c91909876f44e66ac8180647601fb0..957a97081cda56914d4833a04d0ddfcbed1a286f
--- 1/lisp/startup.el
--- 2/lisp/startup.el
+++ b/lisp/startup.el
@@@ -721,8 -720,8 +725,8 @@@ opening the first frame (e.g. open a co
  
    ;; If frame was created with a menu bar, set menu-bar-mode on.
    (unless (or noninteractive
-             emacs-quick-startup
+             emacs-basic-display
 -              (and (memq window-system '(x w32))
 +              (and (memq initial-window-system '(x w32))
                     (<= (frame-parameter nil 'menu-bar-lines) 0)))
      (menu-bar-mode 1))
  

diff --cc lisp/term/xterm.el
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/keymap.c
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/window.c
Simple merge