Added filename completion to bash_completion_nmh.

diff --git a/etc/bash_completion_nmh-gen b/etc/bash_completion_nmh-gen
index 5a97a91493615cbce7928c9c7488c473f645b99e..7cd061418aaecaa6b00c4b0f1ac55fc0d3e733ce 100755 (executable)
--- a/etc/bash_completion_nmh-gen
+++ b/etc/bash_completion_nmh-gen
@@ -28,7 +28,7 @@ prog_switches() {
 
 cat <<'EOF'
 # bash completions for nmh commands                        -*- shell-script -*-
 
 cat <<'EOF'
 # bash completions for nmh commands                        -*- shell-script -*-

-# This file was generated by COMPLETION-BASH-gen.
+# This file was generated by etc/bash_completion_nmh-gen.

 #
 # This code is Copyright (c) 2016, by the authors of nmh.
 # See the COPYRIGHT file in the root directory of the nmh
 #
 # This code is Copyright (c) 2016, by the authors of nmh.
 # See the COPYRIGHT file in the root directory of the nmh


@@ -40,6 +40,8 @@ _nmh() {
   local -a switches
 
   COMPREPLY=()
   local -a switches
 
   COMPREPLY=()

+  #### Complete filenames.
+  compopt -o default

 
   case ${COMP_WORDS[COMP_CWORD]} in
   -*) case $1 in
 
   case ${COMP_WORDS[COMP_CWORD]} in
   -*) case $1 in


@@ -64,10 +66,12 @@ cat <<'EOF'
 
   +*) switches=($(folder -all -fast -recurse | sed 's/^/+/')) ;;
 
 
   +*) switches=($(folder -all -fast -recurse | sed 's/^/+/')) ;;
 

-  [flc.np]*) switches=(first last cur . next prev) ;;
+  #### Complete special message names, except after -file.  The compopt -o default above provides filename completions.  Assume that -file was fully completed, so don't need to match -fil, etc.
+  [flc.np]*) [ ${COMP_CWORD:-0} -lt 2  -o  ${COMP_WORDS[$(($COMP_CWORD - 1))]} != -file ]  &&
+                 switches=(first last cur . next prev) ;;

   esac
 
   esac
 

-  #### Special case.
+  #### Special case:  add "new" to mhpath's completions.

   [ $1 = mhpath ]  &&  switches=("${switches[*]}" + new)
 
   COMPREPLY=($(compgen -W "${switches[*]}" -- ${COMP_WORDS[COMP_CWORD]}))
   [ $1 = mhpath ]  &&  switches=("${switches[*]}" + new)
 
   COMPREPLY=($(compgen -W "${switches[*]}" -- ${COMP_WORDS[COMP_CWORD]}))