02/03: installer: page: Prefer forms to buttons when it comes to shortcuts.

[Danny Milosavljevic]

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

commit 357ca698685ce3db2a26266b18af1f672ec5539f
Author: Danny Milosavljevic <address@hidden>
Date:   Tue Jul 4 22:46:59 2017 +0200

    installer: page: Prefer forms to buttons when it comes to shortcuts.
    
    * gnu/system/installer/page.scm (page-default-key-handler): Modify.
---
 gnu/system/installer/page.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/system/installer/page.scm b/gnu/system/installer/page.scm
index d16cda5..d07dfce 100644
--- a/gnu/system/installer/page.scm
+++ b/gnu/system/installer/page.scm
@@ -155,14 +155,15 @@ If a form is used it's assumed that the menu is not used 
and vice versa."
           (form-set-enabled! form #t)))
       'handled)
 
+     ((and form (form-enabled? form))
+      (form-enter form ch))
+
      ((and nav (buttons-fetch-by-key nav ch))
       (buttons-select-by-symbol nav (buttons-fetch-by-key nav ch))
       (page-activate-focused-item page))
 
      (else
-      (if form
-          (form-enter form ch)
-          'ignored)))))
+       'ignored))))
 
 
 (define* (make-page surface title refresh cursor-visibility