diff options
| author | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2010-09-06 07:26:54 +0200 |
|---|---|---|
| committer | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2010-09-06 07:26:54 +0200 |
| commit | cba9e23c6753e84c7633c65f9adda95d25eb4cd0 (patch) | |
| tree | 1444c158601a0aa3f399db78619f96a3fbec9478 /elisp/geiser-reload.el | |
| parent | 894abe5b8a5bd0a500fadfd5ec89e9b8fde76b8f (diff) | |
| download | geiser-cba9e23c6753e84c7633c65f9adda95d25eb4cd0.tar.gz geiser-cba9e23c6753e84c7633c65f9adda95d25eb4cd0.tar.bz2 | |
Allow loading byte-compiled Geiser without make install
Diffstat (limited to 'elisp/geiser-reload.el')
| -rw-r--r-- | elisp/geiser-reload.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/elisp/geiser-reload.el b/elisp/geiser-reload.el index 5602cd1..a5c0125 100644 --- a/elisp/geiser-reload.el +++ b/elisp/geiser-reload.el @@ -16,6 +16,8 @@ (require 'geiser-custom) (require 'geiser-base) (require 'geiser) +(require 'geiser-load nil t) +(require 'geiser-install nil t) ;;; Reload: @@ -24,8 +26,8 @@ (quote '( geiser-mode geiser-repl - geiser-xref geiser-doc + geiser-xref geiser-compile geiser-debug geiser-company @@ -35,15 +37,15 @@ geiser-eval geiser-connection geiser-syntax - geiser-log geiser-menu geiser-impl geiser-custom - geiser-base + geiser-log geiser-popup + geiser-base + geiser-version geiser-install geiser - geiser-version ))) (defun geiser-unload () @@ -66,8 +68,7 @@ loaded again." (unless (or (file-exists-p (expand-file-name "geiser-reload.el" dir)) (file-exists-p (expand-file-name "geiser-reload.elc" dir))) (error "%s does not contain Geiser!" dir)) - (let ((installed (featurep 'geiser-install)) - (memo (geiser-custom--memoized-state)) + (let ((memo (geiser-custom--memoized-state)) (repls (geiser-repl--repl-list)) (buffers (geiser-mode--buffers))) (geiser-unload) @@ -75,7 +76,6 @@ loaded again." (add-to-list 'load-path dir) (mapc (lambda (x) (set (car x) (cdr x))) memo) (require 'geiser-reload) - (when installed (require 'geiser-install nil t)) (geiser-repl--restore repls) (geiser-mode--restore buffers) (message "Geiser reloaded!")))) |