[Emacs-diffs] master 4e42e84 1/9: Merge from origin/emacs-25

[Paul Eggert]

branch: master
commit 4e42e8453e42eabe397592b057fb287906a5fd1f
Merge: 5b77459 f1247f0
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    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
---
 doc/lispref/searching.texi |   46 ++++++++++++++++++++++++--------------------
 lisp/frame.el              |    3 ++-
 lisp/gnus/gnus-art.el      |    2 +-
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index f627c88..4b97aae 100644
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -950,37 +950,41 @@ more efficient, but is almost never worth the effort.}.
 
 The optional argument @var{paren} can be any of the following:
 
-a string
-    the resulting regexp is preceded by @var{paren} and followed by
-    @samp{\)}, e.g. use @samp{"\\(?1:"} to produce an explicitly
-    numbered group.
address@hidden @asis
address@hidden a string
+The resulting regexp is preceded by @var{paren} and followed by
address@hidden)}, e.g. use @samp{"\\(?1:"} to produce an explicitly
+numbered group.
 
address@hidden
-    the resulting regexp is surrounded by @samp{\<\(} and @samp{\)\>}.
address@hidden @code{words}
+The resulting regexp is surrounded by @samp{\<\(} and @samp{\)\>}.
 
address@hidden
-    the resulting regexp is surrounded by @samp{\_<\(} and @samp{\)\_>}
-    (this is often appropriate when maching programming-language
-    keywords and the like).
address@hidden @code{symbols}
+The resulting regexp is surrounded by @samp{\_<\(} and @samp{\)\_>}
+(this is often appropriate when matching programming-language
+keywords and the like).
 
address@hidden
-    the resulting regexp is surrounded by @samp{\(} and @samp{\)}.
address@hidden address@hidden
+The resulting regexp is surrounded by @samp{\(} and @samp{\)}.
 
address@hidden
-    the resulting regexp is surrounded by @samp{\(?:} and @samp{\)},
-    if it is necessary to ensure that a postfix operator appended to
-    it will apply to the whole expression.
address@hidden @code{nil}
+The resulting regexp is surrounded by @samp{\(?:} and @samp{\)},
+if it is necessary to ensure that a postfix operator appended to
+it will apply to the whole expression.
address@hidden table
 
 The resulting regexp of @code{regexp-opt} is equivalent to but usually
 more efficient than that of a simplified version:
 
 @example
 (defun simplified-regexp-opt (strings &optional paren)
- (let ((parens (cond ((stringp paren)       (cons paren "\\)"))
-                     ((eq paren 'words)    '("\\<\\(" . "\\)\\>"))
-                     ((eq paren 'symbols) '("\\_<\\(" . "\\)\\_>"))
-                     ((null paren)          '("\\(?:" . "\\)"))
-                     (t                       '("\\(" . "\\)")))))
+ (let ((parens
+        (cond
+         ((stringp paren)       (cons paren "\\)"))
+         ((eq paren 'words)    '("\\<\\(" . "\\)\\>"))
+         ((eq paren 'symbols) '("\\_<\\(" . "\\)\\_>"))
+         ((null paren)          '("\\(?:" . "\\)"))
+         (t                       '("\\(" . "\\)")))))
    (concat (car paren)
            (mapconcat 'regexp-quote strings "\\|")
            (cdr paren))))
diff --git a/lisp/frame.el b/lisp/frame.el
index 1c796be..a584567 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)
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index d7737ce..738adb5 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -7639,7 +7639,7 @@ Calls `describe-variable' or `describe-function'."
   (let* ((lib (locate-library url))
         (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