From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Re: Calling occur from within isearch Date: Thu, 22 Nov 2007 21:04:48 +0200 Organization: JURTA Message-ID: <871wairv6n.fsf@jurta.org> References: <47448DB2.60402@gmail.com> <87hcjf2wot.fsf@jurta.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1195758784 14361 80.91.229.12 (22 Nov 2007 19:13:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 22 Nov 2007 19:13:04 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 22 20:13:11 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1IvHU0-00010N-TP for ged-emacs-devel@m.gmane.org; Thu, 22 Nov 2007 20:13:05 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IvHTm-00050r-Di for ged-emacs-devel@m.gmane.org; Thu, 22 Nov 2007 14:12:50 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IvHTi-00050B-AW for emacs-devel@gnu.org; Thu, 22 Nov 2007 14:12:46 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IvHTg-0004zS-Jt for emacs-devel@gnu.org; Thu, 22 Nov 2007 14:12:45 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IvHTg-0004zP-El for emacs-devel@gnu.org; Thu, 22 Nov 2007 14:12:44 -0500 Original-Received: from relay01.kiev.sovam.com ([62.64.120.200]) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1IvHTf-00035U-Uk for emacs-devel@gnu.org; Thu, 22 Nov 2007 14:12:44 -0500 Original-Received: from [83.170.232.243] (helo=smtp.svitonline.com) by relay01.kiev.sovam.com with esmtp (Exim 4.67) (envelope-from ) id 1IvHTd-0009FB-QQ for emacs-devel@gnu.org; Thu, 22 Nov 2007 21:12:42 +0200 In-Reply-To: ("Johan =?iso-8859-1?Q?Bockg=E5rd=22's?= message of "Thu, 22 Nov 2007 01:30:47 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.50 (gnu/linux) X-Scanner-Signature: 7155bbd8d023de41950ebecbe4708355 X-DrWeb-checked: yes X-SpamTest-Envelope-From: juri@jurta.org X-SpamTest-Group-ID: 00000000 X-SpamTest-Header: Not Detected X-SpamTest-Info: Profiles 1823 [Nov 22 2007] X-SpamTest-Info: helo_type=3 X-SpamTest-Info: {HEADERS: header Content-Type found without required header Content-Transfer-Encoding} X-SpamTest-Method: none X-SpamTest-Rate: 19 X-SpamTest-Status: Not detected X-SpamTest-Status-Extended: not_detected X-SpamTest-Version: SMTP-Filter Version 3.0.0 [0255], KAS30/Release X-detected-kernel: by monty-python.gnu.org: FreeBSD 4.8-5.1 (or MacOS X 10.2-10.3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:83882 Archived-At: >> + (let ((case-fold-search isearch-case-fold-search)) > > isearch-case-fold-search is almost but not quite the same as > case-fold-search. Cf isearch-no-upper-case-p. > > ; case-fold-search while searching. > ; either nil, t, or 'yes. 'yes means the same as t except that mixed > ; case in the search string is ignored. > (defvar isearch-case-fold-search nil) Right, below is a more correct 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 22 Nov 2007 19:02:59 -0000 *************** *** 1256,1265 **** --- 1257,1276 ---- (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)) + (if (and (eq case-fold-search t) search-upper-case) + (setq case-fold-search + (isearch-no-upper-case-p isearch-string isearch-regexp))) + (occur regexp nlines))) + (defun isearch-delete-char () "Discard last input item and move point back. -- Juri Linkov http://www.jurta.org/emacs/