projects / packages / kbd.git / blame
| Commit | Line | Data |
|---|---|---|
| 93695b30 ER |
1 | --- kbd-1.15.3/src/unicode_start~ 2011-08-23 08:14:50.523611798 +0300 |
| 2 | +++ kbd-1.15.3/src/unicode_start 2011-08-23 08:14:24.636851881 +0300 | |
| 3 | @@ -34,29 +36,34 @@ | |
| 4 | # not the global keymap. root will have to load the keymap in unicode mode | |
| 5 | # explicitly. | |
| cece0307 | 6 | |
| 93695b30 ER |
7 | -uid="`id -u 2>/dev/null`" ||: |
| 8 | -if [ "$uid" = '0' ]; then | |
| 9 | - # There is no way of reverting the effect of "dumpkeys | loadkeys --unicode", | |
| 10 | - # the memory of the earlier keymap is lost. Therefore, try | |
| 11 | - # to save a copy of the original keymap to be able to reload it in unicode_stop. | |
| 12 | - # (see also http://mail.nl.linux.org/linux-utf8/2003-08/msg00053.html): | |
| 13 | - | |
| 14 | - [ -n "$HOME" -a "$HOME" != '/' ] || | |
| 15 | - HOME='/root' | |
| 16 | - | |
| 17 | - if [ -d "$HOME" -a -w "$HOME" ]; then | |
| 18 | - [ -d "$HOME/.kbd" ] || | |
| 19 | - mkdir -- "$HOME/.kbd" | |
| 20 | - | |
| 21 | - [ ! -w "$HOME/.kbd" ] || | |
| 22 | - dumpkeys > "$HOME/.kbd/.keymap_sv" | |
| 23 | - fi | |
| 24 | - | |
| 25 | - # redirect stderr and stdout of loadkeys to /dev/null to avoid the confusing | |
| 26 | - # "plus before udiaeresis ignored" warnings. | |
| 27 | - | |
| cece0307 | 28 | - dumpkeys | loadkeys --unicode > /dev/null 2>&1 |
| 93695b30 ER |
29 | -fi |
| 30 | +# PLD Linux: disabled because it breaks non-iso-8859-1 keymaps | |
| 31 | +# instead use manually: | |
| 32 | +# loadkeys --unicode <keymap> | |
| 33 | +# or | |
| 34 | +# dumpkeys -c <charset> | loadkeys --unicode | |
| 35 | + | |
| 36 | +#uid="`id -u 2>/dev/null`" ||: | |
| 37 | +#if [ "$uid" = '0' ]; then | |
| 38 | +# # There is no way of reverting the effect of "dumpkeys | loadkeys --unicode", | |
| 39 | +# # the memory of the earlier keymap is lost. Therefore, try | |
| 40 | +# # to save a copy of the original keymap to be able to reload it in unicode_stop. | |
| 41 | +# # (see also http://mail.nl.linux.org/linux-utf8/2003-08/msg00053.html): | |
| 42 | +# | |
| 43 | +# [ -n "$HOME" -a "$HOME" != '/' ] || | |
| 44 | +# HOME='/root' | |
| 45 | +# | |
| 46 | +# if [ -d "$HOME" -a -w "$HOME" ]; then | |
| 47 | +# [ -d "$HOME/.kbd" ] || | |
| 48 | +# mkdir -- "$HOME/.kbd" | |
| 49 | +# | |
| 50 | +# [ ! -w "$HOME/.kbd" ] || | |
| 51 | +# dumpkeys > "$HOME/.kbd/.keymap_sv" | |
| 52 | +# fi | |
| 53 | +# | |
| 54 | +# # redirect stderr and stdout of loadkeys to /dev/null to avoid the confusing | |
| 55 | +# # "plus before udiaeresis ignored" warnings. | |
| 56 | +# #dumpkeys | loadkeys --unicode > /dev/null 2>&1 | |
| 57 | +#fi | |
| cece0307 JB |
58 | |
| 59 | # 2. The output side: the console screen. | |
| 93695b30 | 60 |