Mercurial > emacs
comparison lisp/cedet/semantic.el @ 110533:b799d38f522a
Merge changes from emacs-23 branch
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Thu, 23 Sep 2010 15:00:31 -0400 |
| parents | a3e1f7134e6e a5ad4f188e19 |
| children | 417b1e4d63cd |
comparison
equal
deleted
inserted
replaced
| 110506:2cac83f5f8bc | 110533:b799d38f522a |
|---|---|
| 3 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 3 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
| 4 ;; 2008, 2009, 2010 Free Software Foundation, Inc. | 4 ;; 2008, 2009, 2010 Free Software Foundation, Inc. |
| 5 | 5 |
| 6 ;; Author: Eric M. Ludlam <zappo@gnu.org> | 6 ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 7 ;; Keywords: syntax tools | 7 ;; Keywords: syntax tools |
| 8 ;; Version: 2.0pre7 | 8 ;; Version: 2.0 |
| 9 | 9 |
| 10 ;; This file is part of GNU Emacs. | 10 ;; This file is part of GNU Emacs. |
| 11 | 11 |
| 12 ;; GNU Emacs is free software: you can redistribute it and/or modify | 12 ;; GNU Emacs is free software: you can redistribute it and/or modify |
| 13 ;; it under the terms of the GNU General Public License as published by | 13 ;; it under the terms of the GNU General Public License as published by |
| 37 | 37 |
| 38 (require 'cedet) | 38 (require 'cedet) |
| 39 (require 'semantic/tag) | 39 (require 'semantic/tag) |
| 40 (require 'semantic/lex) | 40 (require 'semantic/lex) |
| 41 | 41 |
| 42 (defvar semantic-version "2.0pre7" | 42 (defvar semantic-version "2.0" |
| 43 "Current version of Semantic.") | 43 "Current version of Semantic.") |
| 44 | 44 |
| 45 (declare-function inversion-test "inversion") | 45 (declare-function inversion-test "inversion") |
| 46 (declare-function semanticdb-load-ebrowse-caches "semantic/db-ebrowse") | 46 (declare-function semanticdb-load-ebrowse-caches "semantic/db-ebrowse") |
| 47 | 47 |
| 874 ;; Key bindings: | 874 ;; Key bindings: |
| 875 ;; (define-key km "f" 'senator-search-set-tag-class-filter) | 875 ;; (define-key km "f" 'senator-search-set-tag-class-filter) |
| 876 ;; (define-key km "i" 'senator-isearch-toggle-semantic-mode) | 876 ;; (define-key km "i" 'senator-isearch-toggle-semantic-mode) |
| 877 (define-key map "\C-c,j" 'semantic-complete-jump-local) | 877 (define-key map "\C-c,j" 'semantic-complete-jump-local) |
| 878 (define-key map "\C-c,J" 'semantic-complete-jump) | 878 (define-key map "\C-c,J" 'semantic-complete-jump) |
| 879 (define-key map "\C-c,m" 'semantic-complete-jump-local-members) | |
| 879 (define-key map "\C-c,g" 'semantic-symref-symbol) | 880 (define-key map "\C-c,g" 'semantic-symref-symbol) |
| 880 (define-key map "\C-c,G" 'semantic-symref) | 881 (define-key map "\C-c,G" 'semantic-symref) |
| 881 (define-key map "\C-c,p" 'senator-previous-tag) | 882 (define-key map "\C-c,p" 'senator-previous-tag) |
| 882 (define-key map "\C-c,n" 'senator-next-tag) | 883 (define-key map "\C-c,n" 'senator-next-tag) |
| 883 (define-key map "\C-c,u" 'senator-go-to-up-reference) | 884 (define-key map "\C-c,u" 'senator-go-to-up-reference) |
| 884 (define-key map "\C-c, " 'semantic-complete-analyze-inline) | 885 (define-key map "\C-c, " 'semantic-complete-analyze-inline) |
| 885 (define-key map "\C-c,\C-w" 'senator-kill-tag) | 886 (define-key map "\C-c,\C-w" 'senator-kill-tag) |
| 886 (define-key map "\C-c,\M-w" 'senator-copy-tag) | 887 (define-key map "\C-c,\M-w" 'senator-copy-tag) |
| 887 (define-key map "\C-c,\C-y" 'senator-yank-tag) | 888 (define-key map "\C-c,\C-y" 'senator-yank-tag) |
| 888 (define-key map "\C-c,r" 'senator-copy-tag-to-register) | 889 (define-key map "\C-c,r" 'senator-copy-tag-to-register) |
| 890 (define-key map "\C-c,," 'semantic-force-refresh) | |
| 889 (define-key map [?\C-c ?, up] 'senator-transpose-tags-up) | 891 (define-key map [?\C-c ?, up] 'senator-transpose-tags-up) |
| 890 (define-key map [?\C-c ?, down] 'senator-transpose-tags-down) | 892 (define-key map [?\C-c ?, down] 'senator-transpose-tags-down) |
| 891 (define-key map "\C-c,l" 'semantic-analyze-possible-completions) | 893 (define-key map "\C-c,l" 'semantic-analyze-possible-completions) |
| 892 ;; This hack avoids showing the CEDET menu twice if ede-minor-mode | 894 ;; This hack avoids showing the CEDET menu twice if ede-minor-mode |
| 893 ;; and Semantic are both enabled. Is there a better way? | 895 ;; and Semantic are both enabled. Is there a better way? |
| 949 '(menu-item "Find Tag References..." semantic-symref-symbol | 951 '(menu-item "Find Tag References..." semantic-symref-symbol |
| 950 :help "Read a tag and list the references to it")) | 952 :help "Read a tag and list the references to it")) |
| 951 (define-key navigate-menu [semantic-complete-jump] | 953 (define-key navigate-menu [semantic-complete-jump] |
| 952 '(menu-item "Find Tag Globally..." semantic-complete-jump | 954 '(menu-item "Find Tag Globally..." semantic-complete-jump |
| 953 :help "Read a tag name and find it in the current project")) | 955 :help "Read a tag name and find it in the current project")) |
| 956 (define-key navigate-menu [semantic-complete-jump-local-members] | |
| 957 '(menu-item "Find Local Members ..." semantic-complete-jump-local-members | |
| 958 :help "Read a tag name and find a local member with that name")) | |
| 954 (define-key navigate-menu [semantic-complete-jump-local] | 959 (define-key navigate-menu [semantic-complete-jump-local] |
| 955 '(menu-item "Find Tag in This Buffer..." semantic-complete-jump-local | 960 '(menu-item "Find Tag in This Buffer..." semantic-complete-jump-local |
| 956 :help "Read a tag name and find it in this buffer")) | 961 :help "Read a tag name and find it in this buffer")) |
| 957 (define-key navigate-menu [semantic-navigation-separator] | 962 (define-key navigate-menu [semantic-navigation-separator] |
| 958 '("--")) | 963 '("--")) |