* progmodes/etags.el (tags-completion-at-point-function): Improve last fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dc8c5e04eb38f3bf065ba28ea3f82019b8d58ad1..4cedbe5f9a67c0e8e17dcc0071f4e6fb331db8a5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-03-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * progmodes/etags.el (tags-completion-at-point-function):
+       Improve last fix.
+
        * files.el (move-file-to-trash): Files aren't regexps (bug#11055).
 
 2012-03-21  Sam Steingold  <sds@gnu.org>

diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 3a36410884f10f6fe2fb69691e16f0ffc2b5b9ec..4b337e1c15c3d8d8c4f83a323ec8077dd2a44a7e 100644 (file)
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -809,10 +809,11 @@ If no tags table is loaded, do nothing and return nil."
          beg)
       (when pattern
        (save-excursion
-         (when (search-backward pattern nil t) ; will fail inside pattern
-            (setq beg (point))
-            (forward-char (length pattern))
-            (list beg (point) (tags-lazy-completion-table) :exclusive 'no)))))))
+          (forward-char (1- (length pattern)))
+          (search-backward pattern)
+          (setq beg (point))
+          (forward-char (length pattern))
+          (list beg (point) (tags-lazy-completion-table) :exclusive 'no))))))
 \f
 (defun find-tag-tag (string)
   "Read a tag name, with defaulting and completion."