Slightly less broken paren matching.

backend.lisp

@@ -48,4 +48,4 @@
 	  ,@forms)
      (backend-init ,backend)))
 
- (defgeneric display (backend prompt line point))
+(defgeneric display (backend &key prompt line point &allow-other-keys))

dumb-terminal.lisp

@@ -26,7 +26,7 @@
 
 (defclass dumb-terminal (terminal) ())
 
-(defmethod display ((backend dumb-terminal) prompt line point)
+(defmethod display ((backend dumb-terminal) &key prompt line point &allow-other-keys)
   (let* ((string (concat prompt line))
 	 (length (length string))
 	 (point (+ point (length prompt)))

editor.lisp

@@ -92,8 +92,15 @@
 
 (defvar *debug-info* nil)
 
+(defun redraw-line (editor &key markup)
+  (display editor 
+	   :prompt (editor-prompt editor) 
+	   :line (get-string editor) 
+	   :point (get-point editor)
+	   :markup markup))
+
 (defun next-chord (editor)
-  (display editor (editor-prompt editor) (get-string editor) (get-point editor))
+  (redraw-line editor :markup t)
   (forget-yank editor)
   (let* ((chord (read-chord editor))
 	 (command (gethash chord (editor-commands editor)

main.lisp

@@ -29,6 +29,7 @@
 	(loop
 	 (catch 'linedit-loop
 	   (next-chord editor))))
+      (redraw-line editor)
       (get-finished-string editor))))
 
 (defun formedit (&rest args &key (prompt1 "") (prompt2 "")

matcher.lisp

@@ -43,7 +43,7 @@
 
 (defun find-close-paren (string index)
   (loop with count = -1
-	for n from (1+ index) upto (length string)
+	for n from (1+ index) below (length string)
 	do (incf count (paren-count-delta (schar string n)))
 	when (zerop count) return n))
 

smart-terminal.lisp

@@ -37,23 +37,25 @@
   (when ti:enter-am-mode
     (ti:tputs ti:enter-am-mode)))
 
-(defmethod display ((backend smart-terminal) prompt line point)
-  (let ((*terminal-io* *standard-output*)
-	(columns (backend-columns backend))
-	(line (dwim-mark-parens line point 
-				:pre-mark ti:enter-bold-mode
-				:post-mark ti:exit-attribute-mode)))
+(defmethod display ((backend smart-terminal) &key prompt line point markup)
+  (let* ((*terminal-io* *standard-output*)
+	 (columns (backend-columns backend))
+	 (marked-line (if markup
+			  (dwim-mark-parens line point 
+					    :pre-mark ti:enter-bold-mode
+					    :post-mark ti:exit-attribute-mode)
+			  line)))
     (flet ((find-row (n)
 	     ;; 1+ includes point in row calculations
 	     (ceiling (1+ n) columns))
 	   (find-col (n)
 	     (rem n columns)))
-      (let* ((new (concat prompt line))
+      (let* ((new (concat prompt marked-line))
 	     (old (active-string backend))
-	     (end (length new))
+	     (end (+ (length prompt) (length line))) ;; based on unmarked
 	     (rows (find-row end))
 	     (start (or (mismatch new old) 0))
-	     (start-row (find-row start))
+	     (start-row (find-row start)) ;; markup?
 	     (start-col (find-col start)))
 	;; Move to start of update and clear to eos
 	(ti:tputs ti:column-address start-col)