mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* options.h, gpg.c (main), misc.c (compliance_option_string): Add
--rfc4880, and make --openpgp an alias to it. --rfc2440 now stands alone. For now, use the old 2440 defaults for 4880. * keyedit.c (keyedit_menu): Use compliance_option_string() instead of printing the compliance modes here.
This commit is contained in:
parent
a5ca9e673f
commit
1ce132213e
5 changed files with 47 additions and 9 deletions
|
@ -1,6 +1,6 @@
|
|||
/* keyedit.c - keyedit stuff
|
||||
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
|
||||
* 2006 Free Software Foundation, Inc.
|
||||
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
|
||||
* 2007 Free Software Foundation, Inc.
|
||||
*
|
||||
* This file is part of GnuPG.
|
||||
*
|
||||
|
@ -1790,7 +1790,7 @@ keyedit_menu( const char *username, STRLIST locusr,
|
|||
{
|
||||
tty_printf(
|
||||
_("This command is not allowed while in %s mode.\n"),
|
||||
RFC2440?"OpenPGP":PGP2?"PGP2":"RFC-1991");
|
||||
compliance_option_string());
|
||||
break;
|
||||
}
|
||||
photo=1;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue