11/21: installer: Fix the key map option.

[John Darrington]

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

commit 09ce81b1a8488bfd7e9f33dd53dd3580c760c227
Author: John Darrington <address@hidden>
Date:   Wed Jan 25 17:27:58 2017 +0100

    installer: Fix the key map option.
    
    * gnu/system/installer/key-map.scm (make-file-browser): Remove exit-point 
parameter.
    * gnu/system/installer/guixsd-installer.scm (main-options): Deal with the 
consequences.
---
 gnu/system/installer/guixsd-installer.scm |    3 +--
 gnu/system/installer/key-map.scm          |    9 ++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/gnu/system/installer/guixsd-installer.scm 
b/gnu/system/installer/guixsd-installer.scm
index aa6095e..57ee03f 100644
--- a/gnu/system/installer/guixsd-installer.scm
+++ b/gnu/system/installer/guixsd-installer.scm
@@ -177,8 +177,7 @@
        (let* ((keymap-directory
                (string-append (dirname loadkeys-directory) 
"/../share/keymaps"))
               (p (make-file-browser
-                  page keymap-directory
-                  page-stack)))
+                  page keymap-directory)))
          (page-enter p)))))))
 
 (define (do-task task-name page)
diff --git a/gnu/system/installer/key-map.scm b/gnu/system/installer/key-map.scm
index 95ba603..59ef778 100644
--- a/gnu/system/installer/key-map.scm
+++ b/gnu/system/installer/key-map.scm
@@ -32,16 +32,13 @@
      str)))
 
 
-(define* (make-file-browser parent directory #:optional (exit-point #f))
+(define* (make-file-browser parent directory)
   (let ((page (make-page (page-surface parent)
                        (gettext "File Browser")
                        file-browser-page-refresh
                         0
                        file-browser-page-key-handler)))
     (page-set-datum! page 'directory directory)
-    (if exit-point
-       (page-set-datum! page 'exit-point exit-point)
-       (page-set-datum! page 'exit-point (page-datum parent 'exit-point)))
     page))
 
 
@@ -72,11 +69,13 @@
        (if (eq? 'directory (stat:type (stat new-dir)))
            (let ((p (make-file-browser
                      page new-dir)))
+              ;; Don't go back to the current page!
+              (set! page-stack (cdr page-stack))
               (page-enter p))
            (begin
               (system* "loadkeys" i)
               (set! key-map i)
-              (page-leave (page-datum page 'exit-point))
+              (page-leave)
               #f)))))
     (std-menu-key-handler menu ch)
     #f))