summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2015-04-12 00:43:32 -0400
committerKyle Meyer <kyle@kyleam.com>2015-04-12 00:43:32 -0400
commit48224ff3a2dcdcd67cd18fe4a0a038db0a716bd9 (patch)
tree5a4ab2811a92263b564451bfa499386039ce4443
parent3dfea25664db332da8439daa7530202511bc99ff (diff)
downloademacs.d-48224ff3a2dcdcd67cd18fe4a0a038db0a716bd9.tar.gz
Disable jedi in Python mode
This seems to be interfering with reverting Python buffers. I haven't looked into this further yet.
-rw-r--r--lisp/init-python.el7
1 files changed, 0 insertions, 7 deletions
diff --git a/lisp/init-python.el b/lisp/init-python.el
index 3a4551c..da647ef 100644
--- a/lisp/init-python.el
+++ b/lisp/init-python.el
@@ -1,15 +1,10 @@
(setq python-fill-docstring-style 'pep-257-nn)
-(setq jedi:tooltip-method nil
- ac-auto-start nil)
-
(setq python-shell-interpreter "ipython")
(add-to-list 'interpreter-mode-alist '("python2" . python-mode))
(add-to-list 'interpreter-mode-alist '("python3" . python-mode))
-(add-hook 'python-mode-hook 'jedi:setup)
-(add-hook 'python-mode-hook 'auto-complete-mode)
(add-hook 'python-mode-hook
(lambda ()
(add-hook
@@ -17,8 +12,6 @@
#'km/python-indent-post-self-insert-function 'append 'local)))
(defun km/python-hook ()
- (set (make-local-variable 'yas-fallback-behavior)
- '(apply auto-complete))
;; Stop semantic from taking over imenu.
(setq imenu-create-index-function #'python-imenu-create-index)
(set (make-local-variable 'compile-command) "py.test"))