From e9b6d59467d736d89588c7575d9ff9f4c921c34a Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Wed, 17 Jun 2009 03:14:07 +0200
Subject: Auxiliary functions to insert error links.

---
 elisp/geiser-edit.el | 39 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

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

diff --git a/elisp/geiser-edit.el b/elisp/geiser-edit.el
index 986099e..62b8a53 100644
--- a/elisp/geiser-edit.el
+++ b/elisp/geiser-edit.el
@@ -44,7 +44,11 @@
 
 (geiser-edit--define-custom-visit
  geiser-edit-symbol-method geiser-mode
- "How the new buffer is opened when invoking \\[geiser-edit-symbol-at-point].")
+ "How the new buffer is opened when invoking \\[geiser-edit-symbol-at-point]
+or following links in error buffers.")
+
+(geiser-custom--defface error-link
+  'link geiser-debug "links in error buffers")
 
 
 ;;; Auxiliar functions:
@@ -63,6 +67,12 @@
 (defsubst geiser-edit--location-line (loc)
   (cdr (assoc 'line loc)))
 
+(defsubst geiser-edit--location-column (loc)
+  (cdr (assoc 'column loc)))
+
+(defsubst geiser-edit--make-location (name file line column)
+  `((name . ,name) (file . ,file) (line . ,line) (column . ,column)))
+
 (defconst geiser-edit--def-re
   (regexp-opt '("define"
                 "defmacro"
@@ -103,15 +113,38 @@
 (defun geiser-edit--try-edit-location (symbol loc &optional method)
   (let ((symbol (or (geiser-edit--location-name loc) symbol))
         (file (geiser-edit--location-file loc))
-        (line (geiser-edit--location-line loc)))
+        (line (geiser-edit--location-line loc))
+        (col (geiser-edit--location-column loc)))
     (unless file (error "Couldn't find edit location for '%s'" symbol))
     (unless (file-readable-p file) (error "Couldn't open '%s' for read" file))
     (geiser-edit--visit-file file (or method geiser-edit-symbol-method))
-    (geiser-edit--goto-line symbol line)))
+    (geiser-edit--goto-line symbol line)
+    (when col
+      (beginning-of-line)
+      (forward-char col))))
 
 (defsubst geiser-edit--try-edit (symbol ret)
   (geiser-edit--try-edit-location symbol (geiser-eval--retort-result ret)))
 
+
+;;; Links
+
+(define-button-type 'geiser-edit--button
+  'action 'geiser-edit--button-action
+  'face 'geiser-font-lock-error-link
+  'follow-link t)
+
+(defun geiser-edit--button-action (button)
+  (let ((loc (button-get button 'geiser-location)))
+    (when loc (geiser-edit--try-edit-location nil loc))))
+
+(defun geiser-edit--make-link (beg end file line col)
+  (make-button beg end
+               :type 'geiser-edit--button
+               'geiser-location
+               (geiser-edit--make-location 'error file line col)
+               'help-echo "Go to error location"))
+
 
 ;;; Commands:
 
-- 
cgit v1.2.3


From e01166f7d2f3551596a04474a76f4811fc841edc Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Mon, 29 Jun 2009 00:08:44 +0200
Subject: Safer handling of file line and columns in emacs.

---
 elisp/geiser-edit.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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

diff --git a/elisp/geiser-edit.el b/elisp/geiser-edit.el
index 62b8a53..723e898 100644
--- a/elisp/geiser-edit.el
+++ b/elisp/geiser-edit.el
@@ -64,11 +64,15 @@ or following links in error buffers.")
 (defsubst geiser-edit--location-file (loc)
   (cdr (assoc 'file loc)))
 
+(defsubst geiser-edit--to-number (x)
+  (cond ((numberp x) x)
+        ((stringp x) (string-to-number x))))
+
 (defsubst geiser-edit--location-line (loc)
-  (cdr (assoc 'line loc)))
+  (geiser-edit--to-number (cdr (assoc 'line loc))))
 
 (defsubst geiser-edit--location-column (loc)
-  (cdr (assoc 'column loc)))
+  (geiser-edit--to-number (cdr (assoc 'column loc))))
 
 (defsubst geiser-edit--make-location (name file line column)
   `((name . ,name) (file . ,file) (line . ,line) (column . ,column)))
-- 
cgit v1.2.3


From 8ec4b1b63c9e4976988988b0f534bcec77583c79 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-impl.el       | 58 ++++++++++++++++++++++++----------------------
 elisp/geiser-log.el        |  2 ++
 8 files changed, 63 insertions(+), 72 deletions(-)

(limited to 'elisp/geiser-edit.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-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 91841a63fb0cf3c8a0a6ed1e9086b72097cd44e4 Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Tue, 25 Aug 2009 01:58:55 +0200
Subject: Now this is cool: support for company mode.

---
 README                     |  11 +++++
 elisp/Makefile.am          |   1 +
 elisp/geiser-autodoc.el    |   6 ++-
 elisp/geiser-company.el    | 111 +++++++++++++++++++++++++++++++++++++++++++++
 elisp/geiser-completion.el |   8 ++--
 elisp/geiser-edit.el       |  11 ++---
 elisp/geiser-mode.el       |   7 +++
 elisp/geiser-reload.el     |   1 +
 elisp/geiser-repl.el       |   7 +++
 9 files changed, 153 insertions(+), 10 deletions(-)
 create mode 100644 elisp/geiser-company.el

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

diff --git a/README b/README
index 537f291..8870006 100644
--- a/README
+++ b/README
@@ -81,6 +81,17 @@
 
   To start a REPL, M-x geiser.
 
+*** Completion with company-mode
+    Geiser offers identifier and module name completion, bound to
+    M-TAB and M-` respectively. Only names visible in the current
+    module are offered.
+
+    While that is cool and all, things are even better: if you have
+    [[http://nschum.de/src/emacs/company-mode/][company-mode]] installed, Geiser's completion will use it. Just
+    require company-mode and, from then on, any new scheme buffer or
+    REPL will use it. If you didn't know about Nikolaj Schumacher's
+    awesome mode, check [[http://www.screentoaster.com/watch/stU0lSRERIR1pYRFVdXVlRVFFV/company_mode_for_gnu_emacs][this screencast]].
+
 * Quick key reference
 
 *** In Scheme buffers:
diff --git a/elisp/Makefile.am b/elisp/Makefile.am
index a6ff248..9f93e64 100644
--- a/elisp/Makefile.am
+++ b/elisp/Makefile.am
@@ -3,6 +3,7 @@ EXTRA_DIST = geiser-install.el.in
 dist_lisp_LISP = \
    geiser-autodoc.el \
    geiser-base.el \
+   geiser-company.el \
    geiser-compile.el \
    geiser-completion.el	\
    geiser-connection.el	\
diff --git a/elisp/geiser-autodoc.el b/elisp/geiser-autodoc.el
index 26abd8d..5aa6691 100644
--- a/elisp/geiser-autodoc.el
+++ b/elisp/geiser-autodoc.el
@@ -153,9 +153,13 @@ when `geiser-autodoc-display-module-p' is on."
 
 ;;; Autodoc function:
 
+(make-variable-buffer-local
+ (defvar geiser-autodoc--inhibit-flag nil))
+
 (defun geiser-autodoc--eldoc-function ()
   (condition-case e
-      (geiser-autodoc--autodoc (geiser-syntax--scan-sexps))
+      (and (not geiser-autodoc--inhibit-flag)
+           (geiser-autodoc--autodoc (geiser-syntax--scan-sexps)))
     (error (format "Autodoc not available (%s)" (error-message-string e)))))
 
 
diff --git a/elisp/geiser-company.el b/elisp/geiser-company.el
new file mode 100644
index 0000000..8ae8969
--- /dev/null
+++ b/elisp/geiser-company.el
@@ -0,0 +1,111 @@
+;; geiser-company.el -- integration with company-mode
+
+;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
+
+;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
+;; Start date: Mon Aug 24, 2009 12:44
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'geiser-autodoc)
+(require 'geiser-completion)
+(require 'geiser-edit)
+(require 'geiser-base)
+
+
+;;; Helpers:
+
+(make-variable-buffer-local
+ (defvar geiser-company--enabled-flag nil))
+
+(defsubst geiser-company--candidates (prefix module)
+  (car (geiser-completion--complete prefix module)))
+
+(defsubst geiser-company--doc (id module)
+  (ignore-errors
+    (if module
+	(format "%s [module]" id)
+      (geiser-autodoc--autodoc (list (list (intern id) 0))))))
+
+(defsubst geiser-company--doc-buffer (id module)
+  nil)
+
+(defun geiser-company--location (id module)
+  (ignore-errors
+    (let ((id (intern id)))
+      (save-current-buffer
+	(if module (geiser-edit-module id) (geiser-edit-symbol id))
+	(cons (current-buffer) (point))))))
+
+(defsubst geiser-company--prefix-at-point (module)
+  (and geiser-company--enabled-flag
+       (looking-at-p "\\_>")
+       (not (nth 8 (syntax-ppss)))
+       (geiser-completion--prefix module)))
+
+
+;;; Activation
+
+(defun geiser-company--setup (enable)
+  (setq geiser-company--enabled-flag enable)
+  (when (fboundp 'company-mode)
+    (company-mode nil)
+    (when enable (company-mode enable)))
+  (when (boundp 'company-lighter)
+    (setq company-lighter "/C")))
+
+(defun geiser-company--inhibit-autodoc (ignored)
+  (setq geiser-autodoc--inhibit-flag t))
+
+(defun geiser-company--restore-autodoc (&optional ignored)
+  (setq geiser-autodoc--inhibit-flag nil))
+
+
+;;; Backends:
+(defmacro geiser-company--make-backend (name mod)
+  `(defun ,name (command &optional arg &rest ignored)
+     "A `company-mode' completion back-end for `geiser-mode'."
+     (interactive (list 'interactive))
+     (case command
+       ('interactive (company-begin-backend ',name))
+       ('prefix (geiser-company--prefix-at-point ,mod))
+       ('candidates (geiser-company--candidates arg ,mod))
+       ('meta (geiser-company--doc arg ,mod))
+       ('doc-buffer (geiser-company--doc-buffer arg ,mod))
+       ('location (geiser-company--location arg ,mod))
+       ('sorted t))))
+
+(defvar geiser-company--backend '(company-geiser-ids company-geiser-modules))
+
+(eval-after-load "company"
+  '(progn
+     (geiser-company--make-backend company-geiser-ids nil)
+     (geiser-company--make-backend company-geiser-modules t)
+     (add-to-list 'company-backends geiser-company--backend)
+     (add-hook 'company-completion-finished-hook 'geiser-company--restore-autodoc)
+     (add-hook 'company-completion-cancelled-hook 'geiser-company--restore-autodoc)
+     (add-hook 'company-completion-started-hook 'geiser-company--inhibit-autodoc)))
+
+
+;;; Reload support:
+
+(defun geiser-company-unload-function ()
+  (when (boundp 'company-backends)
+    (setq company-backends (remove geiser-company--backend company-backends))))
+
+
+(provide 'geiser-company)
+;;; geiser-company.el ends here
diff --git a/elisp/geiser-completion.el b/elisp/geiser-completion.el
index cd03cae..e3bd74b 100644
--- a/elisp/geiser-completion.el
+++ b/elisp/geiser-completion.el
@@ -204,14 +204,16 @@ terminates a current completion."
            (funcall geiser-completion--symbol-begin-function module))
       (save-excursion (skip-syntax-backward "^-()>") (point))))
 
+(defsubst geiser-completion--prefix (module)
+  (buffer-substring-no-properties (point)
+                                  (geiser-completion--symbol-begin module)))
+
 (defun geiser-completion--complete-symbol (&optional arg)
   "Complete the symbol at point.
 Perform completion similar to Emacs' complete-symbol.
 With prefix, complete module name."
   (interactive "P")
-  (let* ((end (point))
-         (beg (geiser-completion--symbol-begin arg))
-         (prefix (buffer-substring-no-properties beg end))
+  (let* ((prefix (geiser-completion--prefix arg))
          (result (geiser-completion--complete prefix arg))
          (completions (car result))
          (partial (cdr result)))
diff --git a/elisp/geiser-edit.el b/elisp/geiser-edit.el
index ad2c11e..418b6e3 100644
--- a/elisp/geiser-edit.el
+++ b/elisp/geiser-edit.el
@@ -155,13 +155,12 @@ or following links in error buffers.")
 
 (defvar geiser-edit--symbol-history nil)
 
-(defun geiser-edit-symbol ()
+(defun geiser-edit-symbol (symbol)
   "Asks for a symbol to edit, with completion."
-  (interactive)
-  (let* ((symbol (geiser-completion--read-symbol "Edit symbol: "
-                                                nil
-                                                geiser-edit--symbol-history))
-         (cmd `(:eval ((:ge symbol-location) ',symbol))))
+  (interactive (list (geiser-completion--read-symbol "Edit symbol: "
+                                                     nil
+                                                     geiser-edit--symbol-history)))
+  (let ((cmd `(:eval ((:ge symbol-location) ',symbol))))
     (geiser-edit--try-edit symbol (geiser-eval--send/wait cmd))))
 
 (defun geiser-edit-symbol-at-point (&optional arg)
diff --git a/elisp/geiser-mode.el b/elisp/geiser-mode.el
index cc5a00f..fa686ec 100644
--- a/elisp/geiser-mode.el
+++ b/elisp/geiser-mode.el
@@ -28,6 +28,7 @@
 (require 'geiser-doc)
 (require 'geiser-compile)
 (require 'geiser-completion)
+(require 'geiser-company)
 (require 'geiser-xref)
 (require 'geiser-edit)
 (require 'geiser-autodoc)
@@ -52,6 +53,11 @@
   :group 'geiser-autodoc
   :type 'boolean)
 
+(defcustom geiser-mode-company-p t
+  "Whether to use company-mode for completion, if available."
+  :group 'geiser-mode
+  :type 'boolean)
+
 (defcustom geiser-mode-smart-tab-p nil
   "Whether `geiser-smart-tab-mode' gets enabled by default in Scheme buffers."
   :group 'geiser-mode
@@ -188,6 +194,7 @@ interacting with the Geiser REPL is at your disposal.
   (when geiser-mode (geiser-impl--set-buffer-implementation))
   (setq geiser-autodoc-mode-string "/A")
   (setq geiser-smart-tab-mode-string "/T")
+  (geiser-company--setup (and geiser-mode geiser-mode-company-p))
   (when geiser-mode-autodoc-p (geiser-autodoc-mode geiser-mode))
   (when geiser-mode-smart-tab-p (geiser-smart-tab-mode geiser-mode)))
 
diff --git a/elisp/geiser-reload.el b/elisp/geiser-reload.el
index 97b398d..5a30e1f 100644
--- a/elisp/geiser-reload.el
+++ b/elisp/geiser-reload.el
@@ -38,6 +38,7 @@
            geiser-doc
            geiser-debug
            geiser-impl
+           geiser-company
            geiser-completion
            geiser-autodoc
            geiser-compile
diff --git a/elisp/geiser-repl.el b/elisp/geiser-repl.el
index bed653f..4ea1bb7 100644
--- a/elisp/geiser-repl.el
+++ b/elisp/geiser-repl.el
@@ -24,6 +24,7 @@
 
 ;;; Code:
 
+(require 'geiser-company)
 (require 'geiser-autodoc)
 (require 'geiser-edit)
 (require 'geiser-impl)
@@ -70,6 +71,11 @@ implementation name gets appended to it."
   :type 'boolean
   :group 'geiser-repl)
 
+(defcustom geiser-repl-company-p t
+  "Whether to use company-mode for completion, if available."
+  :group 'geiser-mode
+  :type 'boolean)
+
 (defcustom geiser-repl-read-only-prompt-p t
   "Whether the REPL's prompt should be read-only."
   :type 'boolean
@@ -293,6 +299,7 @@ If no REPL is running, execute `run-geiser' to start a fresh one."
   (set-syntax-table scheme-mode-syntax-table)
   (setq geiser-eval--get-module-function 'geiser-repl--module-function)
   (when geiser-repl-autodoc-p (geiser-autodoc-mode 1))
+  (geiser-company--setup geiser-repl-company-p)
   (compilation-shell-minor-mode 1))
 
 (define-key geiser-repl-mode-map "\C-d" 'delete-char)
-- 
cgit v1.2.3


From e7cdf10b94d7f5e66a5b3a6e7e65439ef35f874f Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Wed, 26 Aug 2009 12:23:53 +0200
Subject: Company's go to location working also for locations in same file.

---
 elisp/geiser-company.el | 10 ++++++----
 elisp/geiser-edit.el    | 16 +++++++++-------
 2 files changed, 15 insertions(+), 11 deletions(-)

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

diff --git a/elisp/geiser-company.el b/elisp/geiser-company.el
index 15b9cb8..2fb89f4 100644
--- a/elisp/geiser-company.el
+++ b/elisp/geiser-company.el
@@ -41,7 +41,8 @@
   (ignore-errors
     (if module
 	(format "%s [module]" id)
-      (geiser-autodoc--autodoc (list (list (intern id) 0)) t))))
+      (or (geiser-autodoc--autodoc (list (list (intern id) 0)) t)
+          (format "%s [local id]" id)))))
 
 (defsubst geiser-company--doc-buffer (id module)
   nil)
@@ -49,9 +50,10 @@
 (defun geiser-company--location (id module)
   (ignore-errors
     (let ((id (intern id)))
-      (save-current-buffer
-	(if module (geiser-edit-module id) (geiser-edit-symbol id))
-	(cons (current-buffer) (point))))))
+      (save-excursion
+        (if module
+            (geiser-edit-module id 'noselect)
+          (geiser-edit-symbol id 'noselect))))))
 
 (defun geiser-company--prefix-at-point (module)
   (when geiser-company--enabled-flag
diff --git a/elisp/geiser-edit.el b/elisp/geiser-edit.el
index 418b6e3..0ec1669 100644
--- a/elisp/geiser-edit.el
+++ b/elisp/geiser-edit.el
@@ -56,6 +56,7 @@ or following links in error buffers.")
 (defun geiser-edit--visit-file (file method)
   (cond ((eq method 'window) (find-file-other-window file))
         ((eq method 'frame) (find-file-other-frame file))
+        ((eq method 'noselect) (find-file-noselect file t))
         (t (find-file file))))
 
 (defsubst geiser-edit--location-name (loc)
@@ -126,10 +127,11 @@ or following links in error buffers.")
     (geiser-edit--goto-line symbol line)
     (when col
       (beginning-of-line)
-      (forward-char col))))
+      (forward-char col))
+    (cons (current-buffer) (point))))
 
-(defsubst geiser-edit--try-edit (symbol ret)
-  (geiser-edit--try-edit-location symbol (geiser-eval--retort-result ret)))
+(defsubst geiser-edit--try-edit (symbol ret &optional method)
+  (geiser-edit--try-edit-location symbol (geiser-eval--retort-result ret) method))
 
 
 ;;; Links
@@ -155,13 +157,13 @@ or following links in error buffers.")
 
 (defvar geiser-edit--symbol-history nil)
 
-(defun geiser-edit-symbol (symbol)
+(defun geiser-edit-symbol (symbol &optional method)
   "Asks for a symbol to edit, with completion."
   (interactive (list (geiser-completion--read-symbol "Edit symbol: "
                                                      nil
                                                      geiser-edit--symbol-history)))
   (let ((cmd `(:eval ((:ge symbol-location) ',symbol))))
-    (geiser-edit--try-edit symbol (geiser-eval--send/wait cmd))))
+    (geiser-edit--try-edit symbol (geiser-eval--send/wait cmd) method)))
 
 (defun geiser-edit-symbol-at-point (&optional arg)
   "Opens a new window visiting the definition of the symbol at point.
@@ -181,11 +183,11 @@ With prefix, asks for the symbol to edit."
       (pop-tag-mark)
     (error "No previous location for find symbol invocation")))
 
-(defun geiser-edit-module (module)
+(defun geiser-edit-module (module &optional method)
   "Asks for a module and opens it in a new buffer."
   (interactive (list (geiser-completion--read-module)))
   (let ((cmd `(:eval ((:ge module-location) (:module ,module)))))
-    (geiser-edit--try-edit module (geiser-eval--send/wait cmd))))
+    (geiser-edit--try-edit module (geiser-eval--send/wait cmd) method)))
 
 
 (provide 'geiser-edit)
-- 
cgit v1.2.3