summaryrefslogtreecommitdiff
path: root/lisp/frame.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-10-10 07:35:31 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-10-10 07:35:31 -0700
commit4e42e8453e42eabe397592b057fb287906a5fd1f (patch)
tree1936856abe83a2f209721a215db46848980d7123 /lisp/frame.el
parent5b774598f4911975444120f56e448c4ca5f8c11f (diff)
parentf1247f069e6a908595748c315948c636962b60dc (diff)
downloademacs-4e42e8453e42eabe397592b057fb287906a5fd1f.tar.gz
emacs-4e42e8453e42eabe397592b057fb287906a5fd1f.tar.bz2
emacs-4e42e8453e42eabe397592b057fb287906a5fd1f.zip
Merge from origin/emacs-25
f1247f0 * lisp/frame.el (blink-cursor-delay): Doc fix. (Bug#24372) ace7f14 * lisp/gnus/gnus-art.el (gnus-button-handle-library): Fix typo. bbf1ffd Regexp Functions doc minor fixes
Diffstat (limited to 'lisp/frame.el')
-rw-r--r--lisp/frame.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/frame.el b/lisp/frame.el
index 1c796be8c11..a5845670502 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -2036,7 +2036,8 @@ This timer calls `blink-cursor-timer-function' every
:group 'frames)
(defcustom blink-cursor-delay 0.5
- "Seconds of idle time after which cursor starts to blink."
+ "Seconds of idle time before the first blink of the cursor.
+Values smaller than 0.2 sec are treated as 0.2 sec."
:type 'number
:group 'cursor
:set (lambda (symbol value)