From: Dmitry Gutov <dgutov@yandex.ru>
Date: Mon, 22 Feb 2016 22:56:51 +0000 (+0200)
Subject: Make find-tag-default-bounds more strict
X-Git-Tag: emacs-25.0.92~62
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e72a26e;p=emacs.git

Make find-tag-default-bounds more strict

* lisp/subr.el (find-tag-default-bounds): Delegate to
bounds-of-thing-at-point (bug#22692).
---

diff --git a/lisp/subr.el b/lisp/subr.el
index cf26fe384ba..dde76916230 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2626,29 +2626,7 @@ See also `locate-user-emacs-file'.")
   "Determine the boundaries of the default tag, based on text at point.
 Return a cons cell with the beginning and end of the found tag.
 If there is no plausible default, return nil."
-  (let (from to bound)
-    (when (or (progn
-		;; Look at text around `point'.
-		(save-excursion
-		  (skip-syntax-backward "w_") (setq from (point)))
-		(save-excursion
-		  (skip-syntax-forward "w_") (setq to (point)))
-		(> to from))
-	      ;; Look between `line-beginning-position' and `point'.
-	      (save-excursion
-		(and (setq bound (line-beginning-position))
-		     (skip-syntax-backward "^w_" bound)
-		     (> (setq to (point)) bound)
-		     (skip-syntax-backward "w_")
-		     (setq from (point))))
-	      ;; Look between `point' and `line-end-position'.
-	      (save-excursion
-		(and (setq bound (line-end-position))
-		     (skip-syntax-forward "^w_" bound)
-		     (< (setq from (point)) bound)
-		     (skip-syntax-forward "w_")
-		     (setq to (point)))))
-      (cons from to))))
+  (bounds-of-thing-at-point 'symbol))
 
 (defun find-tag-default ()
   "Determine default tag to search for, based on text at point.