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

Avoid inflooping in thing-at-point-looking-at

Browse source 
* lisp/thingatpt.el (thing-at-point-looking-at): Avoid inflooping
with regular expressions whose matching doesn't move point.
(Bug#22756)
Describe the argument DISTANCE in the doc string.
This commit is contained in:
Eli Zaretskii 2016-02-27 13:27:36 +02:00
parent 098d47bcf7
commit 14060a9c16
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lisp/thingatpt.el
View file

@ -489,19 +489,26 @@ looks like an email address, \"ftp://\" if it starts with
(defun thing-at-point-looking-at (regexp &optional distance) (defun thing-at-point-looking-at (regexp &optional distance)
"Return non-nil if point is in or just after a match for REGEXP. "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 Set the match data from the earliest such match ending at or after
point." point.
Optional argument DISTANCE limits search for REGEXP forward and
back from point."
(save-excursion (save-excursion
(let ((old-point (point)) (let ((old-point (point))
(forward-bound (and distance (+ (point) distance))) (forward-bound (and distance (+ (point) distance)))
(backward-bound (and distance (- (point) distance))) (backward-bound (and distance (- (point) distance)))
match) match prev-pos new-pos)
(and (looking-at regexp) (and (looking-at regexp)
(>= (match-end 0) old-point) (>= (match-end 0) old-point)
(setq match (point))) (setq match (point)))
;; Search back repeatedly from end of next match. ;; Search back repeatedly from end of next match.
;; This may fail if next match ends before this match does. ;; This may fail if next match ends before this match does.
(re-search-forward regexp forward-bound 'limit) (re-search-forward regexp forward-bound 'limit)
(while (and (re-search-backward regexp backward-bound t) (setq prev-pos (point))
(while (and (setq new-pos (re-search-backward regexp backward-bound t))
;; Avoid inflooping with some regexps, such as "^",
;; matching which never moves point.
(< new-pos prev-pos)
(or (> (match-beginning 0) old-point) (or (> (match-beginning 0) old-point)
(and (looking-at regexp) ; Extend match-end past search start (and (looking-at regexp) ; Extend match-end past search start
(>= (match-end 0) old-point) (>= (match-end 0) old-point)