[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/21: installer: Fix the key map option.
From: |
John Darrington |
Subject: |
11/21: installer: Fix the key map option. |
Date: |
Sun, 29 Jan 2017 07:35:02 +0000 (UTC) |
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))
- 09/21: installer: Clear the mount point field for swap file systems., (continued)
- 09/21: installer: Clear the mount point field for swap file systems., John Darrington, 2017/01/29
- 03/21: installer: Add new procedure to check file system specifications., John Darrington, 2017/01/29
- 01/21: installer: Delete unused procedure "justify"., John Darrington, 2017/01/29
- 20/21: gurses: Add new procedure "word-endings"., John Darrington, 2017/01/29
- 14/21: gurses: Add predicate to test if a complex char is blank., John Darrington, 2017/01/29
- 12/21: gurses: Avoid one usage of car and cdr., John Darrington, 2017/01/29
- 15/21: gurses: Avoid one more use of car and cdr., John Darrington, 2017/01/29
- 13/21: gurses: xchar->char: New procedure., John Darrington, 2017/01/29
- 19/21: installer: Support WEP encrypted wireless., John Darrington, 2017/01/29
- 16/21: gurses: Avoid yet another use of car and cdr., John Darrington, 2017/01/29
- 11/21: installer: Fix the key map option.,
John Darrington <=
- 18/21: gurses: In paragraph-format avoid use of car and cdr., John Darrington, 2017/01/29
- 06/21: installer: Use a "hard" method of rebooting. Do not rely on shepherd., John Darrington, 2017/01/29
- 10/21: installer: Allow file system specifications to be removed., John Darrington, 2017/01/29
- 17/21: gurses: Use match instead of car/cdr in line-split., John Darrington, 2017/01/29
- 21/21: gurses: Reimplement pad-complex-string., John Darrington, 2017/01/29