update auto complete to lastest version

1 files changed, 8 insertions, 147 deletions

diff --git a/emacs.d/lisp/setup-auto-complete.el b/emacs.d/lisp/setup-auto-complete.el
index 9d04780..44d27b7 100644
--- a/emacs.d/lisp/setup-auto-complete.el
+++ b/emacs.d/lisp/setup-auto-complete.el
@@ -25,11 +25,17 @@
 ;;; Code:

 

 ;;auto-complete

+(require 'yasnippet)

+(require 'imenu)

+

+(add-to-list 'load-path "~/.emacs.d/auto-complete")

 (require 'auto-complete)

+

+(add-to-list 'ac-dictionary-directories "~/.emacs.d/auto-complete/ac-dict")

 (require 'auto-complete-config)

-(require 'yasnippet)

+(ac-config-default)

 

-(global-auto-complete-mode t)

+;;(global-auto-complete-mode t)

 (setq ac-auto-start 2)

 

 (define-key ac-complete-mode-map "\t" 'ac-expand)

@@ -42,152 +48,7 @@
 (setq ac-candidate-menu-height 20)

 (setq ac-candidate-max ac-candidate-menu-height)

 

-(set-default 'ac-sources

-             '(ac-source-semantic

-               ac-source-yasnippet

-               ac-source-abbrev

-               ac-source-words-in-buffer

-               ac-source-words-in-all-buffer

-               ac-source-imenu

-               ac-source-files-in-current-dir

-               ac-source-filename))

-;;(setq ac-modes ac+-modes)

-

 (setq ac-trigger-commands '(self-insert-command autopair-insert-or-skip-quote))

 

-(defun ac-settings-4-lisp ()

-  "Auto complete settings for lisp mode."

-  (setq ac-omni-completion-sources '(("require\s+'" ac-source-emacs-lisp-features)

-                                     ("load\s+\"" ac-source-emacs-lisp-features)))

-  (setq ac-sources

-        '(ac-source-yasnippet

-          ac-source-symbols

-	  ac-source-semantic

-          ac-source-abbrev

-          ac-source-words-in-buffer

-          ac-source-words-in-all-buffer

-          ac-source-imenu

-          ac-source-files-in-current-dir

-          ac-source-filename)))

-

-(defun ac-settings-4-java ()

-  (setq ac-omni-completion-sources (list (cons "\\." '(ac-source-semantic))

-                                         (cons "->" '(ac-source-semantic))))

-  (setq ac-sources

-        '(ac-source-semantic

-          ac-source-yasnippet

-          ac-source-abbrev

-          ac-source-words-in-buffer

-          ac-source-words-in-all-buffer

-          ac-source-files-in-current-dir

-          ac-source-filename)))

-

-(ac-define-dictionary-source

- ac-source-c-keywords

- ("and" "bool" "compl" "do" "export" "goto" "or_eq" "return" "struct"

-  "xor" "and_eq" "break" "const" "double" "extern" "if" "short"

-  "switch" "typedef" "xor_eq" "asm" "case" "false" "inline" "not"

-  "signed" "void" "auto" "continue" "else" "float" "int" "not_eq"

-  "sizeof" "typename" "typeof" "volatile" "offset" "bitand" "char"

-  "default" "enum" "for" "long" "operator" "register" "static" "union"

-  "wchar_t" "bitor" "or" "true" "unsigned" "while" "restrict"

-  "intptr_t" "uintptr_t" "off_t" "loff_t" "size_t" "ssize_t" "int8_t"

-  "uint8_t" "int16_t" "uint16_t" "int32_t" "uint32_t" "int64_t"

-  "uint64_t"))

-

-(defun ac-c-keywords-setup ()

-  (push 'ac-source-c-keywords ac-sources))

-

-(defun ac-c-keywords-initialize ()

-  (add-hook 'c-mode-hook 'ac-c-keywords-setup)

-  t)

-

-(defun ac-settings-4-c ()

-  (setq ac-omni-completion-sources (list (cons "\\." '(ac-source-semantic))

-                                         (cons "->" '(ac-source-semantic))))

-  (setq ac-sources

-        '(ac-source-semantic

-	  ac-source-yasnippet

-          ac-source-c-keywords

-          ac-source-abbrev

-          ac-source-words-in-buffer

-          ac-source-words-in-all-buffer

-          ac-source-files-in-current-dir

-          ac-source-filename)))

-

-(defun ac-settings-4-cpp ()

-            (setq ac-omni-completion-sources

-                  (list (cons "\\." '(ac-source-semantic))

-                        (cons "->" '(ac-source-semantic))))

-            (setq ac-sources

-                  '(ac-source-semantic

-		    ac-source-yasnippet

-                    ac-source-c++-keywords

-                    ac-source-abbrev

-                    ac-source-words-in-buffer

-                    ac-source-words-in-all-buffer

-                    ac-source-files-in-current-dir

-                    ac-source-filename)))

-

-(defun ac-settings-4-python ()

-	    (setq ac-omni-completion-sources

-		  '(("\\." ac-source-ropemacs)))

-	    (setq ac-sources

-                  '(ac-source-semantic

-		    ac-source-yasnippet

-                    ac-source-abbrev

-                    ac-source-words-in-buffer

-                    ac-source-words-in-all-buffer

-                    ac-source-files-in-current-dir

-                    ac-source-filename)))

-

-(defun ac-settings-4-text ()

-            (setq ac-sources

-                  '(;;ac-source-semantic

-                    ac-source-yasnippet

-                    ac-source-abbrev

-                    ac-source-words-in-buffer

-                    ac-source-words-in-all-buffer

-                    ac-source-imenu)))

-

-(defun ac-settings-4-eshell ()

-            (setq ac-sources

-                  '(;;ac-source-semantic

-                    ac-source-yasnippet

-                    ac-source-abbrev

-                    ac-source-words-in-buffer

-                    ac-source-words-in-all-buffer

-                    ac-source-files-in-current-dir

-                    ac-source-filename

-                    ac-source-symbols

-                    ac-source-imenu)))

-

-(defun ac-settings-4-ruby ()

-            (setq ac-omni-completion-sources

-                  (list (cons "\\." '(ac-source-rcodetools))

-                        (cons "::" '(ac-source-rcodetools)))))

-

-(defun ac-settings-4-html ()

-  (setq ac-sources

-        '(ac-source-semantic

-          ac-source-yasnippet

-          ac-source-abbrev

-          ac-source-words-in-buffer

-          ac-source-words-in-all-buffer

-          ac-source-files-in-current-dir

-          ac-source-filename)))

-

-(dolist (hook (list 'lisp-mode-hook 'emacs-lisp-mode-hook 'lisp-interaction-mode-hook

-                    'svn-log-edit-mode))

-  (add-hook hook 'ac-settings-4-lisp))

-

-(add-hook 'java-mode-hook   'ac-settings-4-java)

-(add-hook 'c-mode-hook      'ac-settings-4-c)

-(add-hook 'c++-mode-hook    'ac-settings-4-cpp)

-(add-hook 'python-mode-hook    'ac-settings-4-python)

-(add-hook 'text-mode-hook   'ac-settings-4-text)

-(add-hook 'eshell-mode-hook 'ac-settings-4-eshell)

-(add-hook 'html-mode-hook   'ac-settings-4-html)

-

 (provide 'setup-auto-complete)

 ;;; setup-auto-complete.el ends here