Merge from origin/emacs-25

6620944 (cl-union): Do not ignore :test argument when lists are equal.
17dd3fb Add `isearch' to `basic-faces'
c1ec743 Make $, : and @ "prefix characters" in ruby-mode
e72a26e Make find-tag-default-bounds more strict
1bc0e0a Minor fixes in filenotify.el

1 files changed, 5 insertions, 1 deletions

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 457a53cbe8b..93c927cbe2a 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -3034,7 +3034,11 @@ it is commonly assigned to the @code{mouse-face} property for cursor
 highlighting (@pxref{Special Properties}).
 
 @item match
-For text matching a search command.
+@itemx isearch
+@itemx lazy-highlight
+For text matching (respectively) permanent search matches, interactive
+search matches, and lazy highlighting other matches than the current
+interactive one.
 
 @item error
 @itemx warning