mirror of
https://github.com/vale981/emacs-ipython-notebook
synced 2025-03-06 01:21:38 -05:00
now that auto-complete is an official dependency, we can require it unconditionally
this allows us to get rid of the ugly eval on a macro
This commit is contained in:
parent
895777f5ea
commit
9cb9dd7345
4 changed files with 15 additions and 16 deletions
|
@ -26,7 +26,7 @@
|
|||
;;; Code:
|
||||
|
||||
(eval-when-compile (require 'cl))
|
||||
(require 'auto-complete nil t)
|
||||
(require 'auto-complete)
|
||||
|
||||
(require 'ein-core)
|
||||
(eval-when-compile (require 'ein-notebook)
|
||||
|
@ -81,18 +81,18 @@
|
|||
(defun ein:ac-direct-get-matches ()
|
||||
(ein:ac-chunk-candidates-from-list ein:ac-direct-matches))
|
||||
|
||||
(eval '(ac-define-source ein-direct
|
||||
'((candidates . ein:ac-direct-get-matches)
|
||||
(requires . 0)
|
||||
(prefix . ein:ac-chunk-beginning)
|
||||
(symbol . "s"))))
|
||||
(ac-define-source ein-direct
|
||||
'((candidates . ein:ac-direct-get-matches)
|
||||
(requires . 0)
|
||||
(prefix . ein:ac-chunk-beginning)
|
||||
(symbol . "s")))
|
||||
|
||||
(eval '(ac-define-source ein-async
|
||||
'((candidates . ein:ac-direct-get-matches)
|
||||
(requires . 0)
|
||||
(prefix . ein:ac-chunk-beginning)
|
||||
(init . ein:ac-request-in-background)
|
||||
(symbol . "c"))))
|
||||
(ac-define-source ein-async
|
||||
'((candidates . ein:ac-direct-get-matches)
|
||||
(requires . 0)
|
||||
(prefix . ein:ac-chunk-beginning)
|
||||
(init . ein:ac-request-in-background)
|
||||
(symbol . "c")))
|
||||
|
||||
(define-obsolete-function-alias 'ac-complete-ein-cached 'ac-complete-ein-async
|
||||
"0.2.1")
|
||||
|
|
|
@ -35,8 +35,7 @@
|
|||
(require 'ein-kernel)
|
||||
|
||||
(defun ein:completer-choose ()
|
||||
(when (require 'auto-complete nil t)
|
||||
(require 'ein-ac))
|
||||
(require 'ein-ac)
|
||||
(cond
|
||||
((and (or (eql ein:completion-backend 'ein:use-ac-backend)
|
||||
(eql ein:completion-backend 'ein:use-ac-jedi-backend))
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
;;; Code:
|
||||
|
||||
(require 'eieio)
|
||||
(eval-when-compile (require 'auto-complete nil t))
|
||||
(eval-when-compile (require 'auto-complete))
|
||||
|
||||
(require 'ein-notebook)
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
(eval-when-compile (require 'cl))
|
||||
(require 'ewoc)
|
||||
(eval-when-compile (require 'auto-complete nil t))
|
||||
(eval-when-compile (require 'auto-complete))
|
||||
|
||||
(require 'ein-core)
|
||||
(require 'ein-classes)
|
||||
|
|
Loading…
Add table
Reference in a new issue