From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Leo Liu Newsgroups: gmane.emacs.bugs Subject: bug#15808: 24.3; thing-at-point slow for url and email Date: Wed, 06 Nov 2013 11:45:21 +0800 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1383709577 17010 80.91.229.3 (6 Nov 2013 03:46:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 6 Nov 2013 03:46:17 +0000 (UTC) Cc: 15808@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Nov 06 04:46:20 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 1Vdu4S-0000Os-7y for geb-bug-gnu-emacs@m.gmane.org; Wed, 06 Nov 2013 04:46:20 +0100 Original-Received: from localhost ([::1]:59710 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vdu4R-0000cI-Tp for geb-bug-gnu-emacs@m.gmane.org; Tue, 05 Nov 2013 22:46:19 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46195) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vdu4F-0000Zi-Pq for bug-gnu-emacs@gnu.org; Tue, 05 Nov 2013 22:46:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vdu4A-0004Z5-EO for bug-gnu-emacs@gnu.org; Tue, 05 Nov 2013 22:46:07 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:50658) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vdu4A-0004Yv-BA for bug-gnu-emacs@gnu.org; Tue, 05 Nov 2013 22:46:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Vdu49-0007Br-Lf for bug-gnu-emacs@gnu.org; Tue, 05 Nov 2013 22:46:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Leo Liu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 06 Nov 2013 03:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 15808 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 15808-submit@debbugs.gnu.org id=B15808.138370953827605 (code B ref 15808); Wed, 06 Nov 2013 03:46:01 +0000 Original-Received: (at 15808) by debbugs.gnu.org; 6 Nov 2013 03:45:38 +0000 Original-Received: from localhost ([127.0.0.1]:36444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Vdu3l-0007B8-VC for submit@debbugs.gnu.org; Tue, 05 Nov 2013 22:45:38 -0500 Original-Received: from mail-pb0-f43.google.com ([209.85.160.43]:53602) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Vdu3i-0007Au-Gd for 15808@debbugs.gnu.org; Tue, 05 Nov 2013 22:45:35 -0500 Original-Received: by mail-pb0-f43.google.com with SMTP id md4so8372725pbc.2 for <15808@debbugs.gnu.org>; Tue, 05 Nov 2013 19:45:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:references:face:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=1TI2f06b+tmgoAo47QK36KKhTvK+I5GKUGBB1oGUgds=; b=GTC3lWofftn+l9l533crLybxYKCH11ve+YNrzKzc5bZT4JshrSZ9mNGPliA5nyJ0GX PUOUveV4QN9cpnvUNd54kDCf4Wq+vpFKNISRsXUeIWJtfnkSeBpkywzRZ2cU6HkrnZhz iOMZ9FEYc9eLH7qIVi5qIB+pNqm2rAwvLMRi19UCjao6/MDKw65h1TETgo4MsKQ/gRCu Zmb6RiITeDFWA/4KpGchKSQZNvjSghY9Q2ui46I5I76Y4h1/mSh/C8ZPti3ZemwQNUUm 1I3i/SGIfwhTWWgcjLBXacjIqXBLshkQnbvEF5eDWLANI9jEOjAUkM2ptFFnubFSOM5T qwpg== X-Received: by 10.68.138.199 with SMTP id qs7mr144593pbb.199.1383709528308; Tue, 05 Nov 2013 19:45:28 -0800 (PST) Original-Received: from localhost ([221.217.232.4]) by mx.google.com with ESMTPSA id j9sm44320818paj.18.2013.11.05.19.45.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Nov 2013 19:45:27 -0800 (PST) Face: iVBORw0KGgoAAAANSUhEUgAAACgAAAAoBAMAAAB+0KVeAAAAGFBMVEUKDAg1NjRWV1V9fnyg op/DxcLk5uP8/voi63ReAAAACXBIWXMAAAWJAAAFiQFtaJ36AAAAB3RJTUUH1goZAgAz00bgXgAA AeVJREFUKM9lk0Fz2jAQhQXJD3CCO70CmcC1YMtcWyTZ14Bl69xats4N9r6/3zWQBlodNKNPu/s0 b1cCQFuZGpfVVh3vAvBJolIXRkapSuoRUtIdFyo1Y5xSdlAj7OtvD1XnXxmWRi+eWgcxyCed1lVV B1CrKyujMoi+eLA5kU1SsjoHlW+nQjTtFxk4MXgrOxvIqzoTZR8XgPaLl419zgsMaSGFPiUOZCIh thsx5Xy9NsK8Kwf/JoQgMxcVJ301HKkcSWaT0O7FY056J4U9xcYfnmVXG4801lW6lqwu2nKFZoHC HuzvaTVndZ+LaRQgZdthXw1cpynEkLEwyFHXk/aIxNQ6QeooJuzPMB+wn+D7JJNsiCcVA13/A3h/ xE9J+WidpAwoYNmRFwyvSRhNVtsdaAewzZZP5uw82QL9+tyNfocyP0McAzICUr5Mk9RdIjWasUNx aIIt6NK4ZtXIMdfMQt3nuMAyWbLI4DqZ4xPq/ag8jPond4XU/cLuOgw6XCFX/YCUfcDAMMH58fD4 G9kDchwfqVefkBwup2uZM+Q4WhJt5jN3AxXCsaS2yXEDuWgS8VOzW0gFjhEPmLyFMKBFaLb1HRwc DiaKwx0EeTMRYnYPQRW3PP4HApvlMv0PttX5v/D6Aws3IOSEwzmLAAAAAElFTkSuQmCC In-Reply-To: (Stefan Monnier's message of "Tue, 05 Nov 2013 21:18:52 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (OS X 10.9) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.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:80057 Archived-At: Revised patch: === modified file 'lisp/thingatpt.el' --- lisp/thingatpt.el 2013-08-10 15:17:29 +0000 +++ lisp/thingatpt.el 2013-11-06 03:43:24 +0000 @@ -476,19 +476,22 @@ ;; matches that straddle the start position so we search forwards once ;; and then back repeatedly and then back up a char at a time. -(defun thing-at-point-looking-at (regexp) +(defun thing-at-point-looking-at (regexp &optional distance) "Return non-nil if point is in or just after a match for REGEXP. Set the match data from the earliest such match ending at or after point." (save-excursion - (let ((old-point (point)) match) + (let ((old-point (point)) + (forward-bound (and distance (+ (point) distance))) + (backward-bound (and distance (- (point) distance))) + match) (and (looking-at regexp) (>= (match-end 0) old-point) (setq match (point))) ;; Search back repeatedly from end of next match. ;; This may fail if next match ends before this match does. - (re-search-forward regexp nil 'limit) - (while (and (re-search-backward regexp nil t) + (re-search-forward regexp forward-bound 'limit) + (while (and (re-search-backward regexp backward-bound t) (or (> (match-beginning 0) old-point) (and (looking-at regexp) ; Extend match-end past search start (>= (match-end 0) old-point) @@ -518,7 +521,8 @@ (put 'email 'bounds-of-thing-at-point (lambda () - (let ((thing (thing-at-point-looking-at thing-at-point-email-regexp))) + (let ((thing (thing-at-point-looking-at + thing-at-point-email-regexp 500))) (if thing (let ((beginning (match-beginning 0)) (end (match-end 0)))