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

Patches applied:

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

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

diff --cc lisp/frame.el
index 7058c91,5da549f..e581a58
--- 1/lisp/frame.el
--- 2/lisp/frame.el
+++ b/lisp/frame.el
@@@ -1364,27 -1269,27 +1340,27 @@@ window blinks
  Note that this command is effective only when Emacs
  displays through a window system, because then Emacs does its own
  cursor display.  On a text-only terminal, this is not implemented."
-   (interactive "P")
-   (let ((on-p (if (null arg)
-                 (not blink-cursor-mode)
-               (> (prefix-numeric-value arg) 0))))
-     (if blink-cursor-idle-timer
-       (cancel-timer blink-cursor-idle-timer))
-     (if blink-cursor-timer
-       (cancel-timer blink-cursor-timer))
-     (setq blink-cursor-idle-timer nil
-         blink-cursor-timer nil
-         blink-cursor-mode nil)
-     (if on-p
-       (progn
-         ;; Hide the cursor.
-         ;(internal-show-cursor nil nil)
-         (setq blink-cursor-idle-timer
-               (run-with-idle-timer blink-cursor-delay
-                                    blink-cursor-delay
-                                    'blink-cursor-start))
-         (setq blink-cursor-mode t))
-       (internal-show-cursor nil t))))
+   :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)))))
+   :global t
+   (if blink-cursor-idle-timer (cancel-timer blink-cursor-idle-timer))
+   (if blink-cursor-timer (cancel-timer blink-cursor-timer))
+   (setq blink-cursor-idle-timer nil
+       blink-cursor-timer nil)
+   (if blink-cursor-mode
+       (progn
+       ;; Hide the cursor.
+       ;;(internal-show-cursor nil nil)
+       (setq blink-cursor-idle-timer
+             (run-with-idle-timer blink-cursor-delay
+                                  blink-cursor-delay
+                                  'blink-cursor-start)))
+     (internal-show-cursor nil t)))
+ 
+ (defvaralias 'blink-cursor 'blink-cursor-mode)
+ (make-obsolete-variable 'blink-cursor 'blink-cursor-mode "22.1")
  
  (defun blink-cursor-start ()
    "Timer function called from the timer `blink-cursor-idle-timer'.
@@@ -1448,9 -1353,7 +1424,9 @@@ Use Custom to set this variable to get 
  (define-key ctl-x-5-map "0" 'delete-frame)
  (define-key ctl-x-5-map "o" 'other-frame)
  
 +(substitute-key-definition 'suspend-emacs 'suspend-frame global-map)
 +
  (provide 'frame)
  
- ;;; arch-tag: 82979c70-b8f2-4306-b2ad-ddbd6b328b56
+ ;; arch-tag: 82979c70-b8f2-4306-b2ad-ddbd6b328b56
  ;;; frame.el ends here

diff --cc src/xdisp.c
Simple merge