diff options
| author | John Wiegley | 2016-03-03 23:52:26 -0800 |
|---|---|---|
| committer | John Wiegley | 2016-03-03 23:52:26 -0800 |
| commit | 2f3f7fcb576c333efd3c299b29fbbe05bd317d90 (patch) | |
| tree | 477edea3845f30b4dd5b7ef308ce3a414d8c0f00 /lisp/replace.el | |
| parent | 887f6126c5ce9084f93083765ac026ca6b28175c (diff) | |
| parent | 6620944f8325101d6a0e01690aea7901a66f0461 (diff) | |
| download | emacs-2f3f7fcb576c333efd3c299b29fbbe05bd317d90.tar.gz emacs-2f3f7fcb576c333efd3c299b29fbbe05bd317d90.zip | |
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
Diffstat (limited to 'lisp/replace.el')
| -rw-r--r-- | lisp/replace.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/replace.el b/lisp/replace.el index b7e26c96fc5..a2ce78a8bb2 100644 --- a/lisp/replace.el +++ b/lisp/replace.el | |||
| @@ -1268,6 +1268,7 @@ Compatibility function for \\[next-error] invocations." | |||
| 1268 | (t :background "gray")) | 1268 | (t :background "gray")) |
| 1269 | "Face used to highlight matches permanently." | 1269 | "Face used to highlight matches permanently." |
| 1270 | :group 'matching | 1270 | :group 'matching |
| 1271 | :group 'basic-faces | ||
| 1271 | :version "22.1") | 1272 | :version "22.1") |
| 1272 | 1273 | ||
| 1273 | (defcustom list-matching-lines-default-context-lines 0 | 1274 | (defcustom list-matching-lines-default-context-lines 0 |