Re: Calling occur from within isearch

[Juri Linkov]

>>> In the case of occur from within isearch, the current value of
>>> isearch-case-fold-search will make searching find the right matches--if
>>> occur does *not* look at the case of the input again
>>>
>>>     (let ((case-fold-search isearch-case-fold-search)
>>>           (search-upper-case nil))
>>>       (occur regexp nlines))
>>
>> What code in occur for this case do you have in mind?
>
> isearch-occur should do this.  Isearch has already decided if the search
> should be case-sensitive or not, so occur should not consider input case.

Setting `search-upper-case' to nil in `isearch-occur' just to skip
the `isearch-no-upper-case-p' test in occur can be named ugly too.
But perhaps this is less ugly that testing for `(eq case-fold-search t)'
in occur.  So I am not against using this approach that produces the same
results with the following patch:

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     5 Dec 2007 22:16:03 -0000
***************
*** 1230,1236 ****
    (interactive)
    (barf-if-buffer-read-only)
    (if regexp-flag (setq isearch-regexp t))
!   (let ((case-fold-search isearch-case-fold-search))
      (isearch-done)
      (isearch-clean-overlays)
      (if (and isearch-other-end
--- 1231,1238 ----
    (interactive)
    (barf-if-buffer-read-only)
    (if regexp-flag (setq isearch-regexp t))
!   (let ((case-fold-search isearch-case-fold-search)
!       (search-upper-case nil))
      (isearch-done)
      (isearch-clean-overlays)
      (if (and isearch-other-end
***************
*** 1256,1265 ****
--- 1258,1275 ----
    (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)
+       (search-upper-case nil))
+     (occur regexp nlines)))
+ 
  
  (defun isearch-delete-char ()
    "Discard last input item and move point back.

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     5 Dec 2007 22:16:09 -0000
***************
*** 552,559 ****
  When called from Lisp (and usually interactively as well, see below)
  applies to all lines starting after point.
  
! If REGEXP contains upper case characters (excluding those preceded by `\\'),
! the matching is case-sensitive.
  
  Second and third arg RSTART and REND specify the region to operate on.
  This command operates on (the accessible part of) all lines whose
--- 552,559 ----
  When called from Lisp (and usually interactively as well, see below)
  applies to all lines starting after point.
  
! If REGEXP contains upper case characters (excluding those preceded by `\\')
! and `search-upper-case' is non-nil, the matching is case-sensitive.
  
  Second and third arg RSTART and REND specify the region to operate on.
  This command operates on (the accessible part of) all lines whose
***************
*** 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 case-fold-search 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))
***************
*** 626,633 ****
  The line point is in is deleted if and only if it contains a
  match for regexp starting after point.
  
! If REGEXP contains upper case characters (excluding those preceded by `\\'),
! the matching is case-sensitive.
  
  Second and third arg RSTART and REND specify the region to operate on.
  Lines partially contained in this region are deleted if and only if
--- 628,635 ----
  The line point is in is deleted if and only if it contains a
  match for regexp starting after point.
  
! If REGEXP contains upper case characters (excluding those preceded by `\\')
! and `search-upper-case' is non-nil, the matching is case-sensitive.
  
  Second and third arg RSTART and REND specify the region to operate on.
  Lines partially contained in this region are deleted if and only if
***************
*** 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 case-fold-search 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))
***************
*** 676,683 ****
  the number, do not print it; if INTERACTIVE is t, the function behaves
  in all respects has if it had been called interactively.
  
! If REGEXP contains upper case characters (excluding those preceded by `\\'),
! the matching is case-sensitive.
  
  Second and third arg RSTART and REND specify the region to operate on.
  
--- 680,687 ----
  the number, do not print it; if INTERACTIVE is t, the function behaves
  in all respects has if it had been called interactively.
  
! If REGEXP contains upper case characters (excluding those preceded by `\\')
! and `search-upper-case' is non-nil, the matching is case-sensitive.
  
  Second and third arg RSTART and REND specify the region to operate on.
  
***************
*** 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 case-fold-search 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)))
***************
*** 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))))
  
--- 1042,1049 ----
  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)))))
--- 1131,1139 ----
        (let ((count (occur-engine
                      regexp active-bufs occur-buf
                      (or nlines list-matching-lines-default-context-lines)
!                     (if (and case-fold-search 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 case-fold-search 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/