[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Calling occur from within isearch
From: |
Juri Linkov |
Subject: |
Re: Calling occur from within isearch |
Date: |
Sat, 24 Nov 2007 19:45:05 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.0.50 (gnu/linux) |
> 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)))
+
(defun isearch-delete-char ()
"Discard last input item and move point back.
--
Juri Linkov
http://www.jurta.org/emacs/
RE: Calling occur from within isearch, Drew Adams, 2007/11/21
Re: Calling occur from within isearch, Richard Stallman, 2007/11/22
Re: Calling occur from within isearch, Juri Linkov, 2007/11/22