From: Juri Linkov <juri@jurta.org>
To: rms@gnu.org
Cc: emacs-devel@gnu.org
Subject: Re: Calling occur from within isearch
Date: Mon, 03 Dec 2007 02:37:55 +0200 [thread overview]
Message-ID: <87r6i4k4at.fsf@jurta.org> (raw)
In-Reply-To: <87myt2e4yi.fsf@jurta.org> (Juri Linkov's message of "Sun, 25 Nov 2007 17:27:29 +0200")
>> Since occur uses `isearch-no-upper-case-p' it seems reasonable for it
>> to respect the value of `search-upper-case' as well.
>>
>> That seems to make sense, but what does `isearch-occur' have
>> to do with it?
>
> `isearch-occur' calls `occur', and occur needs to find exactly the
> same occurrences as found by isearch. Otherwise, it would be very
> confusing to see the mismatch between the occurrences found by isearch
> and occur.
I think `keep-lines', `flush-lines', `how-many' and `perform-replace'
should respect the value of `search-upper-case' as well for exactly
the same reasons:
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 3 Dec 2007 00:37:19 -0000
***************
*** 597,604 ****
(save-excursion
(or (bolp) (forward-line 1))
(let ((start (point))
! (case-fold-search (and case-fold-search
! (isearch-no-upper-case-p regexp t))))
(while (< (point) rend)
;; Start is first char not preserved by previous match.
(if (not (re-search-forward regexp rend 'move))
--- 597,606 ----
(save-excursion
(or (bolp) (forward-line 1))
(let ((start (point))
! (case-fold-search
! (if (and (eq case-fold-search t) search-upper-case)
! (isearch-no-upper-case-p regexp t)
! case-fold-search)))
(while (< (point) rend)
;; Start is first char not preserved by previous match.
(if (not (re-search-forward regexp rend 'move))
***************
*** 657,664 ****
(setq rstart (point)
rend (point-max-marker)))
(goto-char rstart))
! (let ((case-fold-search (and case-fold-search
! (isearch-no-upper-case-p regexp t))))
(save-excursion
(while (and (< (point) rend)
(re-search-forward regexp rend t))
--- 659,668 ----
(setq rstart (point)
rend (point-max-marker)))
(goto-char rstart))
! (let ((case-fold-search
! (if (and (eq case-fold-search t) search-upper-case)
! (isearch-no-upper-case-p regexp t)
! case-fold-search)))
(save-excursion
(while (and (< (point) rend)
(re-search-forward regexp rend t))
***************
*** 704,711 ****
(goto-char rstart))
(let ((count 0)
opoint
! (case-fold-search (and case-fold-search
! (isearch-no-upper-case-p regexp t))))
(while (and (< (point) rend)
(progn (setq opoint (point))
(re-search-forward regexp rend t)))
--- 708,717 ----
(goto-char rstart))
(let ((count 0)
opoint
! (case-fold-search
! (if (and (eq case-fold-search t) search-upper-case)
! (isearch-no-upper-case-p regexp t)
! case-fold-search)))
(while (and (< (point) rend)
(progn (setq opoint (point))
(re-search-forward regexp rend t)))
***************
*** 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)))))
--- 1131,1139 ----
(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)))))
***************
*** 1459,1466 ****
(and query-flag minibuffer-auto-raise
(raise-frame (window-frame (minibuffer-window))))
(let* ((case-fold-search
! (and case-fold-search
! (isearch-no-upper-case-p from-string regexp-flag)))
(nocasify (not (and case-replace case-fold-search)))
(literal (or (not regexp-flag) (eq regexp-flag 'literal)))
(search-function (if regexp-flag 're-search-forward 'search-forward))
--- 1472,1480 ----
(and query-flag minibuffer-auto-raise
(raise-frame (window-frame (minibuffer-window))))
(let* ((case-fold-search
! (if (and (eq case-fold-search t) search-upper-case)
! (isearch-no-upper-case-p from-string regexp-flag)
! case-fold-search))
(nocasify (not (and case-replace case-fold-search)))
(literal (or (not regexp-flag) (eq regexp-flag 'literal)))
(search-function (if regexp-flag 're-search-forward 'search-forward))
--
Juri Linkov
http://www.jurta.org/emacs/
next prev parent reply other threads:[~2007-12-03 0:37 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
2007-11-25 3:42 ` Richard Stallman
2007-11-25 15:27 ` Juri Linkov
2007-12-03 0:37 ` Juri Linkov [this message]
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=87r6i4k4at.fsf@jurta.org \
--to=juri@jurta.org \
--cc=emacs-devel@gnu.org \
--cc=rms@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.