Add new SVN only file README.maint

doc/
	* gpg.texi (GPG Configuration): Document envvar LANGUAGE.
	(GPG Configuration Options): Document show-primary-uid-only.
g10/
	* gpg.c (main): Add verify option show-primary-uid-only.
	* options.h (VERIFY_SHOW_PRIMARY_UID_ONLY): New.
	* mainproc.c (check_sig_and_print): Implement it.

	* encr-data.c (decrypt_data): Correctly test for unknown algorithm.
	* import.c (check_prefs): Ditto.
	* keyedit.c (show_prefs): Ditto.
	* mainproc.c (proc_symkey_enc): Ditto.

1 files changed, 10 insertions, 4 deletions

diff --git a/g10/import.c b/g10/import.c
index b3857fc0a..7978bbba0 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -603,11 +603,14 @@ check_prefs(KBNODE keyblock)
 		{
 		  if (openpgp_cipher_test_algo (prefs->value))
 		    {
-		      const char *algo = gcry_cipher_algo_name (prefs->value);
+		      const char *algo = 
+                        (gcry_cipher_test_algo (prefs->value)
+                         ? num 
+                         : gcry_cipher_algo_name (prefs->value));
 		      if(!problem)
 			check_prefs_warning(pk);
 		      log_info(_("         \"%s\": preference for cipher"
-				 " algorithm %s\n"),user,algo?algo:num);
+				 " algorithm %s\n"), user, algo);
 		      problem=1;
 		    }
 		}
@@ -615,11 +618,14 @@ check_prefs(KBNODE keyblock)
 		{
 		  if(openpgp_md_test_algo(prefs->value))
 		    {
-		      const char *algo = gcry_md_algo_name (prefs->value);
+		      const char *algo =
+                        (gcry_md_test_algo (prefs->value)
+                         ? num 
+                         : gcry_md_algo_name (prefs->value));
 		      if(!problem)
 			check_prefs_warning(pk);
 		      log_info(_("         \"%s\": preference for digest"
-				 " algorithm %s\n"),user,algo?algo:num);
+				 " algorithm %s\n"), user, algo);
 		      problem=1;
 		    }
 		}