Disable yasnippets and jedi-mode for windows

bartvandendriessche · Feb 5, 2014 · 1b9843c · 1b9843c
1 parent 5126b50
commit 1b9843c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/settings/settings-programming.el b/settings/settings-programming.el
@@ -1,7 +1,6 @@
 (progn
   (setq el-get-sources (append el-get-sources
                                '((:name auto-complete)
-                                 (:name auto-complete-yasnippet)
                                  (:name flymake)
                                  (:name flymake-cursor)
                                  (:name markdown-mode)
@@ -13,6 +12,10 @@
                                  (:name web-mode :type :elpa :after (progn
                                                                       (setq web-mode-markup-indent-offset 4)
                                                                       (add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode)))))))
+  ;; ugh, screw yasnippet on windows
+  (if (not (eq system-type 'windows-nt))
+      (setq el-get-sources (append el-get-sources
+                                   '((:name auto-complete-yasnippet)))))
   (add-to-list 'auto-mode-alist '("\\.zsh$" . shell-script-mode))
   (add-to-list 'auto-mode-alist '("\\.zsh-theme$" . shell-script-mode)))
 

diff --git a/settings/settings-python.el b/settings/settings-python.el
@@ -1,16 +1,19 @@
 (progn
   (setq el-get-sources (append el-get-sources
-                               '((:name jedi :after (progn
+                               '((:name virtualenv :after (progn
-                                                      (add-hook 'python-mode-hook 'jedi:setup)
-                                                      (setq jedi:install-imenu)
-                                                      (setq jedi:use-shortcuts t)
-                                                      (setq jedi:complete-on-dot t)))
-                                 (:name virtualenv :after (progn
                                                             (put 'virtualenv-workon 'safe-local-variable 'stringp)
                                                             (put 'virtualenv-default-directory 'safe-local-variable 'stringp)))
                                  (:name virtualenvwrapper :type :elpa :after (progn
                                                                                (put 'project-venv-name 'safe-local-variable 'stringp))))))
 
+  (if (not (eq system-type 'windows-nt))
+      (setq el-get-sources (append el-get-sources
+                                   '((:name jedi :after (progn
+                                                          (add-hook 'python-mode-hook 'jedi:setup)
+                                                          (setq jedi:install-imenu)
+                                                          (setq jedi:use-shortcuts t)
+                                                          (setq jedi:complete-on-dot t)))))))
+
   (defun settings-pony-ac-setup ()
     "Make sure ac-source-yasnippet is added to `ac-sources`"
     (interactive)