From 3895c4e9fcbd5e6222c88e431c90bfef87af99ea Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Thu, 5 Nov 2015 10:08:35 -0800 Subject: 2371 - layer 5 of edit --- edit/003-shortcuts.mu | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'edit/003-shortcuts.mu') diff --git a/edit/003-shortcuts.mu b/edit/003-shortcuts.mu index 10f46357..91f3246d 100644 --- a/edit/003-shortcuts.mu +++ b/edit/003-shortcuts.mu @@ -1359,7 +1359,7 @@ after [ recipe move-to-end-of-line editor:address:editor-data [ local-scope - editor:address:editor-data <- next-ingredient + load-ingredients before-cursor:address:address:duplex-list:character <- get-address *editor, before-cursor:offset cursor-column:address:number <- get-address *editor, cursor-column:offset # while not at start of line, move @@ -2173,14 +2173,13 @@ after [ # takes a pointer into the doubly-linked list, scans back to before start of # previous *wrapped* line # beware: never return null pointer -recipe before-previous-line curr:address:duplex-list:character -> curr:address:duplex-list:character [ +recipe before-previous-line curr:address:duplex-list:character, editor:address:editor-data -> curr:address:duplex-list:character [ local-scope - curr:address:duplex-list:character <- next-ingredient + load-ingredients c:character <- get *curr, value:offset # compute max, number of characters to skip # 1 + len%(width-1) # except rotate second term to vary from 1 to width-1 rather than 0 to width-2 - editor:address:editor-data <- next-ingredient left:number <- get *editor, left:offset right:number <- get *editor, right:offset max-line-length:number <- subtract right, left, -1/exclusive-right, 1/wrap-icon @@ -2776,8 +2775,7 @@ after [ recipe page-up editor:address:editor-data, screen-height:number -> editor:address:editor-data [ local-scope - editor:address:editor-data <- next-ingredient - screen-height:number <- next-ingredient + load-ingredients max:number <- subtract screen-height, 1/menu-bar, 1/overlapping-line count:number <- copy 0 top-of-screen:address:address:duplex-list:character <- get-address *editor, top-of-screen:offset -- cgit 1.4.1-2-gfad0