From: Tino Calancha <tino.calancha@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: tino.calancha@gmail.com, emacs-devel@gnu.org
Subject: Re: [patch] Run occur command restricted to a region
Date: Fri, 30 Dec 2016 01:54:20 +0900 [thread overview]
Message-ID: <87shp665hf.fsf@gmail.com> (raw)
In-Reply-To: <8337h6vhr7.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 29 Dec 2016 18:10:04 +0200")
Eli Zaretskii <eliz@gnu.org> writes:
>> +(defun occur-in-region (regexp &optional nlines)
>> + "Show all lines in the active region containing a match for REGEXP.
>> +Each line is displayed with NLINES lines before and after, or -NLINES
>> +before if NLINES is negative.
>> +As `occur' but restricted to lines within the active region."
>> + (interactive (occur-read-primary-args "in region"))
>> + (unless (use-region-p)
>> + (error "Region not active"))
>
> I think our convention for functions that act on the region is to
> accept BEG and END arguments, so that the function could be called
> from Lisp. The 'interactive' form/spec should then provide these
> arguments for the interactive use.
Right! Thank you.
> Also, this will need a NEWS entry, and possibly also an addition to
> the user manual.
Sure, i have added a NEWS entry for the commands.
I don't see a clear place in the manual where to mention about
these commands: it seems `occur' is just defined in the intro as an
example on how to make keybindings.
Here is the updated patch:
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
From fbee1d786c35b6148112f32717d30e17836fd4ae Mon Sep 17 00:00:00 2001
From: Tino Calancha <tino.calancha@gmail.com>
Date: Fri, 30 Dec 2016 01:42:00 +0900
Subject: [PATCH] New commands: occur-forward, occur-backward, occur-in-region
* lisp/replace.el (occur-matches-threshold): New variable.
(occur-in-region, occur-forward, occur-backward): New commands.
* lisp/bindings.el (search-map): Bind occur-backward to 'M-s b'
and occur-forward to 'M-s f'.
; etc/DEBUG: Add entry for the new commands.
---
etc/NEWS | 5 +++++
lisp/bindings.el | 2 ++
lisp/replace.el | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
3 files changed, 56 insertions(+), 5 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index e2ada7c1be..9cfd5ed340 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -294,6 +294,11 @@ substituted by a home directory by writing it as "/foo:/:/~/file".
\f
* Editing Changes in Emacs 26.1
+---
+** New commands 'occur-in-region', 'occur-forward' and 'occur-backward'
+run 'occur' restricted to a region of the current buffer; 'occur-backward'
+bound to 'M-s b' and 'occur-forward' bound to 'M-s f'.
+
+++
** New bindings for 'query-replace-map'.
'undo', undo the last replacement; bound to 'u'.
diff --git a/lisp/bindings.el b/lisp/bindings.el
index c13f4b156a..4b1c88a3c5 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -928,6 +928,8 @@ search-map
(define-key esc-map "s" search-map)
(define-key search-map "o" 'occur)
+(define-key search-map "b" 'occur-backward)
+(define-key search-map "f" 'occur-forward)
(define-key search-map "\M-w" 'eww-search-words)
(define-key search-map "hr" 'highlight-regexp)
(define-key search-map "hp" 'highlight-phrase)
diff --git a/lisp/replace.el b/lisp/replace.el
index a172174633..95af63b108 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1092,6 +1092,9 @@ occur-mode
(set (make-local-variable 'revert-buffer-function) 'occur-revert-function)
(setq next-error-function 'occur-next-error))
+;; Let binded in `occur-forward' and `occur-in-region'.
+(defvar occur-matches-threshold nil)
+
\f
;;; Occur Edit mode
@@ -1322,11 +1325,12 @@ occur-excluded-properties
:group 'matching
:version "22.1")
-(defun occur-read-primary-args ()
- (let* ((perform-collect (consp current-prefix-arg))
+(defun occur-read-primary-args (&optional where)
+ (let* ((str (if where (concat " " where) ""))
+ (perform-collect (consp current-prefix-arg))
(regexp (read-regexp (if perform-collect
- "Collect strings matching regexp"
- "List lines matching regexp")
+ (concat "Collect strings matching regexp" str)
+ (concat "List lines matching regexp" str))
'regexp-history-last)))
(list regexp
(if perform-collect
@@ -1389,6 +1393,45 @@ occur
(interactive (occur-read-primary-args))
(occur-1 regexp nlines (list (current-buffer))))
+(defun occur-backward (regexp &optional nlines)
+ "Show all lines before current line containing a match for REGEXP.
+Each line is displayed with NLINES lines before and after, or -NLINES
+before if NLINES is negative.
+As `occur' but restricted to lines before the current one."
+ (interactive (occur-read-primary-args "backward"))
+ (narrow-to-region (point-min) (point))
+ (occur regexp nlines)
+ (widen))
+
+(defun occur-forward (regexp &optional nlines)
+ "Show all lines after current line containing a match for REGEXP.
+Each line is displayed with NLINES lines before and after, or -NLINES
+before if NLINES is negative.
+As `occur' but restricted to lines after the current one."
+ (interactive (occur-read-primary-args "forward"))
+ (let ((occur-matches-threshold
+ (line-number-at-pos (point))))
+ (narrow-to-region (point) (point-max))
+ (occur regexp nlines))
+ (widen))
+
+(defun occur-in-region (regexp beg end &optional nlines)
+ "Show all lines in the active region containing a match for REGEXP.
+BEG and END define the region.
+Each line is displayed with NLINES lines before and after, or -NLINES
+before if NLINES is negative.
+As `occur' but restricted to lines within the active region."
+ (interactive
+ (if (null (use-region-p))
+ (error "Region not active")
+ (let ((args (occur-read-primary-args "in region")))
+ (list (car args) (region-beginning) (region-end) (cadr args)))))
+ (let ((occur-matches-threshold
+ (line-number-at-pos beg)))
+ (narrow-to-region beg end)
+ (occur regexp nlines))
+ (widen))
+
(defvar ido-ignore-item-temp-list)
(defun multi-occur (bufs regexp &optional nlines)
@@ -1551,7 +1594,8 @@ occur-engine
(when (buffer-live-p buf)
(let ((lines 0) ;; count of matching lines
(matches 0) ;; count of matches
- (curr-line 1) ;; line count
+ (curr-line ;; line count
+ (or occur-matches-threshold 1))
(prev-line nil) ;; line number of prev match endpt
(prev-after-lines nil) ;; context lines of prev match
(matchbeg 0)
--
2.11.0
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
In GNU Emacs 26.0.50.1 (x86_64-pc-linux-gnu, GTK+ Version 3.22.5)
of 2016-12-30
Repository revision: 11b81a54d538e8deca3cd64521cf85409efb617b
next prev parent reply other threads:[~2016-12-29 16:54 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-29 6:36 [patch] Run occur command restricted to a region Tino Calancha
2016-12-29 16:10 ` Eli Zaretskii
2016-12-29 16:54 ` Tino Calancha [this message]
2016-12-29 18:16 ` Drew Adams
2016-12-29 18:50 ` Kaushal Modi
2016-12-29 20:52 ` Drew Adams
2016-12-30 2:57 ` Tino Calancha
2017-01-03 17:37 ` Region argument (was: [patch] Run occur command restricted to a region) Stefan Monnier
2017-01-03 18:34 ` Eli Zaretskii
2017-01-03 18:59 ` Region argument Stefan Monnier
2017-01-03 19:19 ` Eli Zaretskii
2017-01-04 0:57 ` Juri Linkov
2016-12-29 23:31 ` [patch] Run occur command restricted to a region Juri Linkov
2016-12-30 2:47 ` Tino Calancha
2016-12-30 23:20 ` Juri Linkov
2016-12-30 7:53 ` Eli Zaretskii
2016-12-30 23:16 ` Juri Linkov
2016-12-31 8:37 ` Eli Zaretskii
[not found] ` <87r34ozq20.fsf@gmail.com>
[not found] ` <87inq0xhiw.fsf@mail.linkov.net>
[not found] ` <alpine.DEB.2.20.1701011834290.1852@calancha-pc>
[not found] ` <87d1g55h8d.fsf@mail.linkov.net>
2017-01-03 10:19 ` Tino Calancha
2017-01-18 11:04 ` Tino Calancha
2017-01-19 23:51 ` Juri Linkov
2017-01-20 13:48 ` Tino Calancha
2017-01-20 16:46 ` Davis Herring
2017-01-20 23:17 ` Juri Linkov
2017-01-22 10:32 ` Tino Calancha
2017-01-22 23:50 ` Juri Linkov
2017-01-23 7:32 ` Tino Calancha
[not found] ` <87lgtu4w5c.fsf@mail.linkov.net>
2017-01-29 6:00 ` Tino Calancha
2017-01-30 0:09 ` Juri Linkov
2017-01-30 4:27 ` Tino Calancha
2017-01-30 4:48 ` Tino Calancha
2017-01-30 15:35 ` Eli Zaretskii
2017-02-02 10:22 ` Tino Calancha
2017-02-02 21:08 ` Eli Zaretskii
2017-02-03 3:11 ` Tino Calancha
2017-02-03 8:02 ` Eli Zaretskii
2017-02-03 10:04 ` CONTRIBUTE: Mention indexing new vars/commands in manual [was: Run occur command restricted to a region] Tino Calancha
2017-02-03 10:37 ` Eli Zaretskii
2017-02-03 11:02 ` Tino Calancha
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87shp665hf.fsf@gmail.com \
--to=tino.calancha@gmail.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).