Merged from miles@gnu.org--gnu-2005 (patch 28-30, 126-128)

Patches applied:

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

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

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

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

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

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

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

diff --cc lisp/frame.el
index e581a586b3e27973ad6f8683888b8cb3e4bd2674,6e04537731da4e5e7a315264d078ac8489b8a2c9..0fa10babf125fa5f336e9464c6482d3a02205c38
--- 1/lisp/frame.el
--- 2/lisp/frame.el
+++ b/lisp/frame.el
@@@ -1343,7 -1272,8 +1343,8 @@@ cursor display.  On a text-only termina
    :init-value (not (or noninteractive
                       emacs-quick-startup
                       (eq system-type 'ms-dos)
 -                     (not (memq window-system '(x w32)))))
 +                     (not (memq initial-window-system '(x w32)))))
+   :group 'cursor
    :global t
    (if blink-cursor-idle-timer (cancel-timer blink-cursor-idle-timer))
    (if blink-cursor-timer (cancel-timer blink-cursor-timer))

diff --cc lisp/subr.el
Simple merge