Mercurial > emacs
comparison lisp/cedet/semantic.el @ 108159:56d11bda8235
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.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Wed, 28 Apr 2010 15:04:16 -0400 |
parents | f6b8c73548b3 |
children | 15deb8699a13 |
comparison
equal
deleted
inserted
replaced
108158:94e4a7a7cadf | 108159:56d11bda8235 |
---|---|
1078 (stringp semanticdb-default-system-save-directory) | 1078 (stringp semanticdb-default-system-save-directory) |
1079 (file-exists-p semanticdb-default-system-save-directory)) | 1079 (file-exists-p semanticdb-default-system-save-directory)) |
1080 (require 'semantic/db-ebrowse) | 1080 (require 'semantic/db-ebrowse) |
1081 (semanticdb-load-ebrowse-caches))) | 1081 (semanticdb-load-ebrowse-caches))) |
1082 (add-hook 'mode-local-init-hook 'semantic-new-buffer-fcn) | 1082 (add-hook 'mode-local-init-hook 'semantic-new-buffer-fcn) |
1083 ;; Add semantic-ia-complete-symbol to | |
1084 ;; completion-at-point-functions, so that it is run from | |
1085 ;; M-TAB. | |
1086 (add-hook 'completion-at-point-functions 'semantic-ia-complete-symbol) | |
1083 (if global-ede-mode | 1087 (if global-ede-mode |
1084 (define-key cedet-menu-map [cedet-menu-separator] '("--"))) | 1088 (define-key cedet-menu-map [cedet-menu-separator] '("--"))) |
1085 (dolist (b (buffer-list)) | 1089 (dolist (b (buffer-list)) |
1086 (with-current-buffer b | 1090 (with-current-buffer b |
1087 (semantic-new-buffer-fcn)))) | 1091 (semantic-new-buffer-fcn)))) |
1088 ;; Disable all Semantic features. | 1092 ;; Disable all Semantic features. |
1089 (remove-hook 'mode-local-init-hook 'semantic-new-buffer-fcn) | 1093 (remove-hook 'mode-local-init-hook 'semantic-new-buffer-fcn) |
1094 (remove-hook 'completion-at-point-functions 'semantic-ia-complete-symbol) | |
1090 (define-key cedet-menu-map [cedet-menu-separator] nil) | 1095 (define-key cedet-menu-map [cedet-menu-separator] nil) |
1091 (define-key cedet-menu-map [semantic-options-separator] nil) | 1096 (define-key cedet-menu-map [semantic-options-separator] nil) |
1092 ;; FIXME: handle semanticdb-load-ebrowse-caches | 1097 ;; FIXME: handle semanticdb-load-ebrowse-caches |
1093 (dolist (mode semantic-submode-list) | 1098 (dolist (mode semantic-submode-list) |
1094 (if (and (boundp mode) (eval mode)) | 1099 (if (and (boundp mode) (eval mode)) |