Merged from miles@gnu.org--gnu-2005 (patch 91-94)

Patches applied:

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

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

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

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

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

diff --cc lisp/frame.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
index baad2d7,790d870..b66ceb3
--- 1/lisp/startup.el
--- 2/lisp/startup.el
+++ b/lisp/startup.el
@@@ -746,8 -742,7 +749,7 @@@ opening the first frame (e.g. open a co
    (unless (or noninteractive
              emacs-quick-startup
                (eq system-type 'ms-dos)
 -              (not (memq window-system '(x w32))))
 +              (not (memq initial-window-system '(x w32))))
-     (setq-default blink-cursor t)
      (blink-cursor-mode 1))
  
    (unless noninteractive

diff --cc src/keyboard.c
Simple merge

diff --cc src/xdisp.c
Simple merge