diff options
Diffstat (limited to 'lisp/cedet/semantic.el')
| -rw-r--r-- | lisp/cedet/semantic.el | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el index 14b196bbe22..ede96e39183 100644 --- a/lisp/cedet/semantic.el +++ b/lisp/cedet/semantic.el @@ -4,7 +4,8 @@ ;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> -;; Keywords: syntax +;; Keywords: syntax tools +;; Version: 2.0 ;; This file is part of GNU Emacs. @@ -38,7 +39,7 @@ (require 'semantic/tag) (require 'semantic/lex) -(defvar semantic-version "2.0pre7" +(defvar semantic-version "2.0" "Current version of Semantic.") (declare-function inversion-test "inversion") @@ -875,6 +876,7 @@ Throw away all the old tags, and recreate the tag database." ;; (define-key km "i" 'senator-isearch-toggle-semantic-mode) (define-key map "\C-c,j" 'semantic-complete-jump-local) (define-key map "\C-c,J" 'semantic-complete-jump) + (define-key map "\C-c,m" 'semantic-complete-jump-local-members) (define-key map "\C-c,g" 'semantic-symref-symbol) (define-key map "\C-c,G" 'semantic-symref) (define-key map "\C-c,p" 'senator-previous-tag) @@ -885,6 +887,7 @@ Throw away all the old tags, and recreate the tag database." (define-key map "\C-c,\M-w" 'senator-copy-tag) (define-key map "\C-c,\C-y" 'senator-yank-tag) (define-key map "\C-c,r" 'senator-copy-tag-to-register) + (define-key map "\C-c,," 'semantic-force-refresh) (define-key map [?\C-c ?, up] 'senator-transpose-tags-up) (define-key map [?\C-c ?, down] 'senator-transpose-tags-down) (define-key map "\C-c,l" 'semantic-analyze-possible-completions) @@ -950,6 +953,9 @@ Throw away all the old tags, and recreate the tag database." (define-key navigate-menu [semantic-complete-jump] '(menu-item "Find Tag Globally..." semantic-complete-jump :help "Read a tag name and find it in the current project")) + (define-key navigate-menu [semantic-complete-jump-local-members] + '(menu-item "Find Local Members ..." semantic-complete-jump-local-members + :help "Read a tag name and find a local member with that name")) (define-key navigate-menu [semantic-complete-jump-local] '(menu-item "Find Tag in This Buffer..." semantic-complete-jump-local :help "Read a tag name and find it in this buffer")) @@ -1080,6 +1086,11 @@ Semantic mode. (require 'semantic/db-ebrowse) (semanticdb-load-ebrowse-caches))) (add-hook 'mode-local-init-hook 'semantic-new-buffer-fcn) + ;; Add semantic-ia-complete-symbol to + ;; completion-at-point-functions, so that it is run from + ;; M-TAB. + (add-hook 'completion-at-point-functions + 'semantic-completion-at-point-function) (if global-ede-mode (define-key cedet-menu-map [cedet-menu-separator] '("--"))) (dolist (b (buffer-list)) @@ -1087,6 +1098,8 @@ Semantic mode. (semantic-new-buffer-fcn)))) ;; Disable all Semantic features. (remove-hook 'mode-local-init-hook 'semantic-new-buffer-fcn) + (remove-hook 'completion-at-point-functions + 'semantic-completion-at-point-function) (define-key cedet-menu-map [cedet-menu-separator] nil) (define-key cedet-menu-map [semantic-options-separator] nil) ;; FIXME: handle semanticdb-load-ebrowse-caches @@ -1094,6 +1107,9 @@ Semantic mode. (if (and (boundp mode) (eval mode)) (funcall mode -1))))) +(defun semantic-completion-at-point-function () + 'semantic-ia-complete-symbol) + ;;; Autoload some functions that are not in semantic/loaddefs (autoload 'global-semantic-idle-completions-mode "semantic/idle" |