[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
140/197: installer: Fix the key map option.
From: |
Danny Milosavljevic |
Subject: |
140/197: installer: Fix the key map option. |
Date: |
Mon, 3 Jul 2017 20:37:14 -0400 (EDT) |
dannym pushed a commit to branch wip-installer-2
in repository guix.
commit 6ff724b6fb6bd807b1f8621ff0b53a36a73438d9
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))
- 88/197: installer: Use a cleaner method of detecting wireless capability for ethernet interfaces., (continued)
- 88/197: installer: Use a cleaner method of detecting wireless capability for ethernet interfaces., Danny Milosavljevic, 2017/07/03
- 93/197: installer: Add a dedicated make to format filesystems., Danny Milosavljevic, 2017/07/03
- 100/197: installer: Do not perform tasks more than once., Danny Milosavljevic, 2017/07/03
- 106/197: installer: Properly handle swap partitions when generating the configuration., Danny Milosavljevic, 2017/07/03
- 114/197: installer: Check that swap spaces have not been assigned mount points, Danny Milosavljevic, 2017/07/03
- 112/197: gurses: form: Use match instead of car, cdr etc., Danny Milosavljevic, 2017/07/03
- 125/197: installer: Do not assume the root file system is of type "ext4"., Danny Milosavljevic, 2017/07/03
- 130/197: installer: Delete unused procedure "justify"., Danny Milosavljevic, 2017/07/03
- 134/197: installer: Tolerate an undefined system role in config generation., Danny Milosavljevic, 2017/07/03
- 137/197: installer: Prepare for new wireless network features., Danny Milosavljevic, 2017/07/03
- 140/197: installer: Fix the key map option.,
Danny Milosavljevic <=
- 132/197: installer: Add new procedure to check file system specifications., Danny Milosavljevic, 2017/07/03
- 145/197: gurses: Avoid yet another use of car and cdr., Danny Milosavljevic, 2017/07/03
- 129/197: installer: Emphasise that writing filesystems destroys existing data., Danny Milosavljevic, 2017/07/03
- 150/197: gurses: Reimplement pad-complex-string., Danny Milosavljevic, 2017/07/03
- 159/197: installer: Fix i18n in dialogs., Danny Milosavljevic, 2017/07/03
- 154/197: installer: Main page: Redisplay translatable strings upon refresh., Danny Milosavljevic, 2017/07/03
- 157/197: installer: Replace 'file-browser' with 'key-map'., Danny Milosavljevic, 2017/07/03
- 161/197: installer: Improve i18n in ping page., Danny Milosavljevic, 2017/07/03
- 162/197: gurses: Avoid one use of car/cdr., Danny Milosavljevic, 2017/07/03
- 166/197: installer: Provide verbose description of locale., Danny Milosavljevic, 2017/07/03