From: Juri Linkov <juri@jurta.org>
To: emacs-devel@gnu.org
Subject: Re: Calling occur from within isearch
Date: Sat, 24 Nov 2007 19:45:05 +0200 [thread overview]
Message-ID: <871waf7ikx.fsf@jurta.org> (raw)
In-Reply-To: <yoijd4u1ydnr.fsf@remote1.student.chalmers.se> ("Johan Bockgård"'s message of "Fri, 23 Nov 2007 02:05:28 +0100")
> Occur already does the "upper-case implies case-sensitive" step. The
> interesting case is where this should not be done--that is when the
> search string is mixed case, and the user explicitly turns off
> case-sensitivity with M-c (this is the situation where
> isearch-case-fold-search is `yes').
>
> So the idea is more like
>
> ;; Except that this doesn't really work, since occur doesn't care
> ;; about `search-upper-case'.
> (let ((case-fold-search isearch-case-fold-search)
> (search-upper-case nil))
> (occur regexp nlines))
>
> Maybe upper-case input should only have magic effects in
> interactive calls.
>
> (occur REGEXP &optional NLINES UPPER-CASE-IMPLIES-CASE-SENSITIVE)
Since occur uses `isearch-no-upper-case-p' it seems reasonable for it
to respect the value of `search-upper-case' as well.
Do you see any flaw in the following patch?
Index: lisp/replace.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/replace.el,v
retrieving revision 1.263
diff -c -r1.263 replace.el
*** lisp/replace.el 22 Nov 2007 03:01:36 -0000 1.263
--- lisp/replace.el 24 Nov 2007 17:42:32 -0000
***************
*** 1030,1037 ****
It serves as a menu to find any of the occurrences in this buffer.
\\<occur-mode-map>\\[describe-mode] in that buffer will explain how.
! If REGEXP contains upper case characters (excluding those preceded by `\\'),
! the matching is case-sensitive."
(interactive (occur-read-primary-args))
(occur-1 regexp nlines (list (current-buffer))))
--- 1030,1037 ----
It serves as a menu to find any of the occurrences in this buffer.
\\<occur-mode-map>\\[describe-mode] in that buffer will explain how.
! If REGEXP contains upper case characters (excluding those preceded by `\\')
! and `search-upper-case' is non-nil, the matching is case-sensitive."
(interactive (occur-read-primary-args))
(occur-1 regexp nlines (list (current-buffer))))
***************
*** 1119,1126 ****
(let ((count (occur-engine
regexp active-bufs occur-buf
(or nlines list-matching-lines-default-context-lines)
! (and case-fold-search
! (isearch-no-upper-case-p regexp t))
list-matching-lines-buffer-name-face
nil list-matching-lines-face
(not (eq occur-excluded-properties t)))))
--- 1119,1127 ----
(let ((count (occur-engine
regexp active-bufs occur-buf
(or nlines list-matching-lines-default-context-lines)
! (if (and (eq case-fold-search t) search-upper-case)
! (isearch-no-upper-case-p regexp t)
! case-fold-search)
list-matching-lines-buffer-name-face
nil list-matching-lines-face
(not (eq occur-excluded-properties t)))))
Index: lisp/isearch.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/isearch.el,v
retrieving revision 1.306
diff -c -r1.306 isearch.el
*** lisp/isearch.el 10 Nov 2007 23:03:24 -0000 1.306
--- lisp/isearch.el 24 Nov 2007 17:44:57 -0000
***************
*** 1256,1265 ****
--- 1257,1273 ----
(interactive)
(isearch-query-replace t))
+ (defun isearch-occur (regexp &optional nlines)
+ "Run `occur' with regexp to search from the current search string.
+ Interactively, REGEXP is the current search regexp or a quoted search
+ string. NLINES has the same meaning as in `occur'."
+ (interactive
+ (list
+ (if isearch-regexp isearch-string (regexp-quote isearch-string))
+ (if current-prefix-arg (prefix-numeric-value current-prefix-arg))))
+ (let ((case-fold-search isearch-case-fold-search))
+ (occur regexp nlines)))
+
\f
(defun isearch-delete-char ()
"Discard last input item and move point back.
--
Juri Linkov
http://www.jurta.org/emacs/
next prev parent reply other threads:[~2007-11-24 17:45 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-21 19:57 Calling occur from within isearch Lennart Borgman (gmail)
2007-11-21 20:03 ` Juri Linkov
2007-11-21 20:25 ` Lennart Borgman (gmail)
2007-11-22 19:08 ` Juri Linkov
2007-11-22 19:38 ` Drew Adams
2007-11-22 21:48 ` Lennart Borgman (gmail)
2007-11-22 0:30 ` Johan Bockgård
2007-11-22 19:04 ` Juri Linkov
2007-11-23 0:52 ` Juri Linkov
2007-11-23 1:05 ` Johan Bockgård
2007-11-24 17:45 ` Juri Linkov [this message]
2007-11-25 3:42 ` Richard Stallman
2007-11-25 15:27 ` Juri Linkov
2007-12-03 0:37 ` Juri Linkov
2007-12-03 18:43 ` Richard Stallman
2007-12-05 22:17 ` Juri Linkov
2007-12-06 1:29 ` Johan Bockgård
2007-12-03 23:25 ` Johan Bockgård
2007-12-04 0:27 ` Juri Linkov
2007-12-04 1:24 ` Johan Bockgård
2007-12-04 22:43 ` Juri Linkov
2007-12-04 23:59 ` Johan Bockgård
2007-12-05 22:16 ` Juri Linkov
2007-12-04 10:35 ` Andreas Schwab
2007-11-21 20:07 ` Drew Adams
2007-11-22 16:21 ` Richard Stallman
2007-11-22 18:16 ` Stefan Monnier
2007-11-22 19:05 ` Juri Linkov
2007-11-22 21:23 ` Stefan Monnier
2007-11-22 19:05 ` Juri Linkov
2007-11-23 4:35 ` Richard Stallman
2007-11-24 17:45 ` Juri Linkov
2007-11-25 3:42 ` Richard Stallman
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871waf7ikx.fsf@jurta.org \
--to=juri@jurta.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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.