X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epg.el;h=bcf3675a929e421641b2f66c73a7b2af59e37506;hb=3ac19de3136bb8dec6581b8ef49a3e04c3c656a9;hp=672a7a994d2217921caa6128bbf1226e241646de;hpb=6d1e1b5ddaab0ab6da8d5d14d73469ca5c4497ce;p=elisp%2Fepg.git

diff --git a/epg.el b/epg.el
index 672a7a9..bcf3675 100644
--- a/epg.el
+++ b/epg.el
@@ -168,7 +168,7 @@
 				   compress-algorithm)
   "Return a context object."
   (cons 'epg-context
-	(vector protocol armor textmode include-certs
+	(vector (or protocol 'OpenPGP) armor textmode include-certs
 		cipher-algorithm digest-algorithm compress-algorithm
 		#'epg-passphrase-callback-function
 		#'epg-progress-callback-function
@@ -594,7 +594,11 @@ This function is for internal use only."
 	    "No public key for "))
      (epg-signature-key-id signature)
      (if user-id
-	 (concat " from " user-id " ")
+	 (concat " from "
+		 (if (stringp user-id)
+		     user-id
+		   (epg-decode-dn user-id))
+		 " ")
        "")
      (if (epg-signature-validity signature)
 	 (format "(trust %s)"  (epg-signature-validity signature))