From d7a8824aeaf72569a43d2a5f19d87af1a63d289b Mon Sep 17 00:00:00 2001
From: markus schnalke <meillo@marmaro.de>
Date: Fri, 10 Feb 2012 11:13:25 +0100
Subject: [PATCH] Updated shell completion files to recent changes in the
 programs. Well, some of the changes were not so recent.

---
 docs/COMPLETION-BASH |   30 ++++++++++++++----------------
 docs/COMPLETION-ZSH  |   10 +++++-----
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/docs/COMPLETION-BASH b/docs/COMPLETION-BASH
index 926def4..3f3829c 100644
--- a/docs/COMPLETION-BASH
+++ b/docs/COMPLETION-BASH
@@ -41,7 +41,7 @@ _nmh()
                     -noverbose -version -help)
             ;;
         comp )
-            options=(-form -use -nouse -file
+            options=(-form -use -nouse
                     -editor -noedit -whatnowproc -nowhatnowproc
                     -version -help )
            ;;
@@ -53,18 +53,17 @@ _nmh()
         folder* )
             options=(-all -noall -create -nocreate -fast -nofast -header
                     -noheader -recurse -norecurse -total -nototal -list -nolist
-                    -push -pop -pack -nopack -print -verbose -noverbose -version
-                    -help)
+                    -push -pop -pack -nopack -print -verbose -noverbose
+                    -version -help)
             ;;
         forw )
-            options=(-annotate -noannotate -form -format -noformat
-                    -filter -mime -nomime
+            options=(-annotate -noannotate -form
                     -editor -noedit -whatnowproc
-                    -nowhatnowproc -build -file
+                    -nowhatnowproc -build
                     -version -help)
             ;;
         inc )
-            options=(-audit -noaudit -changecur -nochangecur -form -format
+            options=(-audit -noaudit -changecur -nochangecur -form
                     -file -silent -nosilent -truncate -notruncate -width
                     -version -help)
             ;;
@@ -77,7 +76,7 @@ _nmh()
                     -nocheckmime -version -help)
             ;;
         packf )
-            options=(-file -mbox -mmdf -version -help)
+            options=(-file -version -help)
             ;;
         pick )
             options=(-and -or -not -lbrace -rbrace --component -cc
@@ -90,14 +89,13 @@ _nmh()
                     -nocheckmime -version -help)
             ;;
         refile )
-            options=(-draft -link -nolink -preserve -nopreserve -unlink
+            options=(-link -nolink -preserve -nopreserve -unlink
                     -nounlink -src -file -rmmproc -normmproc -version -help)
             ;;
         repl )
             options=(-annotate -noannotate -group -nogroup -cc
-                    -nocc -query -noquery -form -format -noformat -filter
-                    -mime -nomime -width
-                    -editor -noedit -whatnowproc
+                    -nocc -query -noquery -form -filter -nofilter
+                    -mime -nomime -editor -noedit -whatnowproc
                     -nowhatnowproc -build -file -version -help)
             ;;
         rmf )
@@ -107,11 +105,11 @@ _nmh()
             options=(-link -nolink -version -help)
             ;;
         scan )
-            options=(-clear -noclear -form -format -header -noheader
+            options=(-clear -noclear -form -header -noheader
                     -width -file -version -help )
             ;;
         show )
-            options=(-draft -showproc -showmimeproc -header -noheader
+            options=(-showproc -showmimeproc -header -noheader
                     -checkmime -nocheckmime -version -help)
             ;;
         sortm )
@@ -132,13 +130,13 @@ _nmh()
     +([0-9a-z])-* )
         # Partial range
         start=${current/%-*/}
-        options=( $( scan $folder -format "%(msg)" "${start}-last" ) first prev cur next last )
+        options=( $( scan $folder -form "=%(msg)" "${start}-last" ) first prev cur next last )
         options=( ${options[@]//#/${start}-} )
         ;;
 
     +([0-9]) )
         # Message number, or start of range
-        options=( $( scan $folder -format "%(msg)" ) first prev cur next last )
+        options=( $( scan $folder -form "=%(msg)" ) first prev cur next last )
         options=( ${options[@]} ${options[@]//%/-} )
         ;;
 
diff --git a/docs/COMPLETION-ZSH b/docs/COMPLETION-ZSH
index 16e3e0d..f6d0197 100644
--- a/docs/COMPLETION-ZSH
+++ b/docs/COMPLETION-ZSH
@@ -123,19 +123,19 @@ compctl -K mhfseq -x 's[+][@],c[-1] s[+][@]' \
   -K mhcomp -S / -q - 'c[-1]' -K mhfseq - \
   'C[-1,-(editor|whatnowproc)]' -c - \
   's[-]' -k "(editor noedit \
-  file form use nouse whatnowproc nowhatnowproc help)" - \
+  form use nouse whatnowproc nowhatnowproc help)" - \
   'c[-1,-form]' -K mhfile -- comp
 
 compctl -K mhfseq -x 's[+][@]' \
   -K mhcomp -S / -q - 'c[-1]'  -K mhfseq -\
   's[-]' -k "(annotate noannotate cc nocc \
-  editor noedit filter form group nogroup \
+  editor noedit filter nofilter form group nogroup \
   query noquery width whatnowproc nowhatnowproc help)" - 'c[-1,(cc|nocc)]' \
   -k "(all to cc me)" - 'C[-1,-(filter|form)]' -K mhfile - \
   'C[-1,-(editor|whatnowproc)]' -c -- repl
 
 compctl -K mhfseq -x 's[+][@]' -K mhcomp -S / -q - \
-  's[-]' -k "(audit noaudit changecur nochangecur form format \
+  's[-]' -k "(audit noaudit changecur nochangecur form \
   file silent nosilent truncate notruncate width help)" - \
   'C[-1,-(audit|form)]' -K mhfile - 'c[-1,-file]' -f + -- inc
 
@@ -145,11 +145,11 @@ compctl -K mhfseq -x 's[+][@]' -K mhcomp -S / -q - \
 
 compctl -K mhfseq -x 's[+][@]' \
   -K mhcomp -S / -q - 'c[-1,-file]' -f - 'c[-1,-rmmprov]' -c - \
-  's[-]' -k "(draft link nolink preserve nopreserve src file \
+  's[-]' -k "(link nolink preserve nopreserve src file \
   rmmproc normmproc help)" -- refile
 
 compctl -K mhfseq -x 's[+][@]' -K mhcomp -S / -q - \
-  's[-]' -k "(clear noclear form format header noheader \
+  's[-]' -k "(clear noclear form \
   file help width)" - 'c[-1,-file]' -f - 'c[-1,-form]' -K mhfile -- scan
 
 compctl -K mhfseq -x 's[+][@]'  -K mhcomp -S / -q - \
-- 
1.7.10.4