A bit more robust generic methods.

2 files changed, 6 insertions, 7 deletions

diff --git a/elisp/geiser-mode.el b/elisp/geiser-mode.el
index 3520925..a96dbaa 100644
--- a/elisp/geiser-mode.el
+++ b/elisp/geiser-mode.el
@@ -194,7 +194,7 @@ interacting with the Geiser REPL is at your disposal.
 
 (geiser-mode--triple-chord ?d ?a 'geiser-autodoc-mode)
 (geiser-mode--triple-chord ?d ?d 'geiser-doc-symbol-at-point)
-(geiser-mode--triple-chord ?d ?g 'geiser-xref-generic-methods)
+(geiser-mode--triple-chord ?d ?p 'geiser-xref-generic-methods)
 (geiser-mode--triple-chord ?d ?m 'geiser-doc-module)
 
 (geiser-mode--triple-chord ?e ?m 'geiser-edit-module)
diff --git a/elisp/geiser-xref.el b/elisp/geiser-xref.el
index 62375e0..f0920d8 100644
--- a/elisp/geiser-xref.el
+++ b/elisp/geiser-xref.el
@@ -63,18 +63,17 @@
       (geiser-edit--try-edit-location name location geiser-xref-follow-link-method))))
 
 (defun geiser-xref--insert-button (xref)
-  (let ((location (cdr (assoc 'location xref)))
-        (signature (cdr (assoc 'signature xref))))
+  (let* ((location (cdr (assoc 'location xref)))
+         (file (geiser-edit--location-file location))
+         (signature (cdr (assoc 'signature xref))))
     (when signature
       (insert "\t")
-      (if location
+      (if (stringp file)
           (insert-text-button (format "%s" signature)
                               :type 'geiser-xref--button
                               'location location
                               'name (car signature)
-                              'help-echo (format "%s in %s"
-                                                 (car signature)
-                                                 (geiser-edit--location-file location)))
+                              'help-echo (format "%s in %s" (car signature) file))
         (insert (format "%s" signature)))
       (newline))))