aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/lispref/searching.texi46
-rw-r--r--lisp/frame.el3
-rw-r--r--lisp/gnus/gnus-art.el2
3 files changed, 28 insertions, 23 deletions
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index f627c882fae..4b97aae8cac 100644
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -950,37 +950,41 @@ more efficient, but is almost never worth the effort.}.
950 950
951The optional argument @var{paren} can be any of the following: 951The optional argument @var{paren} can be any of the following:
952 952
953a string 953@table @asis
954 the resulting regexp is preceded by @var{paren} and followed by 954@item a string
955 @samp{\)}, e.g. use @samp{"\\(?1:"} to produce an explicitly 955The resulting regexp is preceded by @var{paren} and followed by
956 numbered group. 956@samp{\)}, e.g. use @samp{"\\(?1:"} to produce an explicitly
957numbered group.
957 958
958@code{words} 959@item @code{words}
959 the resulting regexp is surrounded by @samp{\<\(} and @samp{\)\>}. 960The resulting regexp is surrounded by @samp{\<\(} and @samp{\)\>}.
960 961
961@code{symbols} 962@item @code{symbols}
962 the resulting regexp is surrounded by @samp{\_<\(} and @samp{\)\_>} 963The resulting regexp is surrounded by @samp{\_<\(} and @samp{\)\_>}
963 (this is often appropriate when maching programming-language 964(this is often appropriate when matching programming-language
964 keywords and the like). 965keywords and the like).
965 966
966non-@code{nil} 967@item non-@code{nil}
967 the resulting regexp is surrounded by @samp{\(} and @samp{\)}. 968The resulting regexp is surrounded by @samp{\(} and @samp{\)}.
968 969
969@code{nil} 970@item @code{nil}
970 the resulting regexp is surrounded by @samp{\(?:} and @samp{\)}, 971The resulting regexp is surrounded by @samp{\(?:} and @samp{\)},
971 if it is necessary to ensure that a postfix operator appended to 972if it is necessary to ensure that a postfix operator appended to
972 it will apply to the whole expression. 973it will apply to the whole expression.
974@end table
973 975
974The resulting regexp of @code{regexp-opt} is equivalent to but usually 976The resulting regexp of @code{regexp-opt} is equivalent to but usually
975more efficient than that of a simplified version: 977more efficient than that of a simplified version:
976 978
977@example 979@example
978(defun simplified-regexp-opt (strings &optional paren) 980(defun simplified-regexp-opt (strings &optional paren)
979 (let ((parens (cond ((stringp paren) (cons paren "\\)")) 981 (let ((parens
980 ((eq paren 'words) '("\\<\\(" . "\\)\\>")) 982 (cond
981 ((eq paren 'symbols) '("\\_<\\(" . "\\)\\_>")) 983 ((stringp paren) (cons paren "\\)"))
982 ((null paren) '("\\(?:" . "\\)")) 984 ((eq paren 'words) '("\\<\\(" . "\\)\\>"))
983 (t '("\\(" . "\\)"))))) 985 ((eq paren 'symbols) '("\\_<\\(" . "\\)\\_>"))
986 ((null paren) '("\\(?:" . "\\)"))
987 (t '("\\(" . "\\)")))))
984 (concat (car paren) 988 (concat (car paren)
985 (mapconcat 'regexp-quote strings "\\|") 989 (mapconcat 'regexp-quote strings "\\|")
986 (cdr paren)))) 990 (cdr paren))))
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
2036 :group 'frames) 2036 :group 'frames)
2037 2037
2038(defcustom blink-cursor-delay 0.5 2038(defcustom blink-cursor-delay 0.5
2039 "Seconds of idle time after which cursor starts to blink." 2039 "Seconds of idle time before the first blink of the cursor.
2040Values smaller than 0.2 sec are treated as 0.2 sec."
2040 :type 'number 2041 :type 'number
2041 :group 'cursor 2042 :group 'cursor
2042 :set (lambda (symbol value) 2043 :set (lambda (symbol value)
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index d7737cef4a4..738adb553ed 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -7639,7 +7639,7 @@ Calls `describe-variable' or `describe-function'."
7639 (let* ((lib (locate-library url)) 7639 (let* ((lib (locate-library url))
7640 (file (replace-regexp-in-string "\\.elc" ".el" (or lib "")))) 7640 (file (replace-regexp-in-string "\\.elc" ".el" (or lib ""))))
7641 (if (not lib) 7641 (if (not lib)
7642 (gnus-message 1 "Cannot locale library `%s'." url) 7642 (gnus-message 1 "Cannot locate library `%s'." url)
7643 (find-file-read-only file)))) 7643 (find-file-read-only file))))
7644 7644
7645(defcustom gnus-button-man-level 5 7645(defcustom gnus-button-man-level 5