From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Dima Kogan Newsgroups: gmane.emacs.bugs Subject: bug#18241: 24.4.50; [PATCH] I can now highlight-lines-matching-regexp from isearch Date: Wed, 03 Jul 2019 18:31:08 -0700 Message-ID: <871rz6wppf.fsf@secretsauce.net> References: <87sil4uhlw.fsf@secretsauce.net> <87a7e55l3b.fsf@shorty.i-did-not-set--mail-host-address--so-tickle-me> <87d0ixaawv.fsf@mail.linkov.net> <87blyfvtdb.fsf@secretsauce.net> <87o92epvs0.fsf@mail.linkov.net> <878stiwiuw.fsf@secretsauce.net> <831rz9g84q.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="222729"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: mu4e 1.0; emacs 27.0.50 Cc: 18241@debbugs.gnu.org, larsi@gnus.org, juri@linkov.net To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jul 04 03:33:49 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hiqd9-000vo2-Hy for geb-bug-gnu-emacs@m.gmane.org; Thu, 04 Jul 2019 03:33:48 +0200 Original-Received: from localhost ([::1]:42252 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiqbZ-0007rE-Mo for geb-bug-gnu-emacs@m.gmane.org; Wed, 03 Jul 2019 21:32:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:42257) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiqbU-0007qw-Be for bug-gnu-emacs@gnu.org; Wed, 03 Jul 2019 21:32:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hiqbS-0005oI-Pj for bug-gnu-emacs@gnu.org; Wed, 03 Jul 2019 21:32:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:41376) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hiqbS-0005o8-LZ for bug-gnu-emacs@gnu.org; Wed, 03 Jul 2019 21:32:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hiqbS-0008Gq-Fk for bug-gnu-emacs@gnu.org; Wed, 03 Jul 2019 21:32:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dima Kogan Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 04 Jul 2019 01:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18241 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 18241-submit@debbugs.gnu.org id=B18241.156220387931737 (code B ref 18241); Thu, 04 Jul 2019 01:32:02 +0000 Original-Received: (at 18241) by debbugs.gnu.org; 4 Jul 2019 01:31:19 +0000 Original-Received: from localhost ([127.0.0.1]:50197 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hiqal-0008Fp-Dg for submit@debbugs.gnu.org; Wed, 03 Jul 2019 21:31:19 -0400 Original-Received: from out2-smtp.messagingengine.com ([66.111.4.26]:58985) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hiqaj-0008Fa-53 for 18241@debbugs.gnu.org; Wed, 03 Jul 2019 21:31:17 -0400 Original-Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 0622E22128; Wed, 3 Jul 2019 21:31:12 -0400 (EDT) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Wed, 03 Jul 2019 21:31:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secretsauce.net; h=references:from:to:cc:subject:in-reply-to:date:message-id :mime-version:content-type; s=fm3; bh=ZT+nN2Fkm1VI8iC3EYjATxgHkL AjGhWXbO6KZ3qAIzo=; b=lOrBCk7DGRwjRdFLPSAAc5SgBPOT/PLBi9uxcV/1Di y0C3TGxaX3fo8ZNih0WNqUVHkAk/xUFbjwetEsZwLXrbui9xdu1+PlXGZALVDbfZ q2TrTtPvs1VMyy4o7tVBP0uWPmdelgEocl44C7my41o+IOw9MOtUtzBvI2H/8K0e p4MCHLm8ABPQdgCoX8SaeglulZdU0+v/MvauqlzQ7Eu+JosVwgQYEP5czWM/wIJl Pmemkwu72/dfKbzWJ96XSuST/oKxUWdYwJUed7X+yeCf52F0gi644V0Fayx/ik03 uPR5TCD2LRX+AaZ1QF6VVn1gTynSHyMF0YwPcxAQnExA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=ZT+nN2 Fkm1VI8iC3EYjATxgHkLAjGhWXbO6KZ3qAIzo=; b=KuEpJax4OO0VzvqhE+1PDh PfO1o1ChXiZ+48MSP7uY27xfn/GogsJvjhhc2lnFVIeIDEOztVdHCXp4In+1KNdU EEJ11aOMTqwsCJEhfs8JualhdvVbECtU+9CmvUi0FRWuKN+zqlltMd/lrwzAGq9/ t2N/3ztr5hF3Dm9/QHv9qGYiLL8MWHAb502Ws2HoAndw9oD32GvQ87+1mxOBburr BlSNYqmP4OLSAlxLEiD5TGbvJzsh6nSX/68jKyJ2n6aK5j2E73wzDTXYqJ6P65Bl 8+OA28LYYC9c7ohyMn3Xb5d/OWaC+NONwY22SkvO8IMC5ecUAuQ85pK9w5OwgPuA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrfedugdegkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpehffgfhvffujgffkfggtgesmhdtreertdertdenucfhrhhomhepffhimhgrucfm ohhgrghnuceoughimhgrsehsvggtrhgvthhsrghutggvrdhnvghtqeenucfkphepuddtje drvddutddrvddufedrvdegfeenucfrrghrrghmpehmrghilhhfrhhomhepughimhgrsehs vggtrhgvthhsrghutggvrdhnvghtnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Original-Received: from scrawny (107-210-213-243.lightspeed.irvnca.sbcglobal.net [107.210.213.243]) by mail.messagingengine.com (Postfix) with ESMTPA id 85BCF380087; Wed, 3 Jul 2019 21:31:10 -0400 (EDT) Original-Received: from dima by scrawny with local (Exim 4.91) (envelope-from ) id 1hiqaa-0000Ir-DD; Wed, 03 Jul 2019 18:31:08 -0700 In-reply-to: <831rz9g84q.fsf@gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:162038 Archived-At: --=-=-= Content-Type: text/plain Try the attached --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Add-ability-to-highlight-lines-matching-regexp-direc.patch >From 9d0fd748c0f5648a6687fc590822fae3a0eb2e2a Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Sun, 30 Jun 2019 10:37:53 -0700 Subject: [PATCH] Add ability to highlight-lines-matching-regexp directly from isearch * lisp/isearch.el: Implement the new functionality. (isearch-highlight-lines-matching-regexp): New function bound to M-s h l in isearch. (isearch--highlight-regexp-or-lines): New internal function * etc/NEWS (Search and Replace): Mention this change. * doc/emacs/search.texi: Added this binding to the documentation --- doc/emacs/search.texi | 17 ++++++++++------- etc/NEWS | 6 ++++++ lisp/isearch.el | 32 +++++++++++++++++++++++++------- 3 files changed, 41 insertions(+), 14 deletions(-) diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index c61578bab76..b47d51a2b66 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -453,13 +453,16 @@ Special Isearch @kindex M-s h r @r{(Incremental Search)} @findex isearch-highlight-regexp - You can exit the search while leaving the matches for the last -search string highlighted on display. To this end, type @kbd{M-s h r} -(@code{isearch-highlight-regexp}), which will run -@code{highlight-regexp} (@pxref{Highlight Interactively}) passing -it the regexp derived from the last search string and prompting you -for the face to use for highlighting. To remove the highlighting, -type @kbd{M-s h u} (@code{unhighlight-regexp}). +@kindex M-s h l @r{(Incremental Search)} +@findex isearch-highlight-lines-matching-regexp + You can exit the search while leaving the matches highlighted by +typing @kbd{M-s h r} (@code{isearch-highlight-regexp}). This runs +@code{highlight-regexp} (@pxref{Highlight Interactively}), passing it +the regexp derived from the search string and prompting you for the face +to use for highlighting. To highlight @emph{whole lines} containing +matches (rather than @emph{just} the matches), type @kbd{M-s h l} +(@code{isearch-highlight-lines-matching-regexp}). In either case, to +remove the highlighting, type @kbd{M-s h u} (@code{unhighlight-regexp}). @cindex incremental search, help on special keys @kindex C-h C-h @r{(Incremental Search)} diff --git a/etc/NEWS b/etc/NEWS index abbece374a4..0c2340603d0 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1111,6 +1111,12 @@ highlight in one iteration while processing the full buffer. 'isearch-yank-symbol-or-char'. 'isearch-del-char' is now bound to 'C-M-d'. ++++ +'M-s h l' invokes highlight-lines-matching-regexp using the search +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. + +++ *** New variable 'isearch-yank-on-move' provides options 't' and 'shift' to extend the search string by yanking text that ends at the new diff --git a/lisp/isearch.el b/lisp/isearch.el index f150a3bba4b..6c7899a384b 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -753,6 +753,7 @@ isearch-mode-map (define-key map [?\C-\M-%] 'isearch-query-replace-regexp) (define-key map "\M-so" 'isearch-occur) (define-key map "\M-shr" 'isearch-highlight-regexp) + (define-key map "\M-shl" 'isearch-highlight-lines-matching-regexp) ;; The key translations defined in the C-x 8 prefix should add ;; characters to the search string. See iso-transl.el. @@ -1039,6 +1040,9 @@ isearch-forward the last search string. Type \\[isearch-highlight-regexp] to run `highlight-regexp'\ that highlights the last search string. +Type \\[isearch-highlight-lines-matching-regexp] to run + `highlight-lines-matching-regexp'\ that highlights lines + matching the last search string. Type \\[isearch-describe-bindings] to display all Isearch key bindings. Type \\[isearch-describe-key] to display documentation of Isearch key. @@ -2339,12 +2343,12 @@ isearch-occur (declare-function hi-lock-read-face-name "hi-lock" ()) -(defun isearch-highlight-regexp () - "Run `highlight-regexp' with regexp from the current search string. -It exits Isearch mode and calls `hi-lock-face-buffer' with its regexp -argument from the last search regexp or a quoted search string, -and reads its face argument using `hi-lock-read-face-name'." - (interactive) +(defun isearch--highlight-regexp-or-lines (hi-lock-func) + "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)." (let ( ;; Set `isearch-recursive-edit' to nil to prevent calling ;; `exit-recursive-edit' in `isearch-done' that terminates @@ -2373,9 +2377,23 @@ isearch-highlight-regexp (regexp-quote s)))) isearch-string "")) (t (regexp-quote isearch-string))))) - (hi-lock-face-buffer regexp (hi-lock-read-face-name))) + (funcall hi-lock-func regexp (hi-lock-read-face-name))) (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'." + (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'." + (interactive) + (isearch--highlight-regexp-or-lines 'highlight-lines-matching-regexp)) + (defun isearch-delete-char () "Undo last input item during a search. -- 2.20.0.rc2 --=-=-=--