diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-04-28 15:04:16 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-04-28 15:04:16 -0400 |
| commit | 48111a857162c91287bc77f11b1df83c4bfdf944 (patch) | |
| tree | 4415958088addea8dce295d355ef547f72eda438 /lisp/progmodes | |
| parent | 7ba947016008a5fcee64eb8660d688afb4414b96 (diff) | |
| download | emacs-48111a857162c91287bc77f11b1df83c4bfdf944.tar.gz | |
Unify complete-symbol with completion-at-point.
* bindings.el (complete-symbol): Move into minibuffer.el.
* minibuffer.el (complete-tag): Move from etags.el. If tags
completion cannot be performed, return nil instead of signalling
an error.
(completion-at-point): Make it an alias for complete-symbol.
(complete-symbol): Move from bindings.el, and replace with the
body of completion-at-point.
* progmodes/etags.el (complete-tag): Move to minibuffer.el.
* cedet/semantic.el (semantic-mode): When enabled, add
semantic-ia-complete-symbol to completion-at-point-functions.
* cedet/semantic/ia.el (semantic-ia-complete-symbol): Return nil
if Semantic is not active.
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/etags.el | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el index 23e175cbe7d..bde75179be8 100644 --- a/lisp/progmodes/etags.el +++ b/lisp/progmodes/etags.el @@ -2027,33 +2027,6 @@ see the doc of that variable if you want to add names to the list." (interactive) (quit-window t (selected-window))) -;;;###autoload -(defun complete-tag () - "Perform tags completion on the text around point. -Completes to the set of names listed in the current tags table. -The string to complete is chosen in the same way as the default -for \\[find-tag] (which see)." - (interactive) - (or tags-table-list - tags-file-name - (error "%s" - (substitute-command-keys - "No tags table loaded; try \\[visit-tags-table]"))) - (let ((completion-ignore-case (if (memq tags-case-fold-search '(t nil)) - tags-case-fold-search - case-fold-search)) - (pattern (funcall (or find-tag-default-function - (get major-mode 'find-tag-default-function) - 'find-tag-default))) - (comp-table (tags-lazy-completion-table)) - beg) - (or pattern - (error "Nothing to complete")) - (search-backward pattern) - (setq beg (point)) - (forward-char (length pattern)) - (completion-in-region beg (point) comp-table))) - (dolist (x '("^No tags table in use; use .* to select one$" "^There is no default tag$" "^No previous tag locations$" |