X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=docs%2FCOMPLETION-ZSH;h=f6d0197682474289ccb65fb408d3431e8e85e836;hp=d2ba02ca45bca55ec3cabe35b6270f6941b967b4;hb=d7a8824aeaf72569a43d2a5f19d87af1a63d289b;hpb=f480c03187724e54e5391ee61b810827da319a6c

diff --git a/docs/COMPLETION-ZSH b/docs/COMPLETION-ZSH
index d2ba02c..f6d0197 100644
--- a/docs/COMPLETION-ZSH
+++ b/docs/COMPLETION-ZSH
@@ -43,8 +43,7 @@ function mhcomp {
 #
 # Extract nmh message names and numbers for completion.  Use of the
 # correct folder, if it is not the current one, requires that it
-# should be the previous command line argument.  If the previous
-# argument is `-draftmessage', a hard wired draft folder name is used.
+# should be the previous command line argument.
 #
 mhfseq() {
   local folder foldpath words pos nums
@@ -55,11 +54,6 @@ mhfseq() {
   # First try the previous word.
   if [[ $words[$pos-1] = [@+]* ]]; then
     folder=$words[$pos-1]
-  # Next look and see if we're looking for a draftmessage
-  elif [[ $words[$pos-1] = -draftmessage ]]; then
-    # EDIT ME:  shortcut -- hard-wire draftfolder here
-    # Should really look for a +draftfolder argument.
-    folder=+drafts
   fi
   # Else use the current folder ($folder empty)
 
@@ -125,23 +119,23 @@ compctl -K mhfseq -x 's[+][@]' -K mhcomp -S / -q - \
   's[-]' -k "(sequence all noall recurse norecurse showzero noshowzero \
   alpha noalpha fast nofast help)" -- flist flists
 
-compctl -K mhfseq -x 's[+][@],c[-1,-draftfolder] s[+][@]' \
-  -K mhcomp -S / -q - 'c[-1,-draftmessage]' -K mhfseq - \
+compctl -K mhfseq -x 's[+][@],c[-1] s[+][@]' \
+  -K mhcomp -S / -q - 'c[-1]' -K mhfseq - \
   'C[-1,-(editor|whatnowproc)]' -c - \
-  's[-]' -k "(draftfolder draftmessage nodraftfolder editor noedit \
-  file form use nouse whatnowproc nowhatnowproc help)" - \
+  's[-]' -k "(editor noedit \
+  form use nouse whatnowproc nowhatnowproc help)" - \
   'c[-1,-form]' -K mhfile -- comp
 
 compctl -K mhfseq -x 's[+][@]' \
-  -K mhcomp -S / -q - 'c[-1,-draftmessage]'  -K mhfseq -\
-  's[-]' -k "(annotate noannotate cc nocc draftfolder nodraftfolder \
-  draftmessage editor noedit fcc filter form group nogroup inplace noinplace
+  -K mhcomp -S / -q - 'c[-1]'  -K mhfseq -\
+  's[-]' -k "(annotate noannotate cc nocc \
+  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
 
@@ -151,16 +145,16 @@ 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 reverse noreverse \
+  '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 - \
   's[-]' -k "(draft form moreproc nomoreproc header noheader \
-   showproc noshowproc length width help)" - 'C[-1,-(show|more)proc]' -c - \
+   showproc length width help)" - 'C[-1,-(show|more)proc]' -c - \
    'c[-1,-file]' -f - 'c[-1,-form]' -K mhfile - \
    'c[-1,-length]' -s '$LINES' - 'c[-1,-width]' -s '$COLUMNS' -- show next prev
 
@@ -172,9 +166,4 @@ compctl -K mhfseq -x 's[+][@]' -K mhcomp -S / -q - \
   public nopublic search sequence subject to zero nozero not or and \
   lbrace rbrace)" -- pick
 
-compctl -K mhfseq -x 's[+][@]' -K mhcomp -S / -q - 's[-]' \
-  -k "(alias check draft draftfolder draftmessage help nocheck \
-  nodraftfolder)" -- whom
-
 compctl -K mhfseq -x 's[+][@]' -K mhcomp -S / -q - 's[-]' -k '(help)' -- mhpath
-