* thingatpt.el (thing-at-point-looking-at): Add optional arg

DISTANCE to bound the search. All uses changed.

Fixes: debbugs:15808

2 files changed, 14 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 90f71bb01a1..d775afd9c5b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-06  Leo Liu  <sdl.web@gmail.com>
+
+        * thingatpt.el (thing-at-point-looking-at): Add optional arg
+        DISTANCE to bound the search. All uses changed.  (Bug#15808)
+
 2013-11-06  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (setwins, setwins_almost, setwins_for_subdirs): Simplify.
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index b67a32a24f7..0887c7f1fe4 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -476,19 +476,22 @@ looks like an email address, \"ftp://\" if it starts with
 ;; 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 @@ with angle brackets.")
 
 (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)))