From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Barry OReilly Newsgroups: gmane.emacs.bugs Subject: bug#14281: 24.3; replace-match leaves point at wrong place Date: Wed, 15 May 2013 16:58:45 -0400 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=047d7b47249efef87104dcc8030c X-Trace: ger.gmane.org 1368651544 23423 80.91.229.3 (15 May 2013 20:59:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 15 May 2013 20:59:04 +0000 (UTC) Cc: 14281@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed May 15 22:59:03 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Ucimr-0005Qx-2N for geb-bug-gnu-emacs@m.gmane.org; Wed, 15 May 2013 22:59:01 +0200 Original-Received: from localhost ([::1]:43214 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ucimq-0005Qx-Fh for geb-bug-gnu-emacs@m.gmane.org; Wed, 15 May 2013 16:59:00 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:51123) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ucimn-0005Qr-12 for bug-gnu-emacs@gnu.org; Wed, 15 May 2013 16:58:58 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uciml-0002T7-QG for bug-gnu-emacs@gnu.org; Wed, 15 May 2013 16:58:56 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:58141) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uciml-0002T1-M9 for bug-gnu-emacs@gnu.org; Wed, 15 May 2013 16:58:55 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1Ucimr-0000qz-RO for bug-gnu-emacs@gnu.org; Wed, 15 May 2013 16:59:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Barry OReilly Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 15 May 2013 20:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 14281 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 14281-submit@debbugs.gnu.org id=B14281.13686515403272 (code B ref 14281); Wed, 15 May 2013 20:59:01 +0000 Original-Received: (at 14281) by debbugs.gnu.org; 15 May 2013 20:59:00 +0000 Original-Received: from localhost ([127.0.0.1]:46499 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Ucimq-0000qi-11 for submit@debbugs.gnu.org; Wed, 15 May 2013 16:59:00 -0400 Original-Received: from mail-ob0-f180.google.com ([209.85.214.180]:56202) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Ucimn-0000qI-MS for 14281@debbugs.gnu.org; Wed, 15 May 2013 16:58:58 -0400 Original-Received: by mail-ob0-f180.google.com with SMTP id xk17so2507331obc.39 for <14281@debbugs.gnu.org>; Wed, 15 May 2013 13:58:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:cc:content-type; bh=ZaEQuvrPagowhejPLGgxWcDrleVcmwVToJO4E73Iep4=; b=zZX5k97uufa0pdIZWvSueK5tdxxjDdNBYV54vldyv3ntIA+vxNbeEVYJin/BtjRvgZ IfSp1v1pD8afl3eYQk+9TvChv4JI2erUP1+D0mvAWgnr3V0xXkVC7+2BX1+ghCgnbRc9 dsYRxfH57PvcOOVwBC2oTUvqQFOjzGrKjBjWeeGfEycVS6VIl+aEkYwRI2DKmHfFV3OG i1roDX+IpHDBLPYxHVz5Yqx89zvciJDtzd39LeIbiyYB5mgeGrmFlxl/2M32HkaYKS9Z 7pxAAho7d4ItDWKpq0t/RWZ0ImAaQL58OyfGUd02alRopAX54i3pXUmzKXXiqyGhIUcM IlWw== X-Received: by 10.60.133.134 with SMTP id pc6mr20282101oeb.87.1368651525451; Wed, 15 May 2013 13:58:45 -0700 (PDT) Original-Received: by 10.76.93.68 with HTTP; Wed, 15 May 2013 13:58:45 -0700 (PDT) In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:74306 Archived-At: --047d7b47249efef87104dcc8030c Content-Type: text/plain; charset=ISO-8859-1 Sorry, didn't edit out the unrelated changes correctly. diff --git a/src/search.c b/src/search.c index ea36133..60658c8 100644 --- a/src/search.c +++ b/src/search.c @@ -328,6 +314,7 @@ looking_at_1 (Lisp_Object string, bool posix) val = (i >= 0 ? Qt : Qnil); if (NILP (Vinhibit_changing_match_data) && i >= 0) + { for (i = 0; i < search_regs.num_regs; i++) if (search_regs.start[i] >= 0) { @@ -336,10 +323,9 @@ looking_at_1 (Lisp_Object string, bool posix) search_regs.end[i] = BYTE_TO_CHAR (search_regs.end[i] + BEGV_BYTE); } - - /* Set last_thing_searched only when match data is changed. */ - if (NILP (Vinhibit_changing_match_data)) + /* Set last_thing_searched only when match data is changed. */ XSETBUFFER (last_thing_searched, current_buffer); + } return val; } --047d7b47249efef87104dcc8030c Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Sorry, didn't edit out the unrelated changes correctly.

diff --g= it a/src/search.c b/src/search.c
index ea36133..60658c8 100644
--- a/= src/search.c
+++ b/src/search.c
@@ -328,6 +314,7 @@ looking_at_1 (Lis= p_Object string, bool posix)
=A0
=A0=A0 val =3D (i >=3D 0 ? Qt : Qnil);
=A0=A0 if (NILP (Vinhib= it_changing_match_data) && i >=3D 0)
+=A0 {
=A0=A0=A0=A0 f= or (i =3D 0; i < search_regs.num_regs; i++)
=A0=A0=A0=A0=A0=A0 if (se= arch_regs.start[i] >=3D 0)
=A0=A0=A0=A0=A0=A0=A0 {
@@ -336,10 +323,9 @@ looking_at_1 (Lisp_Object string, bool posix)
=A0= =A0=A0=A0=A0=A0=A0=A0=A0 search_regs.end[i]
=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0=A0 =3D BYTE_TO_CHAR (search_regs.end[i] + BEGV_BYTE);
=A0=A0=A0=A0= =A0=A0=A0 }
-
-=A0 /* Set last_thing_searched only when match data is= changed.=A0 */
-=A0 if (NILP (Vinhibit_changing_match_data))
+=A0=A0=A0 /* Set last_thi= ng_searched only when match data is changed.=A0 */
=A0=A0=A0=A0 XSETBUFF= ER (last_thing_searched, current_buffer);
+=A0 }
=A0
=A0=A0 return= val;
=A0}

--047d7b47249efef87104dcc8030c--