Remove one tab from us.iso.kbd so that it now has no tabs in it. This

is likely the intent of the original author since no other places use
tabs.

Sync us.unix.kdb to us.iso.kbd.  It should now only swap ESC and `~,
bs and delete, control and caps lock and make no other changes from
us.iso.kdb.

2 files changed, 13 insertions, 12 deletions

diff --git a/share/syscons/keymaps/us.iso.kbd b/share/syscons/keymaps/us.iso.kbd
index 11acea5548be..4a87a128b60e 100644
--- a/share/syscons/keymaps/us.iso.kbd
+++ b/share/syscons/keymaps/us.iso.kbd
@@ -105,7 +105,7 @@
   100   fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58  O
   101   fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59  O
   102   fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60  O
-  103	fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 boot   fkey61  O
+  103   fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 boot   fkey61  O
   104   slock  saver  slock  saver  susp   nop    susp   nop     O
   105   fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62  O
   106   fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63  O
diff --git a/share/syscons/keymaps/us.unix.kbd b/share/syscons/keymaps/us.unix.kbd
index 292af60a61c0..7b642ee0577d 100644
--- a/share/syscons/keymaps/us.unix.kbd
+++ b/share/syscons/keymaps/us.unix.kbd
@@ -3,7 +3,7 @@
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
 # ------------------------------------------------------------------
   000   nop    nop    nop    nop    nop    nop    nop    nop     O
-  001   '`'    '~'    nop    nop    '`'    '~'    nop    nop     O
+  001   '`'    '~'    nop    nop    '`'    '~'    debug  nop     O
   002   '1'    '!'    nop    nop    '1'    '!'    nop    nop     O
   003   '2'    '@'    nul    nul    '2'    '@'    nul    nul     O
   004   '3'    '#'    nop    nop    '3'    '#'    nop    nop     O
@@ -43,7 +43,7 @@
   038   'l'    'L'    ff     ff     'l'    'L'    ff     ff      C
   039   ';'    ':'    nop    nop    ';'    ':'    nop    nop     O
   040   '''    '"'    nop    nop    '''    '"'    nop    nop     O
-  041   esc    esc    nop    nop    esc    esc    nop    nop     O
+  041   esc    esc    esc    esc    esc    esc    debug  esc     O
   042   lshift lshift lshift lshift lshift lshift lshift lshift  O
   043   '\'    '|'    fs     fs     '\'    '|'    fs     fs      O
   044   'z'    'Z'    sub    sub    'z'    'Z'    sub    sub     C
@@ -57,9 +57,9 @@
   052   '.'    '>'    nop    nop    '.'    '>'    nop    nop     O
   053   '/'    '?'    nop    nop    '/'    '?'    nop    nop     O
   054   rshift rshift rshift rshift rshift rshift rshift rshift  O
-  055   '*'    '*'    nscr   nscr   '*'    '*'    nscr   nscr    O
+  055   '*'    '*'    '*'    '*'    '*'    '*'    '*'    '*'     O
   056   lalt   lalt   lalt   lalt   lalt   lalt   lalt   lalt    O
-  057   ' '    ' '    nul    ' '    ' '    ' '    ' '    ' '     O
+  057   ' '    ' '    nul    ' '    ' '    ' '    susp   ' '     O
   058   lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl   O
   059   fkey01 fkey13 fkey25 fkey37 scr01  scr11  scr01  scr11   O
   060   fkey02 fkey14 fkey26 fkey38 scr02  scr12  scr02  scr12   O
@@ -86,7 +86,7 @@
   081   fkey59 '3'    '3'    '3'    '3'    '3'    '3'    '3'     N
   082   fkey60 '0'    '0'    '0'    '0'    '0'    '0'    '0'     N
   083   bs     '.'    '.'    '.'    '.'    '.'    boot   boot    N
-  084   us     us     us     us     us     us     us     us      O
+  084   nop    nop    nop    nop    nop    nop    nop    nop     O
   085   nop    nop    nop    nop    nop    nop    nop    nop     O
   086   nop    nop    nop    nop    nop    nop    nop    nop     O
   087   fkey11 fkey23 fkey35 fkey47 scr11  scr11  scr11  scr11   O
@@ -94,7 +94,7 @@
   089   cr     cr     nl     nl     cr     cr     nl     nl      O
   090   rctrl  rctrl  rctrl  rctrl  rctrl  rctrl  rctrl  rctrl   O
   091   '/'    '/'    '/'    '/'    '/'    '/'    '/'    '/'     N
-  092   nscr   nop    debug  nop    nop    nop    nop    nop     O
+  092   nscr   nscr   debug  debug  nop    nop    nop    nop     O
   093   ralt   ralt   ralt   ralt   ralt   ralt   ralt   ralt    O
   094   fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49  O
   095   fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50  O
@@ -105,8 +105,9 @@
   100   fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58  O
   101   fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59  O
   102   fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60  O
-  103	bs     bs     fkey61 fkey61 bs     bs     boot   boot    O
-  104   slock  slock  slock  slock  slock  slock  slock  slock   O
-  105	fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62  O
-  106	fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63  O
-  107	fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64  O
+  103   bs     bs     fkey61 fkey61 bs     bs     boot   boot    O
+  104   slock  saver  slock  saver  susp   nop    susp   nop     O
+  105   fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62  O
+  106   fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63  O
+  107   fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64  O
+  108   nop    nop    nop    nop    nop    nop    nop    nop     O