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

elpy

Browse Source
This commit is contained in:
Ivan Malison 2015-08-02 15:36:44 -07:00
parent e6a414f537
commit 5d3e50f053
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1613,15 +1613,13 @@ window is active in the perspective."
(interactive) (interactive)
(message "%s" (get-virtual-envs))) (message "%s" (get-virtual-envs)))
(use-package jedi (use-package elpy
:commands (jedi:goto-definition jedi-mode) :ensure t
:commands elpy-enable
:config :config
(progn (progn
(setq jedi:complete-on-dot t) (unbind-key "M-*" elpy-mode-map)
(setq jedi:imenu-create-index-function 'jedi:create-flat-imenu-index)) (bind-key "M-," 'pop-tag-mark elpy-mode-map)))
:ensure t
:bind (("M-." . jedi:goto-definition)
("M-," . jedi:goto-definition-pop-marker)))
(use-package company-jedi (use-package company-jedi
:commands company-jedi :commands company-jedi
@ -1651,8 +1649,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)
(jedi:setup) (elpy-enable)
(add-virtual-envs-to-jedi-server) ;; Will this work with elpy. Seems like elpy has its own
;; mechanism for handling this
;; (add-virtual-envs-to-jedi-server)
(imalison:set-pytest-command) (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)