* gpg.sgml: Document smartcard related options.

* g10.c, options.h: New option --no-interactive-selection.
* keyedit.c (keyedit_menu): Use it.

1 files changed, 7 insertions, 2 deletions

diff --git a/g10/g10.c b/g10/g10.c
index dd3ebd51f..626ee8786 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -346,14 +346,14 @@ enum cmd_and_opt_values
     oEnableProgressFilter,
     oMultifile,
     oKeyidFormat,
-    oNoop,
+    oNoInteractiveSelection,
 
     oReaderPort,
     octapiDriver,
     opcscDriver,
     oDisableCCID,
 
-    aTest
+    oNoop
   };
 
 
@@ -676,6 +676,7 @@ static ARGPARSE_OPTS opts[] = {
     { oEnableProgressFilter, "enable-progress-filter", 0, "@" },
     { oMultifile, "multifile", 0, "@" },
     { oKeyidFormat, "keyid-format", 2, "@" },
+    { oNoInteractiveSelection, "no-interactive-selection", 0, "@" },
 
     { oReaderPort, "reader-port",    2, "@"},
     { octapiDriver, "ctapi-driver",  2, "@"},
@@ -2542,6 +2543,10 @@ main( int argc, char **argv )
 	    else
 	      log_error("unknown keyid-format `%s'\n",pargs.r.ret_str);
 	    break;
+          case oNoInteractiveSelection:
+            opt.no_interactive_selection = 1;
+            break;
+  
 	  case oNoop: break;
 
 	  default : pargs.err = configfp? 1:2; break;