* minibuffer.el (tags-completion-at-point-function): Fix return value.

2 files changed, 13 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ddc0fb8e239..ec929a7c58d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-30  Chong Yidong  <cyd@stupidchicken.com>
+
+        * minibuffer.el (tags-completion-at-point-function): Fix return
+        value.
+
 2010-04-30  Eli Zaretskii  <eliz@gnu.org>
 
         * composite.el (compose-region, reference-point-alist): Fix typos
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 80e5f0ad10f..be9b9a524fe 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1169,6 +1169,7 @@ Currently supported properties are:
  `:predicate'           a predicate that completion candidates need to satisfy.
  `:annotation-function' the value to use for `completion-annotate-function'.")
 
+(declare-function tags-lazy-completion-table "etags.el" ())
 (defun tags-completion-at-point-function ()
   "Using tags, return a completion table for the text around point.
 If no tags table is loaded, do nothing and return nil."
@@ -1180,11 +1181,14 @@ If no tags table is loaded, do nothing and return nil."
                                     case-fold-search))
           (pattern (funcall (or find-tag-default-function
                                 (get major-mode 'find-tag-default-function)
-                                'find-tag-default))))
+                                'find-tag-default)))
+          beg)
       (when pattern
-        (tags-lazy-completion-table)))))
-
-(declare-function tags-lazy-completion-table "etags.el" ())
+        (save-excursion
+          (search-backward pattern)
+          (setq beg (point))
+          (forward-char (length pattern))
+          (list beg (point) (tags-lazy-completion-table)))))))
 
 (defun complete-symbol (&optional arg)
   "Perform completion on the text around point.