aoeu(): do not use $XKEYBOARD and $KEYTABLE

diff --git a/debian/changelog b/debian/changelog
index 0af1f95..9dba0dd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-etc-core (0.3.13) unstable; urgency=low
+
+  * /etc/zsh/zshrc:
+    - aoeu(): do not use $XKEYBOARD and $KEYTABLE as booting
+      with bootoption dvorak might be not so amusing for people
+      not being used to dvorak keyboard layout :)
+
+ -- Michael Prokop <mika@grml.org>  Sun, 01 Jul 2007 23:05:58 +0200
+
 grml-etc-core (0.3.12) unstable; urgency=low
 
   * Added some more examples to /etc/network/interfaces.examples.

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 9891492..032704d 100644 (file)
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -1411,13 +1411,8 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"."
 
   # just press 'asdf' keys to toggle between dvorak and us keyboard layout
   aoeu() {
-     if [ -n "$XKEYBOARD" -a -n "$KEYTABLE" ] ; then
-        echo -n "Switching to $KEYTABLE keyboard layout: "
-        [ -z "$DISPLAY" ] && $SUDO loadkeys $KEYTABLE &>/dev/null || setxkbmap $XKEYBOARD &>/dev/null
-     else
-        echo -n 'Switching to us keyboard layout: '
-        [ -z "$DISPLAY" ] && $SUDO loadkeys us &>/dev/null || setxkbmap us &>/dev/null
-     fi
+     echo -n 'Switching to us keyboard layout: '
+     [ -z "$DISPLAY" ] && $SUDO loadkeys us &>/dev/null || setxkbmap us &>/dev/null
      echo 'Done'
   }
   asdf() {