From bbf1ffd7c74bdf3ea766580788f7f4adb98a47f0 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 26 Sep 2016 17:00:03 -0700
Subject: [PATCH 1/3] Regexp Functions doc minor fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* doc/lispref/searching.texi (Regexp Functions):
Fix misspelling of “matching”.  Use @table for table.
Reformat code example to fit into info file width (Bug#17862).
---
 doc/lispref/searching.texi | 46 +++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index a335e89985f..579460f3227 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.
+@table @asis
+@item 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.
 
-@code{words}
-    the resulting regexp is surrounded by @samp{\<\(} and @samp{\)\>}.
+@item @code{words}
+The resulting regexp is surrounded by @samp{\<\(} and @samp{\)\>}.
 
-@code{symbols}
-    the resulting regexp is surrounded by @samp{\_<\(} and @samp{\)\_>}
-    (this is often appropriate when maching programming-language
-    keywords and the like).
+@item @code{symbols}
+The resulting regexp is surrounded by @samp{\_<\(} and @samp{\)\_>}
+(this is often appropriate when matching programming-language
+keywords and the like).
 
-non-@code{nil}
-    the resulting regexp is surrounded by @samp{\(} and @samp{\)}.
+@item non-@code{nil}
+The resulting regexp is surrounded by @samp{\(} and @samp{\)}.
 
-@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.
+@item @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.
+@end 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))))

From ace7f1404bda04ab70f1aba882ad8a1b8d72a4f5 Mon Sep 17 00:00:00 2001
From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Thu, 29 Sep 2016 23:25:42 +0000
Subject: [PATCH 2/3] * lisp/gnus/gnus-art.el (gnus-button-handle-library): Fix
 typo.

---
 lisp/gnus/gnus-art.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 66b1e38da2e..67e604910ab 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -7738,7 +7738,7 @@ Calls `describe-variable' or `describe-function'."
   (let* ((lib (locate-library url))
 	 (file (gnus-replace-in-string (or lib "") "\\.elc" ".el")))
     (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

From f1247f069e6a908595748c315948c636962b60dc Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 1 Oct 2016 11:23:18 +0300
Subject: [PATCH 3/3] * lisp/frame.el (blink-cursor-delay): Doc fix. 
 (Bug#24372)

---
 lisp/frame.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/frame.el b/lisp/frame.el
index 291150b591b..c3f621241ab 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -2028,7 +2028,8 @@ widths."
   :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)