From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 10 Oct 2016 14:35:31 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1497
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4e42e8453e42eabe397592b057fb287906a5fd1f;p=emacs.git

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
---

4e42e8453e42eabe397592b057fb287906a5fd1f
diff --cc lisp/frame.el
index 1c796be8c11,c3f621241ab..a5845670502
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@@ -2036,12 -2028,10 +2036,13 @@@ This timer calls `blink-cursor-timer-fu
    :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)
 +  :group 'cursor
 +  :set (lambda (symbol value)
 +         (set-default symbol value)
 +         (when blink-cursor-idle-timer (blink-cursor--start-idle-timer))))
  
  (defcustom blink-cursor-interval 0.5
    "Length of cursor blink interval in seconds."
diff --cc lisp/gnus/gnus-art.el
index d7737cef4a4,67e604910ab..738adb553ed
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@@ -7637,9 -7736,9 +7637,9 @@@ Calls `describe-variable' or `describe-
    "Call `locate-library' when pushing the corresponding URL button."
    (gnus-message 9 "url=`%s'" url)
    (let* ((lib (locate-library url))
 -	 (file (gnus-replace-in-string (or lib "") "\\.elc" ".el")))
 +	 (file (replace-regexp-in-string "\\.elc" ".el" (or lib ""))))
      (if (not lib)
- 	(gnus-message 1 "Cannot locale library `%s'." url)
+ 	(gnus-message 1 "Cannot locate library `%s'." url)
        (find-file-read-only file))))
  
  (defcustom gnus-button-man-level 5