From 0238bdb00116c7fce43dd982ba69c1d6ef9ebc42 Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Thu, 19 Sep 2013 02:37:06 +0200
Subject: Paving the way to MELPA (and simpler ELPA generation)

Following the discussion in GitHub, i'm adding an alternative scheme
path to geiser.el as well as ##autoload cookies.  As a first benefit,
this simplifies a bit the elpa target, after playing a similar path
trick in bin/geiser-racket.sh.

Things should be almost ready for creating a MELPA recipe.
---
 elisp/geiser.el | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

(limited to 'elisp')

diff --git a/elisp/geiser.el b/elisp/geiser.el
index fbc34a6..44c696a 100644
--- a/elisp/geiser.el
+++ b/elisp/geiser.el
@@ -1,6 +1,6 @@
 ;;; geiser.el -- main geiser file
 
-;; Copyright (C) 2009, 2010, 2011, 2012 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2009, 2010, 2011, 2012, 2013 Jose Antonio Ortega Ruiz
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the Modified BSD License. You should
@@ -15,7 +15,11 @@
 (defconst geiser-elisp-dir (file-name-directory load-file-name)
   "Directory containing Geiser's Elisp files.")
 
-(defconst geiser-scheme-dir (expand-file-name "../scheme/" geiser-elisp-dir)
+(defconst geiser-scheme-dir
+  (let ((d (expand-file-name "./scheme/" geiser-elisp-dir)))
+    (if (file-directory-p d)
+        d
+      (expand-file-name "../scheme/" geiser-elisp-dir)))
   "Directory containing Geiser's Scheme files.")
 
 (when (not (member geiser-elisp-dir load-path))
@@ -24,50 +28,68 @@
 
 ;;; Autoloads:
 
+;;;###autoload
 (autoload 'geiser-version "geiser-version" "Echo Geiser's version." t)
 
+;;;###autoload
 (autoload 'geiser-unload "geiser-reload" "Unload all Geiser code." t)
 
+;;;###autoload
 (autoload 'geiser-reload "geiser-reload" "Reload Geiser code." t)
 
+;;;###autoload
 (autoload 'geiser "geiser-repl"
   "Start a Geiser REPL, or switch to a running one." t)
 
+;;;###autoload
 (autoload 'run-geiser "geiser-repl" "Start a Geiser REPL." t)
 
+;;;###autoload
 (autoload 'geiser-connect "geiser-repl"
   "Start a Geiser REPL connected to a remote server." t)
 
+;;;###autoload
 (autoload 'switch-to-geiser "geiser-repl"
   "Switch to a running one Geiser REPL." t)
 
+;;;###autoload
 (autoload 'run-guile "geiser-guile" "Start a Geiser Guile REPL." t)
 
+;;;###autoload
 (autoload 'switch-to-guile "geiser-guile"
   "Start a Geiser Guile REPL, or switch to a running one." t)
 
+;;;###autoload
 (autoload 'connect-to-guile "geiser-guile"
   "Connect to a remote Geiser Guile REPL." t)
 
+;;;###autoload
 (autoload 'run-racket "geiser-racket" "Start a Geiser Racket REPL." t)
 
+;;;###autoload
 (autoload 'run-gracket "geiser-racket" "Start a Geiser GRacket REPL." t)
 
+;;;###autoload
 (autoload 'switch-to-racket "geiser-racket"
   "Start a Geiser Racket REPL, or switch to a running one." t)
 
+;;;###autoload
 (autoload 'connect-to-racket "geiser-racket"
   "Connect to a remote Geiser Racket REPL." t)
 
+;;;###autoload
 (autoload 'geiser-mode "geiser-mode"
   "Minor mode adding Geiser REPL interaction to Scheme buffers." t)
 
+;;;###autoload
 (autoload 'turn-on-geiser-mode "geiser-mode"
   "Enable Geiser's mode (useful in Scheme buffers)." t)
 
+;;;###autoload
 (autoload 'turn-off-geiser-mode "geiser-mode"
   "Disable Geiser's mode (useful in Scheme buffers)." t)
 
+;;;###autoload
 (autoload 'geiser-mode--maybe-activate "geiser-mode")
 
 ;;;###autoload
-- 
cgit v1.2.3