From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chetan Pandya Newsgroups: gmane.emacs.devel Subject: recursive edit in isearch Date: Wed, 18 Mar 2009 18:29:28 -0700 (PDT) Message-ID: <735308.67201.qm@web80703.mail.mud.yahoo.com> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1237426191 27281 80.91.229.12 (19 Mar 2009 01:29:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 19 Mar 2009 01:29:51 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 19 02:31:08 2009 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 1Lk76A-0000Ex-VN for ged-emacs-devel@m.gmane.org; Thu, 19 Mar 2009 02:31:07 +0100 Original-Received: from localhost ([127.0.0.1]:53542 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lk74m-0006mj-0r for ged-emacs-devel@m.gmane.org; Wed, 18 Mar 2009 21:29:40 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lk74h-0006md-SH for emacs-devel@gnu.org; Wed, 18 Mar 2009 21:29:35 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lk74d-0006mR-NQ for emacs-devel@gnu.org; Wed, 18 Mar 2009 21:29:35 -0400 Original-Received: from [199.232.76.173] (port=58657 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lk74d-0006mO-LL for emacs-devel@gnu.org; Wed, 18 Mar 2009 21:29:31 -0400 Original-Received: from web80703.mail.mud.yahoo.com ([209.191.72.90]:35570) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1Lk74d-00023Y-A7 for emacs-devel@gnu.org; Wed, 18 Mar 2009 21:29:31 -0400 Original-Received: (qmail 67555 invoked by uid 60001); 19 Mar 2009 01:29:28 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sbcglobal.net; s=s1024; t=1237426168; bh=C8N6VoXqgUC81suHpo4TUrAkkT/+UeLRCqGN6Yp3yjE=; h=Message-ID:X-YMail-OSG:Received:X-Mailer:References:Date:From:Subject:To:MIME-Version:Content-Type; b=vf8ODlramjSzVGendCi2TcUPtj02SANkNhFRk/1CUWAsaGjqJ6rUZhPH/plDFuhe2kgVE9gyvmK1oZILwSnwZYF11A3nk5bhDG5lHlHgKInzD+9RZG/PbZkbvNwKH9C6K6UaoHvQw9LKZIL7XKxV10AIIFUrAaPbcOgkR9Q/tg4= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=sbcglobal.net; h=Message-ID:X-YMail-OSG:Received:X-Mailer:References:Date:From:Subject:To:MIME-Version:Content-Type; b=6vITdBLH1Z/S8hY0CMsfq1S/q3sLPb16WdxorjZ0bV9zU9/GLLX4jN012Ca5RlClwrHY1GmERuoOJ3L5RBG8waPIiP/ffY8DnhNO4CdgZsysuuN/A1tEWgRL5pbJY5nq33Ar1ngBCq9NNmkZiwLjn2h1ruN0RjOZGUIapn1jfeQ=; X-YMail-OSG: p8uRge4VM1n_WjVWcEWiv9XSWTGkOY_Wgc7.6TvhEkptnkV.AZ38Rta64KsR1I9iZoJYqkcqZVP6TvCK.x1sX.D4MRfoSBUwkxbwdDylnoXckvKbFbqzAdzy0sjxgMhBmcEzZ1n5kNC59J1MoSn4C.BKP_oAhWrH..1ncEtPwkok816hERS0pxFNlQ2W Original-Received: from [76.199.138.44] by web80703.mail.mud.yahoo.com via HTTP; Wed, 18 Mar 2009 18:29:28 PDT X-Mailer: YahooMailRC/1155.45 YahooMailWebService/0.7.289.1 X-detected-operating-system: by monty-python.gnu.org: FreeBSD 6.x (1) 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:109680 Archived-At: It looks like recursive edit in isearch mode will not save/restore. Current code will try to restore the buffer if the window buffer is different from the current buffer. A simple change is to make sure it is so that the buffer is not restored, in case the buffer changed in the mean time. Change diff -u /emacs-23/lisp/isearch.el.~1.345.~ /emacs-23/lisp/isearch.el --- /emacs-23/lisp/isearch.el.~1.345.~ Tue Feb 17 01:27:04 2009 +++ /emacs-23/lisp/isearch.el Thu Mar 19 01:24:24 2009 @@ -811,8 +811,7 @@ ;; the calling function until searching is completed) by entering ;; a recursive-edit and exiting it when done isearching. (if recursive-edit - (let ((isearch-recursive-edit t)) - (recursive-edit))) + (save-excursion (set-buffer (window-buffer)) (recursive-edit))) isearch-success)