hiro/emacs-ipython-notebook
1
0
Fork 0
mirror of https://github.com/vale981/emacs-ipython-notebook synced 2025-03-06 09:31:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make ac-expand-on-... configurable in jedi-complete

Browse source 
Diff is big comparing to the actual change.  ein:jedi-complete
passes the value of ac-expand-on-auto-complete to the async
callback and it can be specified via EXPAND keyword argument.
This commit is contained in:
Takafumi Arakaki 2012-12-05 22:52:05 +01:00
parent 42508f6bc3
commit f52228656b
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lisp/ein-jedi.el
View file

@ -48,25 +48,27 @@
d))
;;;###autoload
(defun ein:jedi-complete ()
(defun* ein:jedi-complete (&key (expand ac-expand-on-auto-complete))
"Run completion using candidates calculated by EIN and Jedi."
(interactive)
(deferred:$
(deferred:parallel ; or `deferred:earlier' is better?
(jedi:complete-request)
(ein:jedi--completer-complete))
(deferred:nextc it
(lambda (replies)
(destructuring-bind
(_ ; ignore `jedi:complete-request' what returns.
((&key matched_text matches &allow-other-keys) ; :complete_reply
_)) ; ignore metadata
replies
(if matches
(ein:completer-finish-completing-ac
matched_text matches
ein:jedi-dot-complete-sources)
(auto-complete ein:jedi-dot-complete-sources)))))))
(lexical-let ((expand expand))
(deferred:$
(deferred:parallel ; or `deferred:earlier' is better?
(jedi:complete-request)
(ein:jedi--completer-complete))
(deferred:nextc it
(lambda (replies)
(destructuring-bind
(_ ; ignore `jedi:complete-request' what returns.
((&key matched_text matches &allow-other-keys) ; :complete_reply
_)) ; ignore metadata
replies
(let ((ac-expand-on-auto-complete expand))
(if matches
(ein:completer-finish-completing-ac
matched_text matches
ein:jedi-dot-complete-sources)
(auto-complete ein:jedi-dot-complete-sources)))))))))
;;;###autoload
(defun ein:jedi-dot-complete ()