summaryrefslogtreecommitdiff
path: root/elisp/geiser-reload.el
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2010-09-06 07:26:54 +0200
committerJose Antonio Ortega Ruiz <jao@gnu.org>2010-09-06 07:26:54 +0200
commitc6acac244447cac2b4580658b40f3bde2425b8c4 (patch)
tree26ade244f3c36de04a5cebebc235b737de9481a4 /elisp/geiser-reload.el
parent1891a799d793ac980be066a617b5ef542f431b52 (diff)
downloadgeiser-guile-c6acac244447cac2b4580658b40f3bde2425b8c4.tar.gz
geiser-guile-c6acac244447cac2b4580658b40f3bde2425b8c4.tar.bz2
Allow loading byte-compiled Geiser without make install
Diffstat (limited to 'elisp/geiser-reload.el')
-rw-r--r--elisp/geiser-reload.el14
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!"))))