X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/b895c72059521fec064ff27b4cfcfa4104081c4e..25cc0f2aada3e321e5f1c6d1e492a93d16da45b2:/lisp/thingatpt.el

diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index 1686c02ada..df5c52d4d6 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -489,19 +489,26 @@ looks like an email address, \"ftp://\" if it starts with
 (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."
+point.
+
+Optional argument DISTANCE limits search for REGEXP forward and
+back from point."
   (save-excursion
     (let ((old-point (point))
 	  (forward-bound (and distance (+ (point) distance)))
 	  (backward-bound (and distance (- (point) distance)))
-	  match)
+	  match prev-pos new-pos)
       (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 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)
 		      (and (looking-at regexp)	; Extend match-end past search start
 			   (>= (match-end 0) old-point)
@@ -596,7 +603,10 @@ Signal an error if the entire string was not used."
 ;;;###autoload
 (defun number-at-point ()
   "Return the number at point, or nil if none is found."
-  (form-at-point 'sexp 'numberp))
+  (when (thing-at-point-looking-at "-?[0-9]+\\.?[0-9]*" 500)
+    (string-to-number
+     (buffer-substring (match-beginning 0) (match-end 0)))))
+
 (put 'number 'thing-at-point 'number-at-point)
 ;;;###autoload
 (defun list-at-point ()