Auto commit by The Sugar System.

[sugar.git] / dot-files / _emacs_el

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index b512251a356ff7a95b22a1e45ca1562a45c7aaa0..17b8e26cd45494cd939ab1296067a6f64c94f2bd 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -112,6 +112,24 @@
 ;; jaspace
 (require-if-present 'jaspace)
 
+;; auto-complete
+(require-if-present 'auto-complete-config)
+(if (featurep 'auto-complete-config)
+    (progn
+      (add-to-list 'ac-dictionary-directories
+                   "/usr/pkg/share/emacs/site-lisp/auto-complete/ac-dict")
+      (mapcar (lambda (mode)
+                (add-to-list 'ac-modes mode))
+              '(autoconf-mode
+                erlang-mode
+                haskell-mode
+                haskell-cabal-mode))
+      (setq ac-modes (remove 'css-mode ac-modes))
+      (add-hook 'erlang-mode-hook
+                (lambda ()
+                  (add-to-list 'ac-sources 'ac-source-semantic)))
+      (ac-config-default)))
+
 ;; mic-paren
 (require-if-present 'mic-paren)
 (if (featurep 'mic-paren)
@@ -238,9 +256,6 @@
             (inf-ruby-keys)
           ))
 
-;; Tramp
-(setq tramp-default-method "ssh")
-
 ;; Haskell
 (load-if-present "haskell-site-file.el")
 
@@ -440,6 +455,9 @@
  '(rng-schema-locating-files (quote ("schemas.xml" "/sw/share/schema/schemas.xml" "~/share/nxml/schemas.xml")))
  '(rst-level-face-base-light 50)
  '(safe-local-variable-values (quote ((todo-categories "Todo" "Todo" "Todo" "Todo"))))
+ '(tramp-auto-save-directory "/tmp/tramp-auto-save")
+ '(tramp-completion-reread-directory-timeout 2)
+ '(tramp-default-host "localhost")
  '(w3m-bookmark-file-coding-system (quote utf-8))
  '(w3m-coding-system (quote utf-8))
  '(w3m-coding-system-priority-list (quote (utf-8)))