Merge branch 'master' of git.ganneff.de:emacs
[emacs.git] / .emacs.d / config / emacs.org
index 374229d..2141727 100644 (file)
@@ -2629,19 +2629,19 @@ already had typed.
 
 (add-hook 'auto-complete-mode-hook 'set-auto-complete-as-completion-at-point-function)
 
-(require 'ac-dabbrev)
+;(require 'ac-dabbrev)
 (set-default 'ac-sources
              '(ac-source-imenu
                ac-source-dictionary
                ac-source-words-in-buffer
                ac-source-words-in-same-mode-buffers
-               ac-source-words-in-all-buffer
-               ac-source-dabbrev))
+               ac-source-words-in-all-buffer))
+;               ac-source-dabbrev))
 
 (dolist (mode '(magit-log-edit-mode log-edit-mode org-mode text-mode haml-mode
                 sass-mode yaml-mode csv-mode espresso-mode haskell-mode
                 html-mode nxml-mode sh-mode smarty-mode clojure-mode
-                lisp-mode textile-mode markdown-mode tuareg-mode
+                lisp-mode textile-mode markdown-mode tuareg-mode python-mode
                 js3-mode css-mode less-css-mode sql-mode ielm-mode))
   (add-to-list 'ac-modes mode))