- fix: the shortcut for RUN/CONSOLE is &*, not &&

- fix: don't be confused about the token to be completed if the
       command line has trailing whitspaces

- fix: don't crash if READ raises an error

scheme/cmdline.scm

@@ -135,8 +135,7 @@
       (let ((start-pos (current-column port)))
 	(read-char port)
 	(let read-whitspaces ((c (peek-char port))
-			      (cursor? (and cursor-index 
+			      (cursor? #f))
-					    (= start-pos cursor-index))))
 	  (cond
 	   ((eof-object? c)
 	    (lp c (if (or cursor?
@@ -158,10 +157,16 @@
 (define (lex-command-line cmd-line . args)
   (let-optionals args
       ((cursor-index #f))
-    (lex-port 
+    (with-handler 
-     cursor-index
+     (lambda (c more)
-     (make-tracking-input-port 
+       (if (read-error? c)
-      (make-string-input-port cmd-line)))))
+	   (signal-syntax-error (condition-stuff c))
+	   (more)))
+     (lambda ()
+       (lex-port
+	cursor-index
+	(make-tracking-input-port 
+	 (make-string-input-port cmd-line)))))))
 
 ;; abstract syntax
 
@@ -323,7 +328,7 @@
       (values #f tokens)
       (let ((t (car tokens)))
 	(if  (and (operator-token? t)
-		  (member (token-token t) '(&& &)))
+		  (member (token-token t) '(&* &)))
 	     (values (token-token t) (cdr tokens))
 	     (values #f tokens)))))