03/03: installer: Make form refreshers easier to read.

[Danny Milosavljevic]

dannym pushed a commit to branch wip-installer-2
in repository guix.

commit ad66d54956dccd14c0c3c75f3b93128ce6a22475
Author: Danny Milosavljevic <address@hidden>
Date:   Sun Jul 9 22:52:50 2017 +0200

    installer: Make form refreshers easier to read.
    
    * gurses/form.scm (draw-field-space): Modify.
    (redraw-field): Modify.
---
 gurses/form.scm | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/gurses/form.scm b/gurses/form.scm
index 2821f28..4816e33 100644
--- a/gurses/form.scm
+++ b/gurses/form.scm
@@ -79,23 +79,25 @@
 
 (define (draw-field-space win field y x)
   "Draws the template for FIELD at Y, X"
-  (addchstr win
-    (make-list (if (list? (field-size field))
-                 (fold (lambda (x prev) (max prev (string-length x))) 0
-                       (field-size field))
-                 (field-size field))
-                 (color (color-index-by-symbol 'form-field) (inverse #\space)))
-    #:y y
-    #:x x))
+  (let ((form-field-color (color-index-by-symbol 'form-field)))
+    (addchstr win
+      (make-list (if (list? (field-size field))
+                   (fold (lambda (x prev) (max prev (string-length x))) 0
+                         (field-size field))
+                   (field-size field))
+                   (color form-field-color (inverse #\space)))
+      #:y y
+      #:x x)))
 
 (define (redraw-field form field n)
   "Redraw the FIELD in FORM"
   (draw-field-space (form-window form) field n (form-tabpos form))
 
-  (addchstr (form-window form)
-            (color (color-index-by-symbol 'form-field) (inverse (field-value 
field)))
-            #:y n
-            #:x (form-tabpos form)))
+  (let ((form-field-color (color-index-by-symbol 'form-field)))
+    (addchstr (form-window form)
+              (color form-field-color (inverse (field-value field)))
+              #:y n
+              #:x (form-tabpos form))))
 
 (define (form-set-value! form n str)
   (cond