summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--elisp/geiser-guile.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 10f5c1d..7320e97 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@
- New C-c C-e C-l (or C-c C-r in REPL) to add a directory to
Scheme's load path.
- Guile 2.0 as lowest Guile version supported.
+ - New custom variable, geiser-guile-load-init-file-p, to allow
+ loading of ~/.guile.
Bug fixes:
diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el
index 169ac30..648c64e 100644
--- a/elisp/geiser-guile.el
+++ b/elisp/geiser-guile.el
@@ -122,7 +122,7 @@ effect on new REPLs. For existing ones, use the command
This function uses `geiser-guile-init-file' if it exists."
(let ((init-file (and (stringp geiser-guile-init-file)
(expand-file-name geiser-guile-init-file)))
- (q-flags (or geiser-guile-load-init-file-p '("-q"))))
+ (q-flags (and (not geiser-guile-load-init-file-p) '("-q"))))
`(,@(and (listp geiser-guile-binary) (cdr geiser-guile-binary))
,@q-flags "-L" ,(expand-file-name "guile/" geiser-scheme-dir)
,@(apply 'append (mapcar (lambda (p) (list "-L" p))