From 397bb86ecd17794b220c6b6c81fe1b0f66c19ba6 Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Wed, 17 Jun 2009 00:05:34 +0200
Subject: Whitespace.

---
 elisp/geiser-doc.el | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'elisp/geiser-doc.el')

diff --git a/elisp/geiser-doc.el b/elisp/geiser-doc.el
index 8024239..bece09e 100644
--- a/elisp/geiser-doc.el
+++ b/elisp/geiser-doc.el
@@ -165,7 +165,8 @@
        (funcall geiser-doc--external-help-function symbol module)))
 
 (defun geiser-doc--get-docstring (symbol module)
-  (geiser-eval--send/result `(:eval ((:ge symbol-documentation) ',symbol) ,module)))
+  (geiser-eval--send/result
+   `(:eval ((:ge symbol-documentation) ',symbol) ,module)))
 
 (defun geiser-doc--get-module-exports (module)
   (geiser-eval--send/result `(:eval ((:ge module-exports) (:module ,module)))))
@@ -193,7 +194,8 @@
 With prefix argument, ask for symbol (with completion)."
   (interactive "P")
   (let ((symbol (or (and (not arg) (symbol-at-point))
-                    (geiser-completion--read-symbol "Symbol: " (symbol-at-point)))))
+                    (geiser-completion--read-symbol "Symbol: "
+                                                    (symbol-at-point)))))
     (when symbol (geiser-doc-symbol symbol))))
 
 
@@ -219,7 +221,8 @@ With prefix argument, ask for symbol (with completion)."
                                    impl))
         (goto-char (point-min))
         (setq geiser-doc--buffer-link
-              (geiser-doc--history-push (geiser-doc--make-link nil module impl))))
+              (geiser-doc--history-push
+               (geiser-doc--make-link nil module impl))))
       (geiser-doc--pop-to-buffer))))
 
 (defun geiser-doc-next (&optional forget-current)
-- 
cgit v1.2.3


From 2045e7b4f66685dc1beb1159900e91df3195cc99 Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Wed, 17 Jun 2009 00:53:36 +0200
Subject: Circular dependencies between elisp modules eliminated.

---
 elisp/geiser-doc.el  | 16 +++++-----------
 elisp/geiser-impl.el | 12 +++---------
 elisp/geiser.el      |  4 ++--
 3 files changed, 10 insertions(+), 22 deletions(-)

(limited to 'elisp/geiser-doc.el')

diff --git a/elisp/geiser-doc.el b/elisp/geiser-doc.el
index bece09e..adef4c6 100644
--- a/elisp/geiser-doc.el
+++ b/elisp/geiser-doc.el
@@ -24,6 +24,7 @@
 
 ;;; Code:
 
+(require 'geiser-impl)
 (require 'geiser-completion)
 (require 'geiser-eval)
 (require 'geiser-syntax)
@@ -157,13 +158,6 @@
 
 ;;; Commands:
 
-(make-variable-buffer-local
- (defvar geiser-doc--external-help-function nil))
-
-(defun geiser-doc--external-help (symbol module)
-  (and geiser-doc--external-help-function
-       (funcall geiser-doc--external-help-function symbol module)))
-
 (defun geiser-doc--get-docstring (symbol module)
   (geiser-eval--send/result
    `(:eval ((:ge symbol-documentation) ',symbol) ,module)))
@@ -172,10 +166,10 @@
   (geiser-eval--send/result `(:eval ((:ge module-exports) (:module ,module)))))
 
 (defun geiser-doc-symbol (symbol &optional module impl)
-  (let ((module (or module (geiser-eval--get-module))))
-    (unless (geiser-doc--external-help symbol module)
-      (let ((impl (or impl geiser-impl--implementation))
-            (ds (geiser-doc--get-docstring symbol module)))
+  (let ((module (or module (geiser-eval--get-module)))
+        (impl (or impl geiser-impl--implementation)))
+    (unless (geiser-impl--external-help impl symbol module)
+      (let ((ds (geiser-doc--get-docstring symbol module)))
         (if (or (not ds) (not (listp ds)))
             (message "No documentation available for '%s'" symbol)
           (geiser-doc--with-buffer
diff --git a/elisp/geiser-impl.el b/elisp/geiser-impl.el
index 38c34ee..b4c01c7 100644
--- a/elisp/geiser-impl.el
+++ b/elisp/geiser-impl.el
@@ -27,7 +27,6 @@
 
 (require 'geiser-eval)
 (require 'geiser-base)
-(require 'geiser-doc)
 (require 'geiser-completion)
 
 
@@ -124,10 +123,6 @@
 (defsubst geiser-impl--geiser-procedure-function (impl)
   (geiser-impl--sym impl "geiser-procedure"))
 
-(defsubst geiser-impl--external-help-function (impl)
-  (let ((f (geiser-impl--sym impl "external-help")))
-    (and (fboundp f) f)))
-
 (defsubst geiser-impl--symbol-begin (impl)
   (geiser-impl--sym impl "symbol-begin"))
 
@@ -136,8 +131,6 @@
         (geiser-impl--module-function impl))
   (setq geiser-eval--geiser-procedure-function
         (geiser-impl--geiser-procedure-function impl))
-  (setq geiser-doc--external-help-function
-        (geiser-impl--external-help-function impl))
   (setq geiser-completion--symbol-begin-function
         (geiser-impl--symbol-begin impl)))
 
@@ -150,8 +143,6 @@
          (geiser-impl--module-function imp))
         (geiser-eval--geiser-procedure-function
          (geiser-impl--geiser-procedure-function imp))
-        (geiser-doc--external-help-function
-         (geiser-impl--external-help-function imp))
         (geiser-completion--symbol-begin-function
          (geiser-impl--symbol-begin imp)))
     (funcall thunk)))
@@ -192,6 +183,9 @@
 (defsubst geiser-impl--startup (impl)
   (geiser-impl--call-if-bound impl "startup"))
 
+(defsubst geiser-impl--external-help (impl symbol module)
+  (geiser-impl--call-if-bound impl "external-help" symbol module))
+
 
 ;;; Access to implementation guessing function:
 
diff --git a/elisp/geiser.el b/elisp/geiser.el
index b12127c..926cb4f 100644
--- a/elisp/geiser.el
+++ b/elisp/geiser.el
@@ -114,10 +114,10 @@
   (quote '(
            geiser-mode
            geiser-repl
-           geiser-impl
-           geiser-doc
            geiser-xref
            geiser-edit
+           geiser-doc
+           geiser-impl
            geiser-completion
            geiser-autodoc
            geiser-compile
-- 
cgit v1.2.3


From 18db590dece0f88c3f2bd850a3158bb50605e2c6 Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Mon, 17 Aug 2009 16:23:45 +0200
Subject: Well, i said that it was better, not that it was perfect.

Autodoc buglets and support for displaying module variables too.
---
 elisp/geiser-autodoc.el      | 54 ++++++++++++++++++++++----------------------
 elisp/geiser-doc.el          |  5 +++-
 elisp/geiser-syntax.el       | 20 ++++++++--------
 scheme/guile/geiser/doc.scm  | 16 ++++++++-----
 scheme/plt/geiser/autodoc.ss |  6 ++---
 5 files changed, 54 insertions(+), 47 deletions(-)

(limited to 'elisp/geiser-doc.el')

diff --git a/elisp/geiser-autodoc.el b/elisp/geiser-autodoc.el
index 16ca9ac..1d876dd 100644
--- a/elisp/geiser-autodoc.el
+++ b/elisp/geiser-autodoc.el
@@ -79,8 +79,7 @@ when `geiser-autodoc-display-module-p' is on."
               (push f missing)))))
       (unless cached
         (setq geiser-autodoc--cached-signatures nil))
-      (if (not missing)
-          geiser-autodoc--cached-signatures
+      (if (not missing) geiser-autodoc--cached-signatures
         (let ((res (geiser-eval--send/result `(:eval ((:ge autodoc)
                                                       (quote ,missing)))
                                              500)))
@@ -111,33 +110,34 @@ when `geiser-autodoc-display-module-p' is on."
     (propertize str 'face 'geiser-font-lock-autodoc-procedure-name)))
 
 (defun geiser-autodoc--str (proc desc signature)
-  ;;  (message "composing %s with desc %s and signature %s" proc desc signature)
-  (let ((cpos 1)
-        (pos (second desc))
-        (prev (third desc))
-        (module (cdr (assoc 'module signature)))
-        (reqs (cdr (assoc 'required signature)))
-        (opts (cdr (assoc 'optional signature)))
-        (keys (cdr (assoc 'key signature))))
-    (save-current-buffer
-      (set-buffer (geiser-syntax--font-lock-buffer))
-      (erase-buffer)
-      (insert (format "(%s " (geiser-autodoc--proc-name proc module)))
-      (setq cpos
-            (geiser-autodoc--insert-args reqs cpos (and (not (zerop pos)) pos)))
-      (when opts
-        (insert " [")
-        (setq cpos (geiser-autodoc--insert-args opts cpos pos))
-        (when keys
-          (insert " [")
-          (geiser-autodoc--insert-args keys prev nil)
-          (insert "]"))
-        (insert "]"))
-      (insert ")")
-      (buffer-string))))
+  (let ((args (cdr (assoc 'args signature)))
+        (module (cdr (assoc 'module signature))))
+    (if (not args) (geiser-autodoc--proc-name proc module)
+      (let ((cpos 1)
+            (pos (or (second desc) 0))
+            (prev (third desc))
+            (reqs (cdr (assoc 'required args)))
+            (opts (cdr (assoc 'optional args)))
+            (keys (cdr (assoc 'key args))))
+        (save-current-buffer
+          (set-buffer (geiser-syntax--font-lock-buffer))
+          (erase-buffer)
+          (insert (format "(%s " (geiser-autodoc--proc-name proc module)))
+          (setq cpos
+                (geiser-autodoc--insert-args reqs cpos (and (not (zerop pos)) pos)))
+          (when opts
+            (insert " [")
+            (setq cpos (geiser-autodoc--insert-args opts cpos pos))
+            (when keys
+              (insert " [")
+              (geiser-autodoc--insert-args keys prev nil)
+              (insert "]"))
+            (insert "]"))
+          (insert ")")
+          (buffer-string))))))
 
 (defun geiser-autodoc--autodoc (path)
-  (let* ((funs (nreverse (mapcar 'car path)))
+  (let* ((funs (mapcar 'car path))
          (signs (geiser-autodoc--get-signatures funs)))
     (when signs
       (catch 'signature
diff --git a/elisp/geiser-doc.el b/elisp/geiser-doc.el
index adef4c6..61c50f5 100644
--- a/elisp/geiser-doc.el
+++ b/elisp/geiser-doc.el
@@ -26,6 +26,7 @@
 
 (require 'geiser-impl)
 (require 'geiser-completion)
+(require 'geiser-autodoc)
 (require 'geiser-eval)
 (require 'geiser-syntax)
 (require 'geiser-popup)
@@ -174,7 +175,9 @@
             (message "No documentation available for '%s'" symbol)
           (geiser-doc--with-buffer
             (erase-buffer)
-            (geiser-doc--insert-title (cdr (assoc 'signature ds)))
+            (geiser-doc--insert-title (geiser-autodoc--str (format "%s" symbol)
+                                                           nil
+                                                           (cdr (assoc 'signature ds))))
             (newline)
             (insert (or (cdr (assoc 'docstring ds)) ""))
             (goto-line (point-min))
diff --git a/elisp/geiser-syntax.el b/elisp/geiser-syntax.el
index 475a556..6cadf61 100644
--- a/elisp/geiser-syntax.el
+++ b/elisp/geiser-syntax.el
@@ -97,29 +97,31 @@
 (defun geiser-syntax--scan-sexp ()
   (let ((p (point))
         (n -1)
-        prev
-        head)
+        prev head)
     (ignore-errors
       (backward-up-list)
       (save-excursion
         (forward-char)
-        (skip-syntax-forward "^_w" p)
+        (skip-syntax-forward "^_w(" p)
         (when (setq head (symbol-at-point))
           (while (< (point) p)
             (setq n (1+ n))
             (setq prev (symbol-at-point))
             (forward-sexp))))
-      (if head (list head n prev) 'skip))))
+      (if head (list head n (and (> n 1) prev)) 'skip))))
 
 (defun geiser-syntax--scan-sexps ()
   (save-excursion
     (goto-char (or (nth 8 (syntax-ppss)) (point)))
     (let* ((sap (symbol-at-point))
-           (path (and sap `((,sap 0))))
-           s)
-      (while (setq s (geiser-syntax--scan-sexp))
-        (when (listp s) (push s path)))
-      path)))
+           (fst (and sap (geiser-syntax--scan-sexp)))
+           (path (and fst
+                      (cond ((not (listp fst)) `((,sap 0)))
+                             ((eq sap (car fst)) (list fst))
+                             (t (list fst (list sap 0)))))))
+      (while (setq fst (geiser-syntax--scan-sexp))
+        (when (listp fst) (push fst path)))
+      (nreverse path))))
 
 (defun geiser-syntax--complete-partial-sexp (buffer begin end)
   (geiser-syntax--with-buffer
diff --git a/scheme/guile/geiser/doc.scm b/scheme/guile/geiser/doc.scm
index d951f1c..bc4acd9 100644
--- a/scheme/guile/geiser/doc.scm
+++ b/scheme/guile/geiser/doc.scm
@@ -37,6 +37,8 @@
   #:use-module (oop goops)
   #:use-module (srfi srfi-1))
 
+(define *an-object* #t)
+
 (define (autodoc ids)
   (if (not (list? ids))
       '()
@@ -59,17 +61,19 @@
             ((list? args) args)
             (else (list args)))))
   `(,id
-    (required ,@(arglst 'required))
-    (optional ,@(arglst 'optional)
-              ,@(let ((rest (assq-ref args 'rest)))
-                  (if rest (list "...") '())))
-    (key ,@(arglst 'keyword))))
+    (args ,@(if (list? args)
+                `((required ,@(arglst 'required))
+                  (optional ,@(arglst 'optional)
+                            ,@(let ((rest (assq-ref args 'rest)))
+                                (if rest (list "...") '())))
+                  (key ,@(arglst 'keyword)))
+                '()))))
 
 (define (obj-args obj)
   (cond ((not obj) #f)
         ((or (procedure? obj) (program? obj)) (arguments obj))
         ((macro? obj) (or (obj-args (macro-transformer obj)) '((required ...))))
-        (else #f)))
+        (else 'variable)))
 
 (define (arguments proc)
   (cond
diff --git a/scheme/plt/geiser/autodoc.ss b/scheme/plt/geiser/autodoc.ss
index 2fe3a83..c43f8c9 100644
--- a/scheme/plt/geiser/autodoc.ss
+++ b/scheme/plt/geiser/autodoc.ss
@@ -46,7 +46,7 @@
      (and sgn
           `(,id
             (name . ,name)
-            ,@(format-signature sgn)
+            (args ,@(format-signature sgn))
             (module . ,(module-path-name->name path)))))))
 
 (define (format-signature sign)
@@ -64,9 +64,7 @@
 
 (define (find-signature path name local-name)
   (let ((path (if (path? path) (path->string path) path)))
-    (hash-ref! (hash-ref! signatures
-                          path
-                          (lambda () (parse-signatures path)))
+    (hash-ref! (hash-ref! signatures path (lambda () (parse-signatures path)))
                name
                (lambda () (infer-signature local-name)))))
 
-- 
cgit v1.2.3


From 11e52e18251f6c2c5a9c7c37bbd4a1787e84b282 Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Sun, 23 Aug 2009 02:59:09 +0200
Subject: Fixes for all byte-compilation warnings.

---
 elisp/geiser-autodoc.el    |  4 ++--
 elisp/geiser-base.el       | 20 ++--------------
 elisp/geiser-completion.el |  6 ++---
 elisp/geiser-doc.el        |  2 +-
 elisp/geiser-edit.el       |  5 +++-
 elisp/geiser-eval.el       | 38 +++++++++++++++---------------
 elisp/geiser-guile.el      |  3 +++
 elisp/geiser-impl.el       | 58 ++++++++++++++++++++++++----------------------
 elisp/geiser-log.el        |  2 ++
 9 files changed, 66 insertions(+), 72 deletions(-)

(limited to 'elisp/geiser-doc.el')

diff --git a/elisp/geiser-autodoc.el b/elisp/geiser-autodoc.el
index 1d876dd..a8a7a50 100644
--- a/elisp/geiser-autodoc.el
+++ b/elisp/geiser-autodoc.el
@@ -114,8 +114,8 @@ when `geiser-autodoc-display-module-p' is on."
         (module (cdr (assoc 'module signature))))
     (if (not args) (geiser-autodoc--proc-name proc module)
       (let ((cpos 1)
-            (pos (or (second desc) 0))
-            (prev (third desc))
+            (pos (or (cadr desc) 0))
+            (prev (caddr desc))
             (reqs (cdr (assoc 'required args)))
             (opts (cdr (assoc 'optional args)))
             (keys (cdr (assoc 'key args))))
diff --git a/elisp/geiser-base.el b/elisp/geiser-base.el
index 362930d..ba0067a 100644
--- a/elisp/geiser-base.el
+++ b/elisp/geiser-base.el
@@ -25,26 +25,10 @@
 
 ;;; Code:
 
-
-;;; Versioning:
-
-(defconst geiser-version-major 0
-  "Geiser's major version number.")
-(defconst geiser-version-minor 1
-  "Geiser's minor version number.")
-
-(defun geiser-version-string ()
-  "Geiser's version as a string."
-  (format "%s.%s" geiser-version-major geiser-version-minor))
-
-(defun geiser-version ()
-  "Echoes Geiser's version."
-  (interactive)
-  (message "Geiser %s" (geiser-version-string)))
-
-
 ;;; Emacs compatibility:
 
+(eval-when-compile (require 'cl))
+
 (eval-after-load "ring"
   '(when (not (fboundp 'ring-member))
      (defun ring-member (ring item)
diff --git a/elisp/geiser-completion.el b/elisp/geiser-completion.el
index 28aef12..cd03cae 100644
--- a/elisp/geiser-completion.el
+++ b/elisp/geiser-completion.el
@@ -29,7 +29,7 @@
 (require 'geiser-syntax)
 (require 'geiser-base)
 
-(eval-when-compile (require 'cl))
+(require 'cl)
 
 
 ;;; Completions window handling, heavily inspired in slime's:
@@ -84,7 +84,7 @@ terminates a current completion."
   (remove-hook 'pre-command-hook
                'geiser-completion--maybe-restore-window-cfg)
   (condition-case err
-      (cond ((find last-command-char "()\"'`,# \r\n:")
+      (cond ((find last-command-event "()\"'`,# \r\n:")
              (geiser-completion--restore-window-cfg))
             ((not (geiser-completion--window-active-p))
              (geiser-completion--forget-window-cfg))
@@ -146,7 +146,7 @@ terminates a current completion."
 
 ;;; Completion functionality:
 
-(defsubst geiser-completion--symbol-list (prefix)
+(defun geiser-completion--symbol-list (prefix)
   (delete-duplicates
    (append (mapcar (lambda (s) (format "%s" s)) (geiser-syntax--locals-around-point))
            (geiser-eval--send/result `(:eval ((:ge completions) ,prefix))))
diff --git a/elisp/geiser-doc.el b/elisp/geiser-doc.el
index 61c50f5..8e5c816 100644
--- a/elisp/geiser-doc.el
+++ b/elisp/geiser-doc.el
@@ -180,7 +180,7 @@
                                                            (cdr (assoc 'signature ds))))
             (newline)
             (insert (or (cdr (assoc 'docstring ds)) ""))
-            (goto-line (point-min))
+            (goto-char (point-min))
             (setq geiser-doc--buffer-link
                   (geiser-doc--history-push
                    (geiser-doc--make-link symbol module impl))))
diff --git a/elisp/geiser-edit.el b/elisp/geiser-edit.el
index 723e898..ad2c11e 100644
--- a/elisp/geiser-edit.el
+++ b/elisp/geiser-edit.el
@@ -106,8 +106,9 @@ or following links in error buffers.")
   (format "\\_<%s\\_>" (regexp-quote (format "%s" thing))))
 
 (defun geiser-edit--goto-line (symbol line)
+  (goto-char (point-min))
   (if (numberp line)
-      (goto-line line)
+      (forward-line (max 0 (1- line)))
     (goto-char (point-min))
     (when (or (re-search-forward (geiser-edit--def-re symbol) nil t)
               (re-search-forward (geiser-edit--def-re* symbol) nil t)
@@ -152,6 +153,8 @@ or following links in error buffers.")
 
 ;;; Commands:
 
+(defvar geiser-edit--symbol-history nil)
+
 (defun geiser-edit-symbol ()
   "Asks for a symbol to edit, with completion."
   (interactive)
diff --git a/elisp/geiser-eval.el b/elisp/geiser-eval.el
index 3e0d0d9..1c8cbfe 100644
--- a/elisp/geiser-eval.el
+++ b/elisp/geiser-eval.el
@@ -54,25 +54,6 @@ EVAL, COMPILE, LOAD-FILE and COMPILE-FILE should be supported."))
 
 ;;; Code formatting:
 
-(defun geiser-eval--scheme-str (code)
-  (cond ((null code) "'()")
-        ((eq code :f) "#f")
-        ((eq code :t) "#t")
-        ((listp code)
-         (cond ((eq (car code) :eval) (geiser-eval--eval (cdr code)))
-               ((eq (car code) :comp) (geiser-eval--comp (cdr code)))
-               ((eq (car code) :load-file)
-                (geiser-eval--load-file (cadr code)))
-               ((eq (car code) :comp-file)
-                (geiser-eval--comp-file (cadr code)))
-               ((eq (car code) :module) (geiser-eval--module (cadr code)))
-               ((eq (car code) :ge) (geiser-eval--ge (cadr code)))
-               ((eq (car code) :scm) (cadr code))
-               (t (concat "("
-                          (mapconcat 'geiser-eval--scheme-str code " ") ")"))))
-        ((symbolp code) (format "%s" code))
-        (t (format "%S" code))))
-
 (defsubst geiser-eval--eval (code)
   (geiser-eval--scheme-str
    `(,(geiser-eval--form 'eval) (quote ,(nth 0 code))
@@ -99,6 +80,25 @@ EVAL, COMPILE, LOAD-FILE and COMPILE-FILE should be supported."))
 (defsubst geiser-eval--ge (proc)
   (geiser-eval--scheme-str (geiser-eval--form proc)))
 
+(defun geiser-eval--scheme-str (code)
+  (cond ((null code) "'()")
+        ((eq code :f) "#f")
+        ((eq code :t) "#t")
+        ((listp code)
+         (cond ((eq (car code) :eval) (geiser-eval--eval (cdr code)))
+               ((eq (car code) :comp) (geiser-eval--comp (cdr code)))
+               ((eq (car code) :load-file)
+                (geiser-eval--load-file (cadr code)))
+               ((eq (car code) :comp-file)
+                (geiser-eval--comp-file (cadr code)))
+               ((eq (car code) :module) (geiser-eval--module (cadr code)))
+               ((eq (car code) :ge) (geiser-eval--ge (cadr code)))
+               ((eq (car code) :scm) (cadr code))
+               (t (concat "("
+                          (mapconcat 'geiser-eval--scheme-str code " ") ")"))))
+        ((symbolp code) (format "%s" code))
+        (t (format "%S" code))))
+
 
 ;;; Code sending:
 
diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el
index ed2a555..ed14e87 100644
--- a/elisp/geiser-guile.el
+++ b/elisp/geiser-guile.el
@@ -27,6 +27,9 @@
 (require 'geiser-syntax)
 (require 'geiser-custom)
 (require 'geiser-base)
+(require 'geiser-eval)
+(require 'geiser-edit)
+(require 'geiser)
 
 
 ;;; Customization:
diff --git a/elisp/geiser-impl.el b/elisp/geiser-impl.el
index 32acade..840d0c1 100644
--- a/elisp/geiser-impl.el
+++ b/elisp/geiser-impl.el
@@ -58,11 +58,40 @@ determine its scheme flavour."
                        symbol))
   :group 'geiser-impl)
 
+
+;;; Auxiliary functions:
+(defsubst geiser-impl--sym (imp name)
+  (intern (format "geiser-%s-%s" imp name)))
+
+(defsubst geiser-impl--boundp (imp name)
+  (boundp (geiser-impl--sym imp name)))
+
+(defsubst geiser-impl--fboundp (imp name)
+  (fboundp (geiser-impl--sym imp name)))
+
+(defsubst geiser-impl--impl-feature (impl)
+  (intern (format "geiser-%s" impl)))
+
+(defun geiser-impl--value (imp name &optional fun)
+  (let ((sym (geiser-impl--sym imp name)))
+    (unless (or (and (not fun) (boundp sym))
+                (and fun (fboundp sym)))
+      (error "Unbound %s '%s' in Geiser Scheme implementation %s"
+             (if fun "function" "variable") sym imp))
+    (if fun (symbol-function sym) (symbol-value sym))))
+
+(defsubst geiser-impl--call-if-bound (imp name &rest args)
+  (when (geiser-impl--fboundp imp name)
+    (apply (geiser-impl--value imp name t) args)))
+
 
 ;;; Registering implementations:
 
 (defvar geiser-impl--impls nil)
 
+(make-variable-buffer-local
+ (defvar geiser-impl--implementation nil))
+
 (defun geiser-impl--register (impl)
   (when (and (not (memq impl geiser-impl--impls))
              (require (geiser-impl--impl-feature impl) nil t))
@@ -91,9 +120,6 @@ determine its scheme flavour."
 
 ;;; Installing Scheme implementations:
 
-(make-variable-buffer-local
- (defvar geiser-impl--implementation nil))
-
 (defvar geiser-impl--impl-prompt-history nil)
 
 (defun geiser-impl--read-impl (&optional prompt impls non-req)
@@ -114,30 +140,6 @@ determine its scheme flavour."
     (geiser-impl--install-vars impl)
     (geiser-impl--register impl)))
 
-(defsubst geiser-impl--sym (imp name)
-  (intern (format "geiser-%s-%s" imp name)))
-
-(defsubst geiser-impl--boundp (imp name)
-  (boundp (geiser-impl--sym imp name)))
-
-(defsubst geiser-impl--fboundp (imp name)
-  (fboundp (geiser-impl--sym imp name)))
-
-(defsubst geiser-impl--impl-feature (impl)
-  (intern (format "geiser-%s" impl)))
-
-(defun geiser-impl--value (imp name &optional fun)
-  (let ((sym (geiser-impl--sym imp name)))
-    (unless (or (and (not fun) (boundp sym))
-                (and fun (fboundp sym)))
-      (error "Unbound %s '%s' in Geiser Scheme implementation %s"
-             (if fun "function" "variable") sym imp))
-    (if fun (symbol-function sym) (symbol-value sym))))
-
-(defsubst geiser-impl--call-if-bound (imp name &rest args)
-  (when (geiser-impl--fboundp imp name)
-    (apply (geiser-impl--value imp name t) args)))
-
 (defsubst geiser-impl--module-function (impl)
   (geiser-impl--sym impl "get-module"))
 
@@ -259,7 +261,7 @@ implementation to be used by Geiser."))
   (let* ((current geiser-impl-installed-implementations)
          (impl (geiser-impl--read-impl "Forget implementation: " current)))
     (geiser-impl--unregister impl)
-    (when (and (impl current)
+    (when (and impl
                (y-or-n-p "Forget permanently using customize? "))
       (customize-save-variable
        'geiser-impl-installed-implementations (remove impl current)))))
diff --git a/elisp/geiser-log.el b/elisp/geiser-log.el
index 68e0fae..27a485a 100644
--- a/elisp/geiser-log.el
+++ b/elisp/geiser-log.el
@@ -28,6 +28,8 @@
 (require 'geiser-popup)
 (require 'geiser-base)
 
+(require 'comint)
+
 
 ;;; Customization:
 
-- 
cgit v1.2.3


From 98e199daf7b1a56179b670c192c7d244fcb2b323 Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Tue, 25 Aug 2009 15:30:51 +0200
Subject: Slightly better autodoc caching (probably needs an overhaul, though).

---
 elisp/geiser-autodoc.el | 33 ++++++++++++++++++---------------
 elisp/geiser-company.el |  8 ++++----
 elisp/geiser-doc.el     |  3 +--
 3 files changed, 23 insertions(+), 21 deletions(-)

(limited to 'elisp/geiser-doc.el')

diff --git a/elisp/geiser-autodoc.el b/elisp/geiser-autodoc.el
index 5aa6691..c2746a0 100644
--- a/elisp/geiser-autodoc.el
+++ b/elisp/geiser-autodoc.el
@@ -68,7 +68,7 @@ when `geiser-autodoc-display-module-p' is on."
 (make-variable-buffer-local
  (defvar geiser-autodoc--cached-signatures nil))
 
-(defun geiser-autodoc--get-signatures (funs)
+(defun geiser-autodoc--get-signatures (funs &optional keep-cached)
   (when funs
     (let ((missing) (cached))
       (if (not geiser-autodoc--cached-signatures)
@@ -77,14 +77,16 @@ when `geiser-autodoc-display-module-p' is on."
           (let ((cf (assq f geiser-autodoc--cached-signatures)))
             (if cf (push cf cached)
               (push f missing)))))
-      (unless cached
+      (unless (or cached keep-cached)
         (setq geiser-autodoc--cached-signatures nil))
-      (if (not missing) geiser-autodoc--cached-signatures
+      (when missing
         (let ((res (geiser-eval--send/result `(:eval ((:ge autodoc)
                                                       (quote ,missing)))
                                              500)))
           (when res
-            (setq geiser-autodoc--cached-signatures (append cached res))))))))
+            (setq geiser-autodoc--cached-signatures
+                  (append res (if keep-cached geiser-autodoc--cached-signatures cached))))))
+      geiser-autodoc--cached-signatures)))
 
 (defun geiser-autodoc--insert-args (args current &optional pos)
   (dolist (a args)
@@ -109,8 +111,9 @@ when `geiser-autodoc-display-module-p' is on."
                proc)))
     (propertize str 'face 'geiser-font-lock-autodoc-procedure-name)))
 
-(defun geiser-autodoc--str (proc desc signature)
-  (let ((args (cdr (assoc 'args signature)))
+(defun geiser-autodoc--str (desc signature)
+  (let ((proc (car desc))
+        (args (cdr (assoc 'args signature)))
         (module (cdr (assoc 'module signature))))
     (if (not args) (geiser-autodoc--proc-name proc module)
       (let ((cpos 1)
@@ -140,15 +143,15 @@ when `geiser-autodoc-display-module-p' is on."
           (insert ")")
           (buffer-string))))))
 
-(defun geiser-autodoc--autodoc (path)
-  (let* ((funs (mapcar 'car path))
-         (signs (geiser-autodoc--get-signatures funs)))
-    (when signs
-      (catch 'signature
-        (dolist (f funs)
-          (let ((signature (cdr (assq f signs))))
-            (when signature
-              (throw 'signature (geiser-autodoc--str f (assq f path) signature)))))))))
+(defun geiser-autodoc--autodoc (path &optional keep-cached)
+  (let ((signs (geiser-autodoc--get-signatures (mapcar 'car path) keep-cached))
+        (p (car path))
+        (s))
+    (while (and path (not s))
+      (unless (setq s (cdr (assq (car p) signs)))
+        (setq p (car path))
+        (setq path (cdr path))))
+    (when s (geiser-autodoc--str p s))))
 
 
 ;;; Autodoc function:
diff --git a/elisp/geiser-company.el b/elisp/geiser-company.el
index 8ae8969..ef4ce38 100644
--- a/elisp/geiser-company.el
+++ b/elisp/geiser-company.el
@@ -38,7 +38,7 @@
   (ignore-errors
     (if module
 	(format "%s [module]" id)
-      (geiser-autodoc--autodoc (list (list (intern id) 0))))))
+      (geiser-autodoc--autodoc (list (list (intern id) 0)) t))))
 
 (defsubst geiser-company--doc-buffer (id module)
   nil)
@@ -61,11 +61,11 @@
 
 (defun geiser-company--setup (enable)
   (setq geiser-company--enabled-flag enable)
+  (when (boundp 'company-lighter)
+    (setq company-lighter "/C"))
   (when (fboundp 'company-mode)
     (company-mode nil)
-    (when enable (company-mode enable)))
-  (when (boundp 'company-lighter)
-    (setq company-lighter "/C")))
+    (when enable (company-mode enable))))
 
 (defun geiser-company--inhibit-autodoc (ignored)
   (setq geiser-autodoc--inhibit-flag t))
diff --git a/elisp/geiser-doc.el b/elisp/geiser-doc.el
index 8e5c816..29f0de2 100644
--- a/elisp/geiser-doc.el
+++ b/elisp/geiser-doc.el
@@ -175,8 +175,7 @@
             (message "No documentation available for '%s'" symbol)
           (geiser-doc--with-buffer
             (erase-buffer)
-            (geiser-doc--insert-title (geiser-autodoc--str (format "%s" symbol)
-                                                           nil
+            (geiser-doc--insert-title (geiser-autodoc--str (list (format "%s" symbol) 0)
                                                            (cdr (assoc 'signature ds))))
             (newline)
             (insert (or (cdr (assoc 'docstring ds)) ""))
-- 
cgit v1.2.3