Allow loading byte-compiled Geiser without make install

4 files changed, 33 insertions, 23 deletions

diff --git a/elisp/Makefile.am b/elisp/Makefile.am
index 11f2178..1f1ca76 100644
--- a/elisp/Makefile.am
+++ b/elisp/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = geiser-install.el.in
+EXTRA_DIST = geiser-install.el.in geiser-load.el.in
 
 dist_lisp_LISP = \
    geiser-autodoc.el \
@@ -27,9 +27,11 @@ dist_lisp_LISP = \
    geiser-version.el
 
 lisp_LISP = geiser-install.el
+noinst_LISP = geiser-load.el
 
-CLEANFILES = geiser-install.el
+CLEANFILES = geiser-install.el geiser-load.el
 
 geiser-install.el: $(srcdir)/geiser.el $(srcdir)/geiser-install.el.in
-	@sed -e "s|@SCHEME_DIR[@]|$(datarootdir)/geiser|"  $(srcdir)/geiser-install.el.in >$@
+	@sed -e "s|@SCHEME_DIR[@]|$(datarootdir)/geiser|" \
+             $(srcdir)/geiser-install.el.in >$@
 
diff --git a/elisp/geiser-load.el.in b/elisp/geiser-load.el.in
new file mode 100644
index 0000000..746558f
--- /dev/null
+++ b/elisp/geiser-load.el.in
@@ -0,0 +1,8 @@
+(setq geiser-elisp-dir (file-name-directory load-file-name))
+(add-to-list 'load-path geiser-elisp-dir)
+
+(require 'geiser)
+
+(setq geiser-scheme-dir "@abs_top_srcdir@/scheme")
+
+(provide 'geiser-load)
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!"))))
diff --git a/elisp/geiser.el b/elisp/geiser.el
index b241b78..8034803 100644
--- a/elisp/geiser.el
+++ b/elisp/geiser.el
@@ -26,40 +26,40 @@
 
 ;;; Autoloads:
 
-(autoload 'geiser-version "geiser-version.el" "Echo Geiser's version." t)
+(autoload 'geiser-version "geiser-version" "Echo Geiser's version." t)
 
-(autoload 'geiser-unload "geiser-reload.el" "Unload all Geiser code." t)
+(autoload 'geiser-unload "geiser-reload" "Unload all Geiser code." t)
 
-(autoload 'geiser-reload "geiser-reload.el" "Reload Geiser code." t)
+(autoload 'geiser-reload "geiser-reload" "Reload Geiser code." t)
 
-(autoload 'geiser "geiser-repl.el"
+(autoload 'geiser "geiser-repl"
   "Start a Geiser REPL, or switch to a running one." t)
 
-(autoload 'run-geiser "geiser-repl.el"
+(autoload 'run-geiser "geiser-repl"
   "Start a Geiser REPL." t)
 
-(autoload 'switch-to-geiser "geiser-guile.el"
+(autoload 'switch-to-geiser "geiser-guile"
   "Switch to a running one Geiser REPL." t)
 
-(autoload 'run-guile "geiser-guile.el"
+(autoload 'run-guile "geiser-guile"
   "Start a Geiser Guile REPL, or switch to a running one." t)
 
-(autoload 'switch-to-guile "geiser-guile.el"
+(autoload 'switch-to-guile "geiser-guile"
   "Start a Geiser Guile REPL, or switch to a running one." t)
 
-(autoload 'run-racket "geiser-racket.el"
+(autoload 'run-racket "geiser-racket"
   "Start a Geiser Racket REPL, or switch to a running one." t)
 
-(autoload 'switch-to-racket "geiser-guile.el"
+(autoload 'switch-to-racket "geiser-guile"
   "Start a Geiser Racket REPL, or switch to a running one." t)
 
-(autoload 'geiser-mode "geiser-mode.el"
+(autoload 'geiser-mode "geiser-mode"
   "Minor mode adding Geiser REPL interaction to Scheme buffers." t)
 
-(autoload 'turn-on-geiser-mode "geiser-mode.el"
+(autoload 'turn-on-geiser-mode "geiser-mode"
   "Enable Geiser's mode (useful in Scheme buffers)." t)
 
-(autoload 'turn-off-geiser-mode "geiser-mode.el"
+(autoload 'turn-off-geiser-mode "geiser-mode"
   "Disable Geiser's mode (useful in Scheme buffers)." t)
 
 (mapc (lambda (group)