wgester/dotfiles
1
0
Fork 0
forked from colonelpanic/dotfiles
Code Pull Requests Activity

move back to jedi.el

Browse Source
This commit is contained in:
Ivan Malison 2015-09-30 11:26:41 -07:00
parent 7fada23566
commit 397c1eddc4
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dotfiles/emacs.d/init.el
View File

@ -1786,15 +1786,15 @@ window is active in the perspective."
(interactive) (interactive)
(message "%s" (get-virtual-envs))) (message "%s" (get-virtual-envs)))
(use-package elpy (use-package jedi
:commands elpy-enable :commands (jedi:goto-definition jedi-mode)
:config :config
(progn (progn
(setq elpy-use-ipython t) (setq jedi:complete-on-dot t)
(setq elpy-rpc-backend "jedi") (setq jedi:imenu-create-index-function 'jedi:create-flat-imenu-index))
(elpy-enable) :ensure t
(unbind-key "M-*" elpy-mode-map) :bind (("M-." . jedi:goto-definition)
(bind-key "M-," 'pop-tag-mark elpy-mode-map))) ("M-," . jedi:goto-definition-pop-marker)))
(use-package company-jedi (use-package company-jedi
:commands company-jedi :commands company-jedi
@ -1815,11 +1815,10 @@ window is active in the perspective."
(setq show-trailing-whitespace t) (setq show-trailing-whitespace t)
(if use-python-tabs (python-tabs)) (if use-python-tabs (python-tabs))
(subword-mode t) (subword-mode t)
(elpy-mode)
(imalison:make-imenu-index-flat) (imalison:make-imenu-index-flat)
;; Will this work with elpy. Seems like elpy has its own (jedi:setup)
;; mechanism for handling this (add-virtual-envs-to-jedi-server)
;; (add-virtual-envs-to-jedi-server) (imalison:set-pytest-command)
(remove-hook 'completion-at-point-functions (remove-hook 'completion-at-point-functions
'python-completion-complete-at-point 'local) 'python-completion-complete-at-point 'local)
(add-to-list 'company-backends 'company-jedi)) (add-to-list 'company-backends 'company-jedi))