X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=docs%2FCOMPLETION-BASH;h=e4af65d2b8c12fd288dac8ac22885e62ee5e5249;hp=e77e152ef1c7f8ceb48aca779a612d756cc79615;hb=5ee5d678d59cf1deea31126bc886333f1be4571d;hpb=ab7b48411962d26439f92f35ed084d3d6275459c

diff --git a/docs/COMPLETION-BASH b/docs/COMPLETION-BASH
index e77e152..e4af65d 100644
--- a/docs/COMPLETION-BASH
+++ b/docs/COMPLETION-BASH
@@ -13,7 +13,7 @@ _nmh()
     prev=${COMP_WORDS[COMP_CWORD-1]}
     command=$1
 
-    orig_opts=$(shopt -p extglob) 
+    orig_opts=$(shopt -p extglob)
     shopt -s extglob
 
     # Get the folder, if specified
@@ -21,30 +21,30 @@ _nmh()
     do
         case "${COMP_WORDS[i]}" in
         \++([a-zA-Z_]) )
-            folder=${COMP_WORDS[i]} 
+            folder=${COMP_WORDS[i]}
             origfolder=$( folder -f )
             ;;
         esac
     done
 
-    case $current in 
-    -* ) 
+    case $current in
+    -* )
         # Command-line switches for the most common commands.
         case $command in
-        ali ) 
+        ali )
             # no sequences or messages
             options=(-alias -list -nolist -normalize -nonormalize -user
                     -nouser -version -help)
             ;;
-        burst ) 
+        burst )
             options=(-inplace -noinplace -quiet -noquiet -verbose
                     -noverbose -version -help)
             ;;
         comp )
-            options=(-form -use -nouse -file -draftfolder -draftmessage
-                    -nodraftfolder -editor -noedit -whatnowproc -nowhatnowproc
+            options=(-form -use -nouse
+                    -editor -noedit -whatnowproc -nowhatnowproc
                     -version -help )
-           ;; 
+           ;;
         flist* )
             options=(-sequence -all -noall -showzero -noshowzero
                     -recurse -norecurse -fast -nofast -alpha -noalpha -version
@@ -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 -inplace -noinplace -mime -nomime -draftfolder
-                    -draftmessage -nodraftfolder -editor -noedit -whatnowproc
-                    -nowhatnowproc -dashstuffing -nodashstuffing -build -file
+            options=(-annotate -noannotate -form
+                    -editor -noedit -whatnowproc
+                    -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
-                    -inplace -noinplace -mime -nomime -fcc -width -draftfolder
-                    -draftmessage -nodraftfolder -editor -noedit -whatnowproc
+                    -nocc -query -noquery -form -filter -nofilter
+                    -mime -nomime -editor -noedit -whatnowproc
                     -nowhatnowproc -build -file -version -help)
             ;;
         rmf )
@@ -107,21 +105,17 @@ _nmh()
             options=(-link -nolink -version -help)
             ;;
         scan )
-            options=(-clear -noclear -form -format -header -noheader
-                    -width -reverse -noreverse -file -version -help )
+            options=(-form -header -noheader
+                    -width -file -version -help )
             ;;
         show )
-            options=(-draft -showproc -showmimeproc -header -noheader
+            options=(-showproc -showmimeproc -header -noheader
                     -checkmime -nocheckmime -version -help)
             ;;
         sortm )
             options=(-datefield -textfield -notextfield -limit -nolimit
                     -verbose -noverbose -version -help)
             ;;
-        whom )
-            options=(-alias -check -nocheck -draft -draftfolder
-                    -draftmessage -nodraftfolder -version -help)
-            ;;
         * )
             options=(-help -version -seq)
             ;;
@@ -136,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[@]//%/-} )
         ;;
 
@@ -161,4 +155,4 @@ _nmh()
     COMPREPLY=( $( compgen -W "${options[*]}" -- $current ) )
     return 0
 }
-[ "$have" ] && complete -F _nmh ali anno burst comp dist flist flists folder folders forw inc mark mhbuild mhl mhlist mhmail mhn mhparam mhpath mhshow mhstore msgchk msh next packf pick prev prompter rcvdist rcvpack rcvstore rcvtty  refile repl rmf rmm scan send sendfiles show slocal sortm whatnow whom 
+[ "$have" ] && complete -F _nmh ali anno burst comp dist flist flists folder folders forw inc mark mhbuild mhl mhlist mhmail mhparam mhpath mhshow mhstore msgchk next packf pick prev prompter rcvdist rcvpack rcvstore refile repl rmf rmm scan send sendfiles show slocal sortm whatnow