Keeping the elisp compiler happy

Mainly by reordering definitions so that functions are not used before
defined.  There are a couple of places where the compiler and I
disagree (it complains withing eval-after-load), and a valid complain
about functions defined via geiser-popup--define that should be
addressed).

1 files changed, 14 insertions, 14 deletions

diff --git a/elisp/geiser-eval.el b/elisp/geiser-eval.el
index 28da110..29797e6 100644
--- a/elisp/geiser-eval.el
+++ b/elisp/geiser-eval.el
@@ -1,6 +1,6 @@
 ;;; geiser-eval.el -- sending scheme code for evaluation
 
-;; Copyright (C) 2009, 2010, 2011, 2012, 2013 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2009, 2010, 2011, 2012, 2013, 2015 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
@@ -69,16 +69,6 @@ module-exports, autodoc, callers, callees and generic-methods.")
 
 ;;; Code formatting:
 
-(defsubst geiser-eval--eval (code)
-  (geiser-eval--form 'eval
-                     (geiser-eval--module (nth 1 code))
-                     (geiser-eval--scheme-str (nth 0 code))))
-
-(defsubst geiser-eval--comp (code)
-  (geiser-eval--form 'compile
-                     (geiser-eval--module (nth 1 code))
-                     (geiser-eval--scheme-str (nth 0 code))))
-
 (defsubst geiser-eval--load-file (file)
   (geiser-eval--form 'load-file
                      (geiser-eval--scheme-str file)))
@@ -94,6 +84,16 @@ module-exports, autodoc, callers, callees and generic-methods.")
          ((or (eq code :repl) (eq code :f)) :f)
          (t (geiser-eval--get-module code)))))
 
+(defsubst geiser-eval--eval (code)
+  (geiser-eval--form 'eval
+                     (geiser-eval--module (nth 1 code))
+                     (geiser-eval--scheme-str (nth 0 code))))
+
+(defsubst geiser-eval--comp (code)
+  (geiser-eval--form 'compile
+                     (geiser-eval--module (nth 1 code))
+                     (geiser-eval--scheme-str (nth 0 code))))
+
 (defsubst geiser-eval--ge (proc args)
   (apply 'geiser-eval--form (cons proc
                                   (mapcar 'geiser-eval--scheme-str args))))
@@ -154,9 +154,6 @@ module-exports, autodoc, callers, callees and generic-methods.")
                                 buffer)
   geiser-eval--sync-retort)
 
-(defsubst geiser-eval--send/result (code &optional timeout buffer)
-  (geiser-eval--retort-result (geiser-eval--send/wait code timeout buffer)))
-
 
 ;;; Retort parsing:
 
@@ -167,6 +164,9 @@ module-exports, autodoc, callers, callees and generic-methods.")
   (let ((values (cdr (assoc 'result ret))))
     (car (geiser-syntax--read-from-string (car values)))))
 
+(defsubst geiser-eval--send/result (code &optional timeout buffer)
+  (geiser-eval--retort-result (geiser-eval--send/wait code timeout buffer)))
+
 (defun geiser-eval--retort-result-str (ret prefix)
   (let* ((prefix (or prefix "=> "))
          (nlprefix (concat "\n" prefix))