From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: isearch-push-state Date: Tue, 11 Mar 2008 13:55:08 -0400 Message-ID: References: <87myp99rd3.fsf@jurta.org> <87od9n36ew.fsf@jurta.org> <878x0q1n2q.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 1205258163 10391 80.91.229.12 (11 Mar 2008 17:56:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 11 Mar 2008 17:56:03 +0000 (UTC) Cc: emacs-devel@gnu.org To: Juri Linkov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 11 18:56:19 2008 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 1JZ8hm-0004Vj-Ix for ged-emacs-devel@m.gmane.org; Tue, 11 Mar 2008 18:56:02 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JZ8hE-0000yB-6K for ged-emacs-devel@m.gmane.org; Tue, 11 Mar 2008 13:55:28 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JZ8h9-0000y5-5S for emacs-devel@gnu.org; Tue, 11 Mar 2008 13:55:23 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JZ8h6-0000xf-H1 for emacs-devel@gnu.org; Tue, 11 Mar 2008 13:55:22 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JZ8h6-0000xc-EL for emacs-devel@gnu.org; Tue, 11 Mar 2008 13:55:20 -0400 Original-Received: from mercure.iro.umontreal.ca ([132.204.24.67]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JZ8h6-0007HM-5E for emacs-devel@gnu.org; Tue, 11 Mar 2008 13:55:20 -0400 Original-Received: from hidalgo.iro.umontreal.ca (hidalgo.iro.umontreal.ca [132.204.27.50]) by mercure.iro.umontreal.ca (Postfix) with ESMTP id 97B422CEA8F; Tue, 11 Mar 2008 13:55:19 -0400 (EDT) Original-Received: from faina.iro.umontreal.ca (faina.iro.umontreal.ca [132.204.26.177]) by hidalgo.iro.umontreal.ca (Postfix) with ESMTP id 8AAE03FE1; Tue, 11 Mar 2008 13:55:08 -0400 (EDT) Original-Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id 788A96CAA2; Tue, 11 Mar 2008 13:55:08 -0400 (EDT) In-Reply-To: <878x0q1n2q.fsf_-_@jurta.org> (Juri Linkov's message of "Mon, 10 Mar 2008 19:59:57 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) X-DIRO-MailScanner-Information: Please contact the ISP for more information X-DIRO-MailScanner: Found to be clean X-DIRO-MailScanner-SpamCheck: n'est pas un polluriel, SpamAssassin (score=-2.82, requis 5, autolearn=not spam, ALL_TRUSTED -2.82) X-DIRO-MailScanner-From: monnier@iro.umontreal.ca X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 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:92168 Archived-At: Thanks Juri. I'm not sure I understand what you said: are you saying that those extra state-pushes are just unnecessary or are they really harmful? It seems they are harmful w.r.t the new failed-search-highlight thingy, but shouldn't the failed-search-highlight thingy try to pop several states until findind one that does succeed? I'm not sure I like the idea that "spurious" state pushes can really be harmful. This said, wherever you remove those pushes, please replace them with a comment mentioning that it was there and why you think it's unnecessary. Stefan > Index: lisp/isearch.el > =================================================================== > RCS file: /sources/emacs/emacs/lisp/isearch.el,v > retrieving revision 1.313 > diff -c -r1.313 isearch.el > *** lisp/isearch.el 28 Feb 2008 01:57:42 -0000 1.313 > --- lisp/isearch.el 10 Mar 2008 17:56:09 -0000 > *************** > *** 1096,1104 **** > ;; Only the string actually used should be saved. > )) > - ;; Push the state as of before this C-s. > - (isearch-push-state) > - > ;; Reinvoke the pending search. > (isearch-search) > (isearch-push-state) > --- 1081,1086 ---- > *************** > *** 1895,1904 **** > (if search-ring-update > (progn > (isearch-search) > (isearch-update)) > ! (isearch-edit-string) > ! ) > ! (isearch-push-state)) > (defun isearch-ring-advance () > "Advance to the next search string in the ring." > --- 1887,1895 ---- > (if search-ring-update > (progn > (isearch-search) > + (isearch-push-state) > (isearch-update)) > ! (isearch-edit-string))) > (defun isearch-ring-advance () > "Advance to the next search string in the ring." > -- > Juri Linkov > http://www.jurta.org/emacs/