aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2015-07-09 10:18:00 +0800
committerLeo Liu2015-07-09 10:19:42 +0800
commit7a94f28a470d640eda3f36016f4fc8946aac63be (patch)
treeb422ec39c504a92d63b0d572f716e61ac5bc2528
parent15fafa34d0f2d3491d27c6b6d6b6310424eadb14 (diff)
downloademacs-7a94f28a470d640eda3f36016f4fc8946aac63be.tar.gz
emacs-7a94f28a470d640eda3f36016f4fc8946aac63be.zip
Fix bug in thing-at-point--bounds-of-well-formed-url
* lisp/thingatpt.el (thing-at-point--bounds-of-well-formed-url): Make sure boundary contains current point.
-rw-r--r--lisp/thingatpt.el8
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index c26b9be1da8..84ffcca5290 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -361,7 +361,7 @@ the bounds of a possible ill-formed URI (one lacking a scheme)."
361 (if found 361 (if found
362 (cons (match-beginning 1) (match-end 1)))))) 362 (cons (match-beginning 1) (match-end 1))))))
363 363
364(defun thing-at-point--bounds-of-well-formed-url (beg end _pt) 364(defun thing-at-point--bounds-of-well-formed-url (beg end pt)
365 (save-excursion 365 (save-excursion
366 (goto-char beg) 366 (goto-char beg)
367 (let (url-beg paren-end regexp) 367 (let (url-beg paren-end regexp)
@@ -388,7 +388,11 @@ the bounds of a possible ill-formed URI (one lacking a scheme)."
388 (scan-lists (1- url-beg) 1 0)))) 388 (scan-lists (1- url-beg) 1 0))))
389 (not (blink-matching-check-mismatch (1- url-beg) paren-end)) 389 (not (blink-matching-check-mismatch (1- url-beg) paren-end))
390 (setq end (1- paren-end))) 390 (setq end (1- paren-end)))
391 (cons url-beg end))))) 391 ;; Ensure PT is actually within BOUNDARY. Check the following
392 ;; example with point on the beginning of the line:
393 ;;
394 ;; 3,1406710489,http://gnu.org,0,"0"
395 (and (<= url-beg pt end) (cons url-beg end))))))
392 396
393(put 'url 'thing-at-point 'thing-at-point-url-at-point) 397(put 'url 'thing-at-point 'thing-at-point-url-at-point)
394 398