about summary refs log tree commit diff stats
path: root/edit/001-editor.mu
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2016-05-19 09:10:29 -0700
committerKartik K. Agaram <vc@akkartik.com>2016-05-19 09:10:29 -0700
commit1521e4e32f7a5ddd3629006b3e46501ed22d91a5 (patch)
treecc6de148bdf3d3b78caa48ef51ce31ce0b6cad3b /edit/001-editor.mu
parent2655ae726e607ba4caa88c088ffb77e50753aead (diff)
downloadmu-1521e4e32f7a5ddd3629006b3e46501ed22d91a5.tar.gz
2975
Clean up this helper before we start redoing sandbox menubars.
Diffstat (limited to 'edit/001-editor.mu')
-rw-r--r--edit/001-editor.mu9
1 files changed, 5 insertions, 4 deletions
diff --git a/edit/001-editor.mu b/edit/001-editor.mu
index 06c5a8dc..1d4b4ac2 100644
--- a/edit/001-editor.mu
+++ b/edit/001-editor.mu
@@ -172,7 +172,7 @@ def render screen:address:screen, editor:address:editor-data -> last-row:number,
         before-cursor <- prev curr
       }
       # clear rest of line in this window
-      clear-line-delimited screen, column, right
+      clear-line-until screen, right
       # skip to next line
       row <- add row, 1
       column <- copy left
@@ -222,9 +222,10 @@ def render screen:address:screen, editor:address:editor-data -> last-row:number,
   return row, column, screen/same-as-ingredient:0, editor/same-as-ingredient:1
 ]
 
-def clear-line-delimited screen:address:screen, column:number, right:number -> screen:address:screen [
+def clear-line-until screen:address:screen, right:number -> screen:address:screen [
   local-scope
   load-ingredients
+  _, column:number <- cursor-position screen
   space:character <- copy 32/space
   bg-color:number, bg-color-found?:boolean <- next-ingredient
   {
@@ -252,7 +253,7 @@ def clear-screen-from screen:address:screen, row:number, column:number, left:num
   }
   # if not, go the slower route
   screen <- move-cursor screen, row, column
-  clear-line-delimited screen, column, right
+  clear-line-until screen, right
   clear-rest-of-screen screen, row, left, right
   return screen/same-as-ingredient:0
 ]
@@ -267,7 +268,7 @@ def clear-rest-of-screen screen:address:screen, row:number, left:number, right:n
     at-bottom-of-screen?:boolean <- greater-or-equal row, screen-height
     break-if at-bottom-of-screen?
     screen <- move-cursor screen, row, left
-    clear-line-delimited screen, left, right
+    clear-line-until screen, right
     row <- add row, 1
     loop
   }