Merge from origin/emacs-25

9fc9988 Improve documentation of 'expand-abbrev' and wrapper hooks
c14a1d4 Minor copyedits of MS-Windows installation instructions
f281924 Fix display of cursor when 'blink-cursor-delay' has small value

# Conflicts:
#	lisp/minibuffer.el

1 files changed, 10 insertions, 2 deletions

diff --git a/lisp/frame.el b/lisp/frame.el
index cfd40bf22fc..b13621a5c50 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -2114,7 +2114,11 @@ This is done when a frame gets focus.  Blink timers may be stopped by
 	     (not blink-cursor-idle-timer))
     (remove-hook 'post-command-hook 'blink-cursor-check)
     (setq blink-cursor-idle-timer
-          (run-with-idle-timer blink-cursor-delay
+          ;; The 0.2 sec limitation from below is to avoid erratic
+          ;; behavior (or downright failure to display the cursor
+          ;; during command execution) if they set blink-cursor-delay
+          ;; to a very small or even zero value.
+          (run-with-idle-timer (max 0.2 blink-cursor-delay)
                                blink-cursor-delay
                                'blink-cursor-start))))
 
@@ -2148,7 +2152,11 @@ terminals, cursor blinking is controlled by the terminal."
     (add-hook 'focus-in-hook #'blink-cursor-check)
     (add-hook 'focus-out-hook #'blink-cursor-suspend)
     (setq blink-cursor-idle-timer
-          (run-with-idle-timer blink-cursor-delay
+          ;; The 0.2 sec limitation from below is to avoid erratic
+          ;; behavior (or downright failure to display the cursor
+          ;; during command execution) if they set blink-cursor-delay
+          ;; to a very small or even zero value.
+          (run-with-idle-timer (max 0.2 blink-cursor-delay)
                                blink-cursor-delay
                                #'blink-cursor-start))))