aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2019-07-13 10:20:48 +0300
committerEli Zaretskii2019-07-13 10:20:48 +0300
commit6ca94eb74902f7eb7cef843cc5298f5106d1854e (patch)
treea00f4024e7b15651c488bec7ddaaab1fdf4995ef
parent8abe1704528d852157d1e8547841cab8e46db1ac (diff)
downloademacs-6ca94eb74902f7eb7cef843cc5298f5106d1854e.tar.gz
emacs-6ca94eb74902f7eb7cef843cc5298f5106d1854e.zip
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.
-rw-r--r--etc/NEWS2
-rw-r--r--lisp/isearch.el16
2 files changed, 9 insertions, 9 deletions
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.
1124 1124
1125+++ 1125+++
1126'M-s h l' invokes highlight-lines-matching-regexp using the search 1126'M-s h l' invokes highlight-lines-matching-regexp using the search
1127string to highlight lines matching the search string. This is similar 1127string to highlight lines matching the search string. This is similar
1128to the existing binding 'M-s h r' (highlight-regexp) that highlights 1128to the existing binding 'M-s h r' (highlight-regexp) that highlights
1129JUST the search string. 1129JUST the search string.
1130 1130
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."
2351 "Run HI-LOCK-FUNC to exit isearch, leaving the matches highlighted. 2351 "Run HI-LOCK-FUNC to exit isearch, leaving the matches highlighted.
2352This is the internal function used by `isearch-highlight-regexp' 2352This is the internal function used by `isearch-highlight-regexp'
2353and `isearch-highlight-lines-matching-regexp' to invoke 2353and `isearch-highlight-lines-matching-regexp' to invoke
2354HI-LOCK-FUNC (either `highlight-regexp' or 2354HI-LOCK-FUNC (either `highlight-regexp' or `highlight-lines-matching-regexp',
2355`highlight-lines-matching-regexp' respectively)." 2355respectively)."
2356 (let ( 2356 (let (
2357 ;; Set `isearch-recursive-edit' to nil to prevent calling 2357 ;; Set `isearch-recursive-edit' to nil to prevent calling
2358 ;; `exit-recursive-edit' in `isearch-done' that terminates 2358 ;; `exit-recursive-edit' in `isearch-done' that terminates
@@ -2385,16 +2385,16 @@ HI-LOCK-FUNC (either `highlight-regexp' or
2385 (and isearch-recursive-edit (exit-recursive-edit))) 2385 (and isearch-recursive-edit (exit-recursive-edit)))
2386 2386
2387(defun isearch-highlight-regexp () 2387(defun isearch-highlight-regexp ()
2388 "Exit Isearch mode, and call `highlight-regexp' with its regexp 2388 "Exit Isearch mode and call `highlight-regexp'.
2389argument from the last search, and the face from 2389The arguments passed to `highlight-regexp' are the regexp from
2390`hi-lock-read-face-name'." 2390the last search and the face from `hi-lock-read-face-name'."
2391 (interactive) 2391 (interactive)
2392 (isearch--highlight-regexp-or-lines 'highlight-regexp)) 2392 (isearch--highlight-regexp-or-lines 'highlight-regexp))
2393 2393
2394(defun isearch-highlight-lines-matching-regexp () 2394(defun isearch-highlight-lines-matching-regexp ()
2395 "Exit Isearch mode, and call `highlight-lines-matching-regexp' 2395 "Exit Isearch mode and call `highlight-lines-matching-regexp'.
2396with its regexp argument from the last search, and the face from 2396The arguments passed to `highlight-lines-matching-regexp' are the
2397`hi-lock-read-face-name'." 2397regexp from the last search and the face from `hi-lock-read-face-name'."
2398 (interactive) 2398 (interactive)
2399 (isearch--highlight-regexp-or-lines 'highlight-lines-matching-regexp)) 2399 (isearch--highlight-regexp-or-lines 'highlight-lines-matching-regexp))
2400 2400