From: Eli Zaretskii Date: Sat, 13 Jul 2019 07:20:48 +0000 (+0300) Subject: Fix last commit X-Git-Tag: emacs-27.0.90~1964 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6ca94eb74902f7eb7cef843cc5298f5106d1854e;p=emacs.git Fix last commit * etc/NEWS: Fix formatting and punctuation of last change. * lisp/isearch.el (isearch-highlight-regexp) (isearch-highlight-lines-matching-regexp): Doc fix. --- diff --git a/etc/NEWS b/etc/NEWS index e04760a2c6a..451534ab7fe 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1124,7 +1124,7 @@ highlight in one iteration while processing the full buffer. +++ 'M-s h l' invokes highlight-lines-matching-regexp using the search -string to highlight lines matching the search string. This is similar +string to highlight lines matching the search string. This is similar to the existing binding 'M-s h r' (highlight-regexp) that highlights JUST the search string. diff --git a/lisp/isearch.el b/lisp/isearch.el index e0f3f05153f..1aea539e735 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -2351,8 +2351,8 @@ characters in that string." "Run HI-LOCK-FUNC to exit isearch, leaving the matches highlighted. This is the internal function used by `isearch-highlight-regexp' and `isearch-highlight-lines-matching-regexp' to invoke -HI-LOCK-FUNC (either `highlight-regexp' or -`highlight-lines-matching-regexp' respectively)." +HI-LOCK-FUNC (either `highlight-regexp' or `highlight-lines-matching-regexp', +respectively)." (let ( ;; Set `isearch-recursive-edit' to nil to prevent calling ;; `exit-recursive-edit' in `isearch-done' that terminates @@ -2385,16 +2385,16 @@ HI-LOCK-FUNC (either `highlight-regexp' or (and isearch-recursive-edit (exit-recursive-edit))) (defun isearch-highlight-regexp () - "Exit Isearch mode, and call `highlight-regexp' with its regexp -argument from the last search, and the face from -`hi-lock-read-face-name'." + "Exit Isearch mode and call `highlight-regexp'. +The arguments passed to `highlight-regexp' are the regexp from +the last search and the face from `hi-lock-read-face-name'." (interactive) (isearch--highlight-regexp-or-lines 'highlight-regexp)) (defun isearch-highlight-lines-matching-regexp () - "Exit Isearch mode, and call `highlight-lines-matching-regexp' -with its regexp argument from the last search, and the face from -`hi-lock-read-face-name'." + "Exit Isearch mode and call `highlight-lines-matching-regexp'. +The arguments passed to `highlight-lines-matching-regexp' are the +regexp from the last search and the face from `hi-lock-read-face-name'." (interactive) (isearch--highlight-regexp-or-lines 'highlight-lines-matching-regexp))