summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Wang <ptr.wang@gmail.com>2016-11-26 17:06:38 +0800
committerPeter Wang <ptr.wang@gmail.com>2016-11-26 17:06:38 +0800
commitae895088fab7593295dc16bc7d58a67321f92d46 (patch)
tree720887263e2638e68c3abc60d4f5859642e0419c
parent8cbb0f27b3a9fbdd7ebfc425e9119fec8ccbf45f (diff)
downloadgeiser-guile-ae895088fab7593295dc16bc7d58a67321f92d46.tar.gz
geiser-guile-ae895088fab7593295dc16bc7d58a67321f92d46.tar.bz2
fix malformed argument lists.
Emacs trunk does not support arguments list like (lambda (&rest) nil) anymore, which breaks geiser and errors with "Invalid function: "
-rw-r--r--elisp/geiser-eval.el2
-rw-r--r--elisp/geiser-impl.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/elisp/geiser-eval.el b/elisp/geiser-eval.el
index f7ac299..6209dd3 100644
--- a/elisp/geiser-eval.el
+++ b/elisp/geiser-eval.el
@@ -29,7 +29,7 @@
(defvar geiser-eval--get-impl-module nil)
(geiser-impl--register-local-method
- 'geiser-eval--get-impl-module 'find-module '(lambda (&rest) nil)
+ 'geiser-eval--get-impl-module 'find-module '(lambda (&rest args) nil)
"Function used to obtain the module for current buffer. It takes
an optional argument, for cases where we want to force its
value.")
diff --git a/elisp/geiser-impl.el b/elisp/geiser-impl.el
index cbc0b12..4f4f0ee 100644
--- a/elisp/geiser-impl.el
+++ b/elisp/geiser-impl.el
@@ -158,7 +158,7 @@ determine its scheme flavour."
(= 2 (length m))
(symbolp (car m)))
(if (functionp (cadr m)) m
- `(,(car m) (lambda (&rest) ,(cadr m))))))
+ `(,(car m) (lambda (&rest args) ,(cadr m))))))
(defun geiser-impl--define (file name parent methods)
(let* ((methods (mapcar 'geiser-impl--normalize-method methods))