diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-05-18 08:58:30 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-05-18 08:58:30 -0400 |
| commit | 08a2434e2f7a60fc558e052e37409333582504cb (patch) | |
| tree | 0fdc023b08f78ad8fbd3950777fdf52e389fb298 /lisp/frame.el | |
| parent | 2f826609630cc1bf1d470428273711ebde9eec3c (diff) | |
| download | emacs-08a2434e2f7a60fc558e052e37409333582504cb.tar.gz | |
* lisp/emacs-lisp/timer.el (timer-event-handler): Don't run if canceled.
Fixes: debbugs:17392
Diffstat (limited to 'lisp/frame.el')
| -rw-r--r-- | lisp/frame.el | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index f081df788ec..d699d243023 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -1822,9 +1822,7 @@ terminals, cursor blinking is controlled by the terminal." :initialize 'custom-initialize-delay :group 'cursor :global t - (if blink-cursor-idle-timer (cancel-timer blink-cursor-idle-timer)) - (setq blink-cursor-idle-timer nil) - (blink-cursor-end) + (blink-cursor-suspend) (remove-hook 'focus-in-hook #'blink-cursor-check) (remove-hook 'focus-out-hook #'blink-cursor-suspend) (when blink-cursor-mode |