X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=ecmalisp.html;h=110a686342e5328d2d87184a3f8dcfa3dbec54b9;hb=b8e4b54644d537d32a07e8570672d11728379f8d;hp=b22bf69382dc18eea4fb6ef3b097d378322cfb70;hpb=2d227431f8ee11c329cb0f4981386f67fb912a43;p=jscl.git

diff --git a/ecmalisp.html b/ecmalisp.html
index b22bf69..110a686 100644
--- a/ecmalisp.html
+++ b/ecmalisp.html
@@ -67,7 +67,7 @@
     <script src="jqconsole.min.js" type="text/javascript" charset="utf-8"></script>
     <script>
       $(function () {
-        var jqconsole = $('#console').jqconsole('Welcome to Ecmalisp!\n\n', '> ');
+        var jqconsole = $('#console').jqconsole('Welcome to Ecmalisp!\n\n', '');
         jqconsole.RegisterMatching('(', ')', 'parents');
 
         lisp.write = function(str){
@@ -77,22 +77,26 @@
 
         var startPrompt = function () {
           // Start the prompt with history enabled.
+          jqconsole.Write(lisp.evalString(pv, '(CL:PACKAGE-NAME CL:*PACKAGE*)') + '> ', 'jqconsole-prompt');
           jqconsole.Prompt(true, function (input) {
             // Output input with the class jqconsole-return.
             if (input[0] != ','){
                 try {
-                    jqconsole.Write(lisp.print(lisp.evalString(input)) + '\n', 'jqconsole-return');
+                    var vs = lisp.evalString(mv, input);
+                    for (var i=0; i<vs.length; i++){
+                       jqconsole.Write(lisp.print(pv, vs[i]) + '\n', 'jqconsole-return');
+                    }
                 } catch(error) {
-                    jqconsole.Write('ERROR: ' + error + '\n', 'jqconsole-error');
+                    jqconsole.Write('ERROR: ' + (error.message || error) + '\n', 'jqconsole-error');
                 }
             } else {
-                jqconsole.Write(lisp.compileString(input.slice(1)) + '\n', 'jqconsole-return');
+                jqconsole.Write(lisp.compileString(pv, input.slice(1)) + '\n', 'jqconsole-return');
             }
             // Restart the prompt.
             startPrompt();
           }, function(input){
             try {
-                lisp.read(input[0]==','? input.slice(1): input);
+                lisp.read(pv, input[0]==','? input.slice(1): input);
             } catch(error) {
                 return 0;
             }