diff options
author | Glenn Morris <rgm@gnu.org> | 2019-07-06 12:51:30 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2019-07-06 12:51:30 -0700 |
commit | bb856d12dc34a56be7a95ca5e55ddb1a78535d07 (patch) | |
tree | 2123f2d6728d4a043f2b8a07bd5368c010bb7d62 /lisp/hi-lock.el | |
parent | ef389fd9a5e6df06b8f7769ab32dc929dc4f0ed4 (diff) | |
parent | e97c0437aa135f9580cd8cc1ec912758e3610ab1 (diff) | |
download | emacs-bb856d12dc34a56be7a95ca5e55ddb1a78535d07.tar.gz |
Merge from origin/emacs-26
e97c043 Fix python.el docstring (Bug#36458)
e660801 ; Add thing-at-point-looking-at test (Bug#35708)
f5b4846 ; Fix typo, insure -> ensure in ChangeLogs
cb8fb59 * lisp/hi-lock.el (hi-lock-line-face-buffer): Doc fix. (Bug3...
Diffstat (limited to 'lisp/hi-lock.el')
-rw-r--r-- | lisp/hi-lock.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index c2568a518cb..f790546747d 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@ -426,7 +426,11 @@ versions before 22 use the following in your init file: (defalias 'highlight-lines-matching-regexp 'hi-lock-line-face-buffer) ;;;###autoload (defun hi-lock-line-face-buffer (regexp &optional face) - "Set face of all lines containing a match of REGEXP to FACE. + "Highlight all lines that match REGEXP using FACE. +The lines that match REGEXP will be displayed by merging +the attributes of FACE with any other face attributes +of text in those lines. + Interactively, prompt for REGEXP using `read-regexp', then FACE. Use the global history list for FACE. |