Merge branch 'master' into ChibiExperiments

4 files changed, 15 insertions, 7 deletions

diff --git a/elisp/geiser-chicken.el b/elisp/geiser-chicken.el
index dff028f..3403989 100644
--- a/elisp/geiser-chicken.el
+++ b/elisp/geiser-chicken.el
@@ -295,8 +295,12 @@ This function uses `geiser-chicken-init-file' if it exists."
       (geiser-eval--send/wait load-sequence))))
 
 (defun geiser-chicken5-load ()
-  (let ((source (expand-file-name "chicken/geiser/chicken5.scm" geiser-scheme-dir)))
-    (geiser-eval--send/wait (format "(display '((result . t) (output . f))) (load \"%s\") (import geiser)"  source))))
+  (let ((source (expand-file-name "chicken/geiser/chicken5.scm"
+                                  geiser-scheme-dir)))
+    (geiser-eval--send/wait
+     (format
+      "(display '((result . t) (output . f))) (load \"%s\") (import geiser)"
+      source))))
 
 (defun geiser-chicken--startup (remote)
   (compilation-setup t)
diff --git a/elisp/geiser-doc.el b/elisp/geiser-doc.el
index 7810957..a982997 100644
--- a/elisp/geiser-doc.el
+++ b/elisp/geiser-doc.el
@@ -382,6 +382,11 @@ With prefix argument, ask for symbol (with completion)."
                      "Symbol: " (geiser--symbol-at-point)))))
     (when symbol (geiser-doc-symbol symbol))))
 
+(defun geiser-doc-manual-for-symbol (symbol)
+  (geiser-doc--external-help geiser-impl--implementation
+                             symbol
+                             (geiser-eval--get-module)))
+
 (defun geiser-doc-look-up-manual (&optional arg)
   "Look up manual for symbol at point.
 With prefix argument, ask for the lookup symbol (with completion)."
@@ -390,9 +395,7 @@ With prefix argument, ask for the lookup symbol (with completion)."
     (error "No manual available"))
   (let ((symbol (or (and (not arg) (geiser--symbol-at-point))
                     (geiser-completion--read-symbol "Symbol: "))))
-    (geiser-doc--external-help geiser-impl--implementation
-                               symbol
-                               (geiser-eval--get-module))))
+    (geiser-doc-manual-for-symbol symbol)))
 
 (defconst geiser-doc--sections '(("Procedures:" "procs")
                                  ("Syntax:" "syntax")
diff --git a/elisp/geiser-log.el b/elisp/geiser-log.el
index 91ed639..7b4193e 100644
--- a/elisp/geiser-log.el
+++ b/elisp/geiser-log.el
@@ -1,6 +1,6 @@
 ;; geiser-log.el -- logging utilities
 
-;; Copyright (C) 2009, 2010, 2012 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2009, 2010, 2012, 2019 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
@@ -14,6 +14,7 @@
 ;; Some utilities for maintaining a simple log buffer, mainly for
 ;; debugging purposes.
 
+(require 'geiser-custom)
 (require 'geiser-popup)
 (require 'geiser-base)
 
diff --git a/elisp/geiser-racket.el b/elisp/geiser-racket.el
index 2df2461..ebe748c 100644
--- a/elisp/geiser-racket.el
+++ b/elisp/geiser-racket.el
@@ -445,7 +445,7 @@ Use a prefix to be asked for a submodule name."
   (binding-forms* geiser-racket--binding-forms*))
 
 (geiser-impl--add-to-alist 'regexp "\\.ss$" 'racket t)
-(geiser-impl--add-to-alist 'regexp "\\.rkt$" 'racket t)
+(geiser-impl--add-to-alist 'regexp "\\.rkt[dl]?$" 'racket t)
 
 (defun run-gracket ()
   "Start the Racket REPL using gracket instead of plain racket."