From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#52593: 28.0.90; (thing-at-point thing) has so much overhead since commit 7db376e560448e61485ba054def8c82b21f33d6a Date: Sun, 19 Dec 2021 17:14:08 +0100 Message-ID: <87v8zkshbj.fsf@gnus.org> References: <83zgoybbfr.fsf@gnu.org> <83ee689156.fsf@gnu.org> <878rwgra3k.fsf@gnus.org> <87h7b4u01e.fsf@gnus.org> <878rwgtx0u.fsf@gnus.org> <87zgowsi73.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="1526"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: 52593@debbugs.gnu.org To: Kang Niu Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Dec 19 17:15:33 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1myyqT-0000AZ-2z for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 19 Dec 2021 17:15:33 +0100 Original-Received: from localhost ([::1]:48724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myyqR-00016q-Rd for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 19 Dec 2021 11:15:31 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:54780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myyq2-00016A-MU for bug-gnu-emacs@gnu.org; Sun, 19 Dec 2021 11:15:06 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:36257) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myypy-00077z-HJ for bug-gnu-emacs@gnu.org; Sun, 19 Dec 2021 11:15:06 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1myypy-00011Q-DL for bug-gnu-emacs@gnu.org; Sun, 19 Dec 2021 11:15:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 19 Dec 2021 16:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52593 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch moreinfo Original-Received: via spool by 52593-submit@debbugs.gnu.org id=B52593.16399304603863 (code B ref 52593); Sun, 19 Dec 2021 16:15:02 +0000 Original-Received: (at 52593) by debbugs.gnu.org; 19 Dec 2021 16:14:20 +0000 Original-Received: from localhost ([127.0.0.1]:47803 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myypI-00010F-AN for submit@debbugs.gnu.org; Sun, 19 Dec 2021 11:14:20 -0500 Original-Received: from quimby.gnus.org ([95.216.78.240]:43822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myypG-0000zz-6y for 52593@debbugs.gnu.org; Sun, 19 Dec 2021 11:14:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=5F/a595rp0jtp10ipS7GgSiLWCsoJ5XgLMy33DOEVxQ=; b=e5oRr5ez0rVjLVFB3hB1A0qttr 6kLycgjxO7QF3PyYc53ysFvyRpAMLqs82oKJLRL8wV8vME98QFTdcA0wA40D4HCFPlBGtLhCSpc8W XYwhw+n8RtUmiX/Ejet+aGBOMAI1LK4MMts4krM8KLyqIlgJJuihX4P2+L7oUVKrBVos=; Original-Received: from [84.212.220.105] (helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1myyp7-00058f-AZ; Sun, 19 Dec 2021 17:14:11 +0100 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAG1BMVEX9/fz18s/x7Kms qY1aWEU0MyeZlG+BfWL///+iDY0nAAAAAWJLR0QIht6VegAAAAd0SU1FB+UMEw8wGb1w7O8AAAGv SURBVDjL3ZPBbusgEEXDHwQiva7BUbJNwbXXiYewr5hm29ZxvG0TGv9+B7DbKttunoqQJTjce8dj PJv9F4PPabLfeTChFE0+Y3zO05iAUpILmbYEVyqeyamCACULTZCkUtDqBxAl+PskGBWMHOgo+4fu FkguSStCW/EM5AhUVHBVGnMDVvfkdLmstc77k1UB3p0MhGuVgKRSMsBxwNAbpVbvt8BDYfGs1I5L kQEEQG/RB2PxUamjEjqDIQCcCNgr4n4Au1s8fltBfDjEHgZoeJ2BnUJcVPShUXfzL4X1vdMl+goA dlpskgSOQOnU99KdgiMrF54TeIiS4bXQVYhph7bqk4KVtDy8nB+uHynqqTCv+Xt0HnGrTKe7XMMK fQZHWm3XnZNU3qEGJP6WwJJee1vYZh2PmwB2At2+w3dOybEv4FocAbOXD9zyJRUU+9LUXwAvFp8W 9C6xL3Yfi9yMoLboekitSY9cFbNND+CGAaJZ6ibkliybI7irqWiP0tB7b1NL2KLpT61Wa2pIS04+ IOTwjU7XdhWsN/FDQn3OVuPfQjdS0m2fM86m6/6nxycD0pDzRpzfuQAAACV0RVh0ZGF0ZTpjcmVh dGUAMjAyMS0xMi0xOVQxNTo0ODoyNSswMDowMGOJs9EAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMjEt MTItMTlUMTU6NDg6MjUrMDA6MDAS1AttAAAAAElFTkSuQmCC X-Now-Playing: Neil Young's _Comes a Time_: "Field Of Opportunity" In-Reply-To: <87zgowsi73.fsf@gnus.org> (Lars Ingebrigtsen's message of "Sun, 19 Dec 2021 16:55:12 +0100") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:222710 Archived-At: Lars Ingebrigtsen writes: > Never mind, that's not correct -- outside a field, the `field-end' > should return the position before the beginning of the next field, so I > that's wrong. This one should be more correct, but it's just 3x faster than what's on the trunk... diff --git a/src/editfns.c b/src/editfns.c index 5c9c34dc35..355a7a3e29 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -437,6 +437,27 @@ find_field (Lisp_Object pos, Lisp_Object merge_at_boundary, after_field = get_char_property_and_overlay (pos, Qfield, Qnil, NULL); + + /* We're not in a field, so find the prev/next area with a field + property. */ + if (NILP (after_field)) + { + if (beg) + { + Lisp_Object p = Fprevious_single_char_property_change (pos, Qfield, + Qnil, + beg_limit); + *beg = NILP (p) ? BEGV : XFIXNAT (p); + } + if (end) + { + Lisp_Object p = Fnext_single_char_property_change (pos, Qfield, Qnil, + end_limit); + *end = NILP (p) ? ZV : XFIXNAT (p); + } + return; + } + before_field = (XFIXNAT (pos) > BEGV ? get_char_property_and_overlay (make_fixnum (XFIXNUM (pos) - 1), -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no