procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
DISTANCE to bound the search. All uses changed.

Fixes: debbugs:15808
This commit is contained in:
Leo Liu 2013-11-06 17:06:05 +08:00
parent 65de43ada9
commit 5d5c701ef9
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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.

14
lisp/thingatpt.el
View file

@ -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)))