diff options
| -rw-r--r-- | edit/003-shortcuts.mu | 20 | ||||
| -rw-r--r-- | sandbox/003-shortcuts.mu | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/edit/003-shortcuts.mu b/edit/003-shortcuts.mu index d98bb5ac..f78e25af 100644 --- a/edit/003-shortcuts.mu +++ b/edit/003-shortcuts.mu @@ -1676,7 +1676,7 @@ def minimal-render-for-ctrl-u editor:&:editor, screen:&:screen -> go-render?:boo i <- add i, 1 # if we have a wrapped line, give up and render the whole screen wrap?:bool <- equal i, end - return-if wrap?, 1/do-render + return-if wrap?, 1/go-render curr <- next curr break-unless curr c:char <- get *curr, value:offset @@ -1918,7 +1918,7 @@ def minimal-render-for-ctrl-k editor:&:editor, screen:&:screen, deleted-cells:&: right:num <- get *editor, right:offset end:num <- subtract right, left wrap?:bool <- greater-or-equal old-row-len, end - return-if wrap?, 1/do-render + return-if wrap?, 1/go-render # accumulate the current line as text and render it buf:&:buffer:char <- new-buffer 30 # accumulator for the text we need to render curr:&:duplex-list:char <- get *editor, before-cursor:offset @@ -3500,14 +3500,14 @@ after <handle-special-character> [ scroll-up?:bool <- equal c, 5/ctrl-e break-unless scroll-up? <move-cursor-begin> - do-render?:bool, editor <- line-up editor, screen-height + go-render?:bool, editor <- line-up editor, screen-height undo-coalesce-tag:num <- copy 5/line-up <move-cursor-end> - return do-render? + return go-render? } ] -def line-up editor:&:editor, screen-height:num -> do-render?:bool, editor:&:editor [ +def line-up editor:&:editor, screen-height:num -> go-render?:bool, editor:&:editor [ local-scope load-ingredients left:num <- get *editor, left:offset @@ -3531,14 +3531,14 @@ after <handle-special-character> [ scroll-down?:bool <- equal c, 4/ctrl-d break-unless scroll-down? <move-cursor-begin> - do-render?:bool, editor <- line-down editor, screen-height + go-render?:bool, editor <- line-down editor, screen-height undo-coalesce-tag:num <- copy 6/line-down <move-cursor-end> - return do-render? + return go-render? } ] -def line-down editor:&:editor, screen-height:num -> do-render?:bool, editor:&:editor [ +def line-down editor:&:editor, screen-height:num -> go-render?:bool, editor:&:editor [ local-scope load-ingredients old-top:&:duplex-list:char <- get *editor, top-of-screen:offset @@ -3565,9 +3565,9 @@ after <handle-special-character> [ new-top:&:duplex-list:char <- before-previous-line cursor, editor *editor <- put *editor, top-of-screen:offset, new-top *editor <- put *editor, cursor-row:offset, 1 - do-render?:bool <- not-equal new-top, old-top + go-render?:bool <- not-equal new-top, old-top undo-coalesce-tag:num <- copy 0/never <move-cursor-end> - return do-render? + return go-render? } ] diff --git a/sandbox/003-shortcuts.mu b/sandbox/003-shortcuts.mu index 466d4d47..65dc4d24 100644 --- a/sandbox/003-shortcuts.mu +++ b/sandbox/003-shortcuts.mu @@ -1651,7 +1651,7 @@ def minimal-render-for-ctrl-u editor:&:editor, screen:&:screen -> go-render?:boo i <- add i, 1 # if we have a wrapped line, give up and render the whole screen wrap?:bool <- equal i, end - return-if wrap?, 1/do-render + return-if wrap?, 1/go-render curr <- next curr break-unless curr c:char <- get *curr, value:offset @@ -1893,7 +1893,7 @@ def minimal-render-for-ctrl-k editor:&:editor, screen:&:screen, deleted-cells:&: right:num <- get *editor, right:offset end:num <- subtract right, left wrap?:bool <- greater-or-equal old-row-len, end - return-if wrap?, 1/do-render + return-if wrap?, 1/go-render # accumulate the current line as text and render it buf:&:buffer:char <- new-buffer 30 # accumulator for the text we need to render curr:&:duplex-list:char <- get *editor, before-cursor:offset |