diff options
| author | Brian Cully <bjc@kublai.com> | 2011-03-15 22:03:11 -0400 |
|---|---|---|
| committer | Brian Cully <github.20.shmit@spamgourmet.com> | 2011-03-15 22:03:11 -0400 |
| commit | 9992988f581532a7db50b57594fc3e346398f9fa (patch) | |
| tree | 1cd36a71bc2d42ba091467e8cf014e1dbec0f635 /Lisp | |
| parent | e78a860d2ef8f9995d07868fcfe60ceb15b6b40b (diff) | |
| download | moxie-9992988f581532a7db50b57594fc3e346398f9fa.tar.gz moxie-9992988f581532a7db50b57594fc3e346398f9fa.zip | |
Update for 10.7
Also set stream type to latin-1 in SBCL. This should become a setting.
Diffstat (limited to 'Lisp')
| -rw-r--r-- | Lisp/moxie/compat/compat-sbcl.lisp | 4 | ||||
| -rw-r--r-- | Lisp/moxie/moxie.lisp | 4 | ||||
| -rw-r--r-- | Lisp/moxie/repl.lisp | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Lisp/moxie/compat/compat-sbcl.lisp b/Lisp/moxie/compat/compat-sbcl.lisp index bb43bc8..aff4581 100644 --- a/Lisp/moxie/compat/compat-sbcl.lisp +++ b/Lisp/moxie/compat/compat-sbcl.lisp @@ -21,7 +21,7 @@ :protocol :tcp))) (sb-bsd-sockets:socket-connect socket (coerce-inet-address-designator host) port) (let ((stream (sb-bsd-sockets:socket-make-stream socket - :input t :output t :buffering buffering))) + :input t :output t :buffering buffering :external-format :latin-1))) (setf (gethash stream *stream-to-socket*) socket) stream))) @@ -46,4 +46,4 @@ (sb-sys:remove-fd-handler it))) (defun save-lisp-and-die (path) - (sb-ext:save-lisp-and-die path))
\ No newline at end of file + (sb-ext:save-lisp-and-die path)) diff --git a/Lisp/moxie/moxie.lisp b/Lisp/moxie/moxie.lisp index c18e630..7a2336f 100644 --- a/Lisp/moxie/moxie.lisp +++ b/Lisp/moxie/moxie.lisp @@ -115,7 +115,7 @@ See the functions add-hook and remove-hook.") (setq i it)) (princ char result)))) result)) - + (defun escape-mux-string (string) "Returns a string made from STRING with substitutions for white space." (with-output-to-string (result) @@ -215,4 +215,4 @@ See the functions add-hook and remove-hook.") "Send CMD and ARGS to Moxie's generic result handler." (let ((*print-pretty* nil)) (prin1 `(,cmd ,@args) *moxie-result-stream*)) - #-clisp (finish-output *moxie-result-stream*))
\ No newline at end of file + #-clisp (finish-output *moxie-result-stream*)) diff --git a/Lisp/moxie/repl.lisp b/Lisp/moxie/repl.lisp index b5b7bb3..0c17116 100644 --- a/Lisp/moxie/repl.lisp +++ b/Lisp/moxie/repl.lisp @@ -52,6 +52,7 @@ has been entered, so Moxie can keep track of the prompt." (defmacro eval-hook (&rest forms) "Ensure all FORMS are valid for evaluation before calling EVAL-HOOK-HELPER." + (format t "bjc: DEBUG: forms: ~p~%" forms) (let ((helped-forms (mapcar (lambda (x) `(quote ,x)) forms))) `(eval-hook-helper ,@helped-forms))) |