Apply patches from issue398 - zsh completion

diff --git a/debian/changelog b/debian/changelog
index befadd0..9ade3ea 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+grml-x (0.4.2) unstable; urgency=low
+
+  * Improve zsh completion:
+    - use double brackets for the test command
+    - make sure the right usage text gets displayed
+    - support fallback options
+
+    Thanks to ft and z3ttacht for their work! [Closes: issue398]
+
+ -- Michael Prokop <mika@grml.org>  Thu, 12 Feb 2009 17:56:36 +0100
+
 grml-x (0.4.1) unstable; urgency=low
 
   * Do not display usage information when using the -nostart option.

diff --git a/etc/zsh/completion.d/_grml-x b/etc/zsh/completion.d/_grml-x
index e2734a3..ae2a67f 100644 (file)
--- a/etc/zsh/completion.d/_grml-x
+++ b/etc/zsh/completion.d/_grml-x
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sam Nov 17 18:59:26 CET 2007 [mika]
 ################################################################################
 
 local arguments wm
@@ -16,18 +15,19 @@ for wm in awesome blackbox dwm evilwm fluxbox fvwm fvwm2 fvwm-crystal      \
           gnome-session gnomesession icewm ion2 ion3 jwm larswm openbox    \
          particleman pekwm pwm3 ratpoison startkde twm w9wm windowlab wmi \
          wmii wm-ng xfce4 xfwm4 xmonad ; do
-    [ -x /usr/bin/$wm ] && wms+=$wm
+    [[ -x /usr/bin/$wm ]] && wms+=$wm
 done
 
 arguments=(
   '-composite[enable composite extension (disabled by default)]'
-  '-display:display for xserver:(7 8)'
+  '-display[display for xserver]:display:(7 8)'
+  '-fallback[use xorg.conf.example to get X running when it won'\''t start otherwise]'
   '-force[force creation of xconfig file]'
-  '-help:[display help]'
+  '-help[display help]:'
   '-genmouse[generate generic entry for mouse using /dev/input/mice and auto protocol]'
-  '-hsync:horizontal sync frequencies (<number>):(28 `seq 30 5 95` 96)'
-  '-mode:resolution-mode for xserver (<width>x<height> - e.g. 1024x768)]:(1920x1440 1600x1200 1400x1050 1280x1024 1280x960 1024x768 800x600 640x480)'
-  '-module:module for xserver :(`cd /usr/lib/xorg/modules/drivers/ && /bin/ls *.so | sed -e 's/_drv.so//' -e 's/.so//'`)'
+  '-hsync[horizontal sync frequencies (<number>)]:hsync frequencies:(28 `seq 30 5 95` 96)'
+  '-mode[resolution-mode for xserver (<width>x<height> - e.g. 1024x768)]:resolutions:(1920x1440 1600x1200 1400x1050 1280x1024 1280x960 1024x768 800x600 640x480)'
+  '-module[module for xserver]:modules:(`cd /usr/lib/xorg/modules/drivers/ && /bin/ls *.so | sed -e 's/_drv.so//' -e 's/.so//'`)'
   '-nodpms[disable Display Power Management Signaling]'
   '-noddc[use static resolution modes for monitors without support for ddc probing]'
   '-nohsync[do not activate HorizSync-entry]'
@@ -37,7 +37,7 @@ arguments=(
   '-novref[do not activate VertRefresh-entry]'
   '-ps2[add entry for PS/2 mouse]'
   '-usb[add entry for USB mouse]'
-  '-vsync:vertical sync frequencies (<number>):(43 `seq 45 5 70` 72)'
+  '-vsync[vertical sync frequencies (<number>)]:vsync frequencies:(43 `seq 45 5 70` 72)'
   '-xinerama[try to set up multihead using Xinerama setup]'
   ':window manager:($wms)'
 )

diff --git a/grml-x.txt b/grml-x.txt
index 09127d1..583d4c4 100644 (file)
--- a/grml-x.txt
+++ b/grml-x.txt
@@ -60,6 +60,10 @@ XOPTS='...'::
 -display <number>::
         Specify display for use with Xserver.
 
+-fallback::
+        Copy /etc/X11/xorg.conf.example to /etc/X11/xorg.conf to get X
+        running when it won't start otherwise.
+
 -force::
         Force creation of xorg.conf file. This option is also assumed when another
         option which needs to be write values to the X config file is provided. The old