diff options
| -rw-r--r-- | elisp/geiser-plt.el | 17 | ||||
| -rw-r--r-- | elisp/geiser.el | 4 | ||||
| -rw-r--r-- | scheme/plt/geiser.rkt (renamed from scheme/plt/geiser.ss) | 0 | ||||
| -rw-r--r-- | scheme/plt/geiser/autodoc.rkt (renamed from scheme/plt/geiser/autodoc.ss) | 0 | ||||
| -rw-r--r-- | scheme/plt/geiser/completions.rkt (renamed from scheme/plt/geiser/completions.ss) | 0 | ||||
| -rw-r--r-- | scheme/plt/geiser/enter.rkt (renamed from scheme/plt/geiser/enter.ss) | 0 | ||||
| -rw-r--r-- | scheme/plt/geiser/eval.rkt (renamed from scheme/plt/geiser/eval.ss) | 2 | ||||
| -rw-r--r-- | scheme/plt/geiser/locations.rkt (renamed from scheme/plt/geiser/locations.ss) | 0 | ||||
| -rw-r--r-- | scheme/plt/geiser/main.rkt (renamed from scheme/plt/geiser/main.ss) | 0 | ||||
| -rw-r--r-- | scheme/plt/geiser/modules.rkt (renamed from scheme/plt/geiser/modules.ss) | 0 | ||||
| -rw-r--r-- | scheme/plt/geiser/user.rkt (renamed from scheme/plt/geiser/user.ss) | 0 | ||||
| -rw-r--r-- | scheme/plt/geiser/utils.rkt (renamed from scheme/plt/geiser/utils.ss) | 0 |
12 files changed, 15 insertions, 8 deletions
diff --git a/elisp/geiser-plt.el b/elisp/geiser-plt.el index 52af728..64b770d 100644 --- a/elisp/geiser-plt.el +++ b/elisp/geiser-plt.el @@ -26,9 +26,9 @@ :group 'geiser) (geiser-custom--defcustom geiser-plt-binary - (cond ((eq system-type 'windows-nt) "MzScheme.exe") - ((eq system-type 'darwin) "mzscheme") - (t "mzscheme")) + (cond ((eq system-type 'windows-nt) "Racket.exe") + ((eq system-type 'darwin) "racket") + (t "racket")) "Name to use to call the mzscheme executable when starting a REPL." :type '(choice string (repeat string)) :group 'geiser-plt) @@ -60,9 +60,9 @@ This function uses `geiser-plt-init-file' if it exists." ,@(apply 'append (mapcar (lambda (p) (list "-S" p)) geiser-plt-collects)) ,@(and (listp geiser-plt-binary) (cdr geiser-plt-binary)) ,@(and init-file (file-readable-p init-file) (list "-f" init-file)) - "-f" ,(expand-file-name "plt/geiser.ss" geiser-scheme-dir)))) + "-f" ,(expand-file-name "plt/geiser.rkt" geiser-scheme-dir)))) -(defconst geiser-plt--prompt-regexp "^=?mzscheme@[^ ]*?> ") +(defconst geiser-plt--prompt-regexp "^=?\\(mzscheme\\|racket\\)@[^ ]*?> ") ;;; Evaluation support: @@ -195,8 +195,13 @@ This function uses `geiser-plt-init-file' if it exists." (binding-forms geiser-plt--binding-forms) (binding-forms* geiser-plt--binding-forms*)) -(geiser-impl--add-to-alist 'regexp "\\.mzscheme\\.sl?s$" 'plt t) +(geiser-impl--add-to-alist 'regexp + "\\.\\(mzscheme\\|racket\\)\\.sl?s$" 'plt t) (geiser-impl--add-to-alist 'regexp "\\.ss$" 'plt t) +(geiser-impl--add-to-alist 'regexp "\\.rkt$" 'plt t) + +(defalias 'run-racket 'run-plt) +(defalias 'switch-to-racket 'switch-to-plt) (provide 'geiser-plt) diff --git a/elisp/geiser.el b/elisp/geiser.el index 6263afd..4389652 100644 --- a/elisp/geiser.el +++ b/elisp/geiser.el @@ -1,6 +1,6 @@ ;;; geiser.el -- main geiser file -;; Copyright (C) 2009 Jose Antonio Ortega Ruiz +;; Copyright (C) 2009, 2010 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 @@ -82,5 +82,7 @@ (eval-after-load "scheme" '(add-hook 'scheme-mode-hook 'turn-on-geiser-mode)) +(add-to-list 'auto-mode-alist '("\\.rkt\\'" . scheme-mode)) + (provide 'geiser) diff --git a/scheme/plt/geiser.ss b/scheme/plt/geiser.rkt index 29dff2a..29dff2a 100644 --- a/scheme/plt/geiser.ss +++ b/scheme/plt/geiser.rkt diff --git a/scheme/plt/geiser/autodoc.ss b/scheme/plt/geiser/autodoc.rkt index c317d5c..c317d5c 100644 --- a/scheme/plt/geiser/autodoc.ss +++ b/scheme/plt/geiser/autodoc.rkt diff --git a/scheme/plt/geiser/completions.ss b/scheme/plt/geiser/completions.rkt index bf6b1c9..bf6b1c9 100644 --- a/scheme/plt/geiser/completions.ss +++ b/scheme/plt/geiser/completions.rkt diff --git a/scheme/plt/geiser/enter.ss b/scheme/plt/geiser/enter.rkt index b81ba48..b81ba48 100644 --- a/scheme/plt/geiser/enter.ss +++ b/scheme/plt/geiser/enter.rkt diff --git a/scheme/plt/geiser/eval.ss b/scheme/plt/geiser/eval.rkt index e806138..79f212e 100644 --- a/scheme/plt/geiser/eval.ss +++ b/scheme/plt/geiser/eval.rkt @@ -75,7 +75,7 @@ (define (make-repl-reader builtin-reader) (lambda (ns) (last-namespace ns) - (printf "mzscheme@~a" (namespace->module-name ns)) + (printf "racket@~a" (namespace->module-name ns)) (builtin-reader))) ;;; eval.ss ends here diff --git a/scheme/plt/geiser/locations.ss b/scheme/plt/geiser/locations.rkt index dea93c6..dea93c6 100644 --- a/scheme/plt/geiser/locations.ss +++ b/scheme/plt/geiser/locations.rkt diff --git a/scheme/plt/geiser/main.ss b/scheme/plt/geiser/main.rkt index f157ac6..f157ac6 100644 --- a/scheme/plt/geiser/main.ss +++ b/scheme/plt/geiser/main.rkt diff --git a/scheme/plt/geiser/modules.ss b/scheme/plt/geiser/modules.rkt index 829cf77..829cf77 100644 --- a/scheme/plt/geiser/modules.ss +++ b/scheme/plt/geiser/modules.rkt diff --git a/scheme/plt/geiser/user.ss b/scheme/plt/geiser/user.rkt index 48b7dd5..48b7dd5 100644 --- a/scheme/plt/geiser/user.ss +++ b/scheme/plt/geiser/user.rkt diff --git a/scheme/plt/geiser/utils.ss b/scheme/plt/geiser/utils.rkt index ff8e695..ff8e695 100644 --- a/scheme/plt/geiser/utils.ss +++ b/scheme/plt/geiser/utils.rkt |