diff options
| author | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2009-05-14 13:07:54 +0200 |
|---|---|---|
| committer | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2009-05-14 13:07:54 +0200 |
| commit | 783ab50f4cba76b45fe1cacac66a153331aafb13 (patch) | |
| tree | cd81e0614a616114c76c1179dc73fc597010748d | |
| parent | 76441ec53587fbbfb7176eb280461f4bc2e1519b (diff) | |
| download | geiser-guile-783ab50f4cba76b45fe1cacac66a153331aafb13.tar.gz geiser-guile-783ab50f4cba76b45fe1cacac66a153331aafb13.tar.bz2 | |
Fixing the mess during initialization.
| -rw-r--r-- | elisp/geiser-guile.el | 6 | ||||
| -rw-r--r-- | elisp/geiser-impl.el | 7 | ||||
| -rw-r--r-- | elisp/geiser-plt.el | 6 | ||||
| -rw-r--r-- | elisp/geiser-syntax.el | 1 | ||||
| -rw-r--r-- | elisp/geiser.el | 8 |
5 files changed, 9 insertions, 19 deletions
diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el index bfdca31..f4362ca 100644 --- a/elisp/geiser-guile.el +++ b/elisp/geiser-guile.el @@ -24,7 +24,6 @@ ;;; Code: -(require 'geiser-impl) (require 'geiser-syntax) (require 'geiser-custom) (require 'geiser-base) @@ -126,10 +125,5 @@ If MODULE is provided, transform it to such a datum." (listp (geiser-guile-get-module))) -;;; Register this implementation: - -(geiser-impl--register 'guile) - - (provide 'geiser-guile) ;;; geiser-guile.el ends here diff --git a/elisp/geiser-impl.el b/elisp/geiser-impl.el index fe8ccd7..6bc4e79 100644 --- a/elisp/geiser-impl.el +++ b/elisp/geiser-impl.el @@ -71,9 +71,6 @@ (let ((impl (or impl geiser-impl--implementation))) (and impl (capitalize (format "%s" impl))))) -(defsubst geiser-impl--impl-feature (impl) - (intern (format "geiser-%s" impl))) - ;;; Installing Scheme implementations: @@ -226,9 +223,7 @@ implementation to be used by Geiser.")) ;;; Initialization: -(mapc (lambda (impl) - (require (geiser-impl--impl-feature impl) nil t)) - geiser-impl-installed-implementations) +(mapc 'geiser-impl--register geiser-impl-installed-implementations) (provide 'geiser-impl) diff --git a/elisp/geiser-plt.el b/elisp/geiser-plt.el index cfc0909..e0400ec 100644 --- a/elisp/geiser-plt.el +++ b/elisp/geiser-plt.el @@ -24,7 +24,6 @@ ;;; Code: -(require 'geiser-impl) (require 'geiser-eval) (require 'geiser-syntax) (require 'geiser-custom) @@ -168,10 +167,5 @@ This function uses `geiser-plt-init-file' if it exists." (with-syntax 1)) -;;; Register this implementation: - -(geiser-impl--register 'plt) - - (provide 'geiser-plt) ;;; geiser-plt.el ends here diff --git a/elisp/geiser-syntax.el b/elisp/geiser-syntax.el index a09c17e..ea57a95 100644 --- a/elisp/geiser-syntax.el +++ b/elisp/geiser-syntax.el @@ -24,6 +24,7 @@ ;;; Code: +(require 'geiser-popup) (require 'geiser-base) (require 'scheme) diff --git a/elisp/geiser.el b/elisp/geiser.el index d72eee7..952cfe5 100644 --- a/elisp/geiser.el +++ b/elisp/geiser.el @@ -97,9 +97,15 @@ (defun geiser-setup-implementations (impls) (setq geiser-impl-installed-implementations (or impls '(guile plt)))) +(defsubst geiser-impl--impl-feature (impl) + (intern (format "geiser-%s" impl))) + (defun geiser-setup (&rest impls) (geiser-setup-implementations impls) - (geiser-setup-scheme-mode)) + (geiser-setup-scheme-mode) + (mapc (lambda (impl) + (require (geiser-impl--impl-feature impl) nil t)) + geiser-impl-installed-implementations)) ;;; Reload: |