diff options
| author | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2011-03-08 20:51:28 +0100 |
|---|---|---|
| committer | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2011-03-08 20:51:28 +0100 |
| commit | 5ad2dac3dcba6a760eac16b7c23dde2f19a0056c (patch) | |
| tree | d2da4ff8e905dbc8c6f5c4c4ae4a5c053440f1c7 /elisp/geiser-guile.el | |
| parent | 419985a0ec49deba4c5d0d22dc8b396916af28c6 (diff) | |
| download | geiser-guile-5ad2dac3dcba6a760eac16b7c23dde2f19a0056c.tar.gz geiser-guile-5ad2dac3dcba6a760eac16b7c23dde2f19a0056c.tar.bz2 | |
Guile: new option for loading ~/.guile (see issue #32681)
The new custom variable, geiser-guile-load-init-file-p, will be gone
once Guile adquires the ability to specify the path to its init file.
Diffstat (limited to 'elisp/geiser-guile.el')
| -rw-r--r-- | elisp/geiser-guile.el | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el index 4d7727c..169ac30 100644 --- a/elisp/geiser-guile.el +++ b/elisp/geiser-guile.el @@ -45,10 +45,20 @@ started." :group 'geiser-guile) (geiser-custom--defcustom geiser-guile-init-file "~/.guile-geiser" - "Initialization file with user code for the Guile REPL." + "Initialization file with user code for the Guile REPL. +If all you want is to load ~/.guile, set +`geiser-guile-load-init-file-p' instead." :type 'string :group 'geiser-guile) +(geiser-custom--defcustom geiser-guile-load-init-file-p nil + "Whether to load ~/.guile when starting Guile. +Note that, due to peculiarities in the way Guile loads its init +file, using `geiser-guile-init-file' is not equivalent to setting +this variable to t." + :type 'boolean + :group 'geiser-guile) + (geiser-custom--defcustom geiser-guile-debug-show-bt-p nil "Whether to autmatically show a full backtrace when entering the debugger. If `nil', only the last frame is shown." @@ -111,10 +121,12 @@ effect on new REPLs. For existing ones, use the command "Return a list with all parameters needed to start Guile. 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)))) + (expand-file-name geiser-guile-init-file))) + (q-flags (or geiser-guile-load-init-file-p '("-q")))) `(,@(and (listp geiser-guile-binary) (cdr geiser-guile-binary)) - "-q" "-L" ,(expand-file-name "guile/" geiser-scheme-dir) - ,@(apply 'append (mapcar (lambda (p) (list "-L" p)) geiser-guile-load-path)) + ,@q-flags "-L" ,(expand-file-name "guile/" geiser-scheme-dir) + ,@(apply 'append (mapcar (lambda (p) (list "-L" p)) + geiser-guile-load-path)) ,@(and init-file (file-readable-p init-file) (list "-l" init-file))))) ;;(defconst geiser-guile--prompt-regexp "^[^() \n]+@([^)]*?)> ") |