Mercurial > emacs
changeset 108178:0f3897ef1f44
* minibuffer.el (tags-completion-at-point-function): Fix return value.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Fri, 30 Apr 2010 19:13:22 -0400 |
| parents | 35378c29749d |
| children | 8bcf1c901e9a |
| files | lisp/ChangeLog lisp/minibuffer.el |
| diffstat | 2 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Apr 30 13:48:04 2010 -0700 +++ b/lisp/ChangeLog Fri Apr 30 19:13:22 2010 -0400 @@ -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
--- a/lisp/minibuffer.el Fri Apr 30 13:48:04 2010 -0700 +++ b/lisp/minibuffer.el Fri Apr 30 19:13:22 2010 -0400 @@ -1169,6 +1169,7 @@ `: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 @@ 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.