Index: lisp-syntax.lisp
===================================================================
RCS file: /project/climacs/cvsroot/climacs/lisp-syntax.lisp,v
retrieving revision 1.15
diff -u -r1.15 lisp-syntax.lisp
--- lisp-syntax.lisp	24 Jul 2005 08:06:50 -0000	1.15
+++ lisp-syntax.lisp	25 Jul 2005 06:52:11 -0000
@@ -394,7 +394,7 @@
       (tagbody
        start
 	 (when (end-of-buffer-p scan)
-	   (return-from lex (make-instance 'error-lexeme)))
+	   (return-from lex (make-instance 'text-lexeme)))
 	 (when (eql (object-after scan) #\\)
 	   (fo)
 	   (when (end-of-buffer-p scan)
@@ -405,9 +405,13 @@
 	   (incf bars-seen)
 	   (fo)
 	   (go start))
-	 (unless (whitespacep (object-after scan))
-	   (fo)
-	   (go start))	 
+         (if (evenp bars-seen)
+             (unless (whitespacep (object-after scan))
+               (fo)
+               (go start))
+             (when (constituentp (object-after scan))
+               (fo)
+               (go start)))
 	 (return-from lex 
 	   (if (oddp bars-seen)
 	       (make-instance 'multiple-escape-end-lexeme)
@@ -1456,6 +1460,9 @@
 
 (defmethod indent-form ((syntax lisp-syntax) (tree string-form) path)
   (values tree 1))
+
+(defmethod indent-form ((syntax lisp-syntax) (tree token-form) path)
+  (values tree 0))
 
 (defmethod indent-binding ((syntax lisp-syntax) tree path)
   (if (null (cdr path))
