diff lisp/frame.el @ 83541:694bbb62a75d

Merged from [e-mail] Patches applied: * [e-mail]/emacs--devo--0--patch-371 Update from CVS * [e-mail]/emacs--devo--0--patch-372 Update from CVS * [e-mail]/emacs--devo--0--patch-373 Update from CVS * [e-mail]/emacs--devo--0--patch-374 Update from CVS * [e-mail]/emacs--devo--0--patch-375 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-376 Update from CVS * [e-mail]/emacs--devo--0--patch-377 Update from CVS * [e-mail]/emacs--devo--0--patch-378 Update from CVS * [e-mail]/emacs--devo--0--patch-379 Merge from erc--emacs--21 * [e-mail]/emacs--devo--0--patch-380 Update from CVS * [e-mail]/emacs--devo--0--patch-381 Update from CVS * [e-mail]/emacs--devo--0--patch-382 Update from CVS * [e-mail]/emacs--devo--0--patch-383 Update from CVS * [e-mail]/emacs--devo--0--patch-384 Update from CVS * [e-mail]/emacs--devo--0--patch-385 Update from CVS * [e-mail]/emacs--devo--0--patch-386 Update from erc--emacs--22 * [e-mail]/emacs--devo--0--patch-387 Fix ERC bug introduced in last patch * [e-mail]/emacs--devo--0--patch-388 Update from erc--emacs--22 * [e-mail]/emacs--devo--0--patch-389 Update from CVS * [e-mail]/emacs--devo--0--patch-390 Update from CVS * [e-mail]/emacs--devo--0--patch-391 Update from CVS * [e-mail]/emacs--devo--0--patch-392 Update from CVS * [e-mail]/emacs--devo--0--patch-393 Update from CVS * [e-mail]/emacs--devo--0--patch-394 Update from CVS * [e-mail]/emacs--devo--0--patch-395 Update from CVS * [e-mail]/emacs--devo--0--patch-396 Update from CVS * [e-mail]/emacs--devo--0--patch-397 Update from CVS * [e-mail]/emacs--devo--0--patch-398 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-399 Update from CVS * [e-mail]/emacs--devo--0--patch-400 Update from CVS * [e-mail]/emacs--devo--0--patch-401 Update from CVS * [e-mail]/emacs--devo--0--patch-402 Update from CVS * [e-mail]/emacs--devo--0--patch-403 Rcirc update from Ryan Yeske * [e-mail]/emacs--devo--0--patch-404 Update from CVS * [e-mail]/emacs--devo--0--patch-405 Update from CVS * [e-mail]/emacs--devo--0--patch-406 Update from CVS * [e-mail]/emacs--devo--0--patch-407 Update from CVS * [e-mail]/emacs--devo--0--patch-408 Update from CVS * [e-mail]/emacs--devo--0--patch-409 Update from CVS * [e-mail]/emacs--devo--0--patch-410 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-411 Miscellaneous tq-related fixes. * [e-mail]/emacs--devo--0--patch-412 Update from CVS * [e-mail]/gnus--rel--5.10--patch-121 Update from CVS * [e-mail]/gnus--rel--5.10--patch-122 Update from CVS * [e-mail]/gnus--rel--5.10--patch-123 Update from CVS * [e-mail]/gnus--rel--5.10--patch-124 Update from CVS * [e-mail]/gnus--rel--5.10--patch-125 Update from CVS * [e-mail]/gnus--rel--5.10--patch-126 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-127 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-581

--- a/lisp/frame.el	Sun Jul 30 10:19:46 2006 +0000
+++ b/lisp/frame.el	Sat Oct 14 16:56:21 2006 +0000
@@ -1362,6 +1362,35 @@
 This timer calls `blink-cursor-timer-function' every
 `blink-cursor-interval' seconds.")
 
+(defun blink-cursor-start ()
+  "Timer function called from the timer `blink-cursor-idle-timer'.
+This starts the timer `blink-cursor-timer', which makes the cursor blink
+if appropriate.  It also arranges to cancel that timer when the next
+command starts, by installing a pre-command hook."
+  (when (null blink-cursor-timer)
+    ;; Set up the timer first, so that if this signals an error,
+    ;; blink-cursor-end is not added to pre-command-hook.
+    (setq blink-cursor-timer
+	  (run-with-timer blink-cursor-interval blink-cursor-interval
+			  'blink-cursor-timer-function))
+    (add-hook 'pre-command-hook 'blink-cursor-end)
+    (internal-show-cursor nil nil)))
+
+(defun blink-cursor-timer-function ()
+  "Timer function of timer `blink-cursor-timer'."
+  (internal-show-cursor nil (not (internal-show-cursor-p))))
+
+(defun blink-cursor-end ()
+  "Stop cursor blinking.
+This is installed as a pre-command hook by `blink-cursor-start'.
+When run, it cancels the timer `blink-cursor-timer' and removes
+itself as a pre-command hook."
+  (remove-hook 'pre-command-hook 'blink-cursor-end)
+  (internal-show-cursor nil t)
+  (when blink-cursor-timer
+    (cancel-timer blink-cursor-timer)
+    (setq blink-cursor-timer nil)))
+
 (define-minor-mode blink-cursor-mode
   "Toggle blinking cursor mode.
 With a numeric argument, turn blinking cursor mode on iff ARG is positive.
@@ -1374,53 +1403,22 @@
   :init-value (not (or noninteractive
 		       no-blinking-cursor
 		       (eq system-type 'ms-dos)
-		       (not (memq initial-window-system '(x w32 mac)))))
+		       (not (memq window-system '(x w32 mac)))))
   :initialize 'custom-initialize-safe-default
   :group 'cursor
   :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)))
+  (setq blink-cursor-idle-timer nil)
+  (blink-cursor-end)
+  (when blink-cursor-mode
+    ;; 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))))
 
 (define-obsolete-variable-alias 'blink-cursor 'blink-cursor-mode "22.1")
-
-(defun blink-cursor-start ()
-  "Timer function called from the timer `blink-cursor-idle-timer'.
-This starts the timer `blink-cursor-timer', which makes the cursor blink
-if appropriate.  It also arranges to cancel that timer when the next
-command starts, by installing a pre-command hook."
-  (when (null blink-cursor-timer)
-    (add-hook 'pre-command-hook 'blink-cursor-end)
-    (internal-show-cursor nil nil)
-    (setq blink-cursor-timer
-	  (run-with-timer blink-cursor-interval blink-cursor-interval
-			  'blink-cursor-timer-function))))
-
-(defun blink-cursor-timer-function ()
-  "Timer function of timer `blink-cursor-timer'."
-  (internal-show-cursor nil (not (internal-show-cursor-p))))
-
-(defun blink-cursor-end ()
-  "Stop cursor blinking.
-This is installed as a pre-command hook by `blink-cursor-start'.
-When run, it cancels the timer `blink-cursor-timer' and removes
-itself as a pre-command hook."
-  (remove-hook 'pre-command-hook 'blink-cursor-end)
-  (internal-show-cursor nil t)
-  (cancel-timer blink-cursor-timer)
-  (setq blink-cursor-timer nil))
-
-
 
 ;; Hourglass pointer