X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epg-config.el;h=7d6a8a3612a139667f510a10280ec462151b5431;hb=59b227deceb57a37a91af9cc4edcb5039f0c0b3b;hp=ae4fe00ec70ed2a769dbd64a7220b40e08482054;hpb=590e05e5c3b1e8b799caa0a23c69c4bfc923b98d;p=elisp%2Fepg.git

diff --git a/epg-config.el b/epg-config.el
index ae4fe00..7d6a8a3 100644
--- a/epg-config.el
+++ b/epg-config.el
@@ -42,8 +42,8 @@
   :group 'epg
   :type '(choice (const :tag "Default" nil) directory))
 
-(defcustom epg-locale-coding-system (if (boundp 'locale-coding-system)
-					locale-coding-system)
+(defcustom epg-passphrase-coding-system (if (boundp 'locale-coding-system)
+					    locale-coding-system)
   "Coding system to use with messages from `epg-gpg-program'."
   :group 'epg
   :type 'symbol)
@@ -54,7 +54,7 @@ Note that the buffer name starts with a space."
   :group 'epg
   :type 'boolean)
 
-(defconst epg-version-number "0.0.5")
+(defconst epg-version-number "0.0.8")
 
 (defconst epg-gpg-minimum-version "1.4.3")
 
@@ -78,7 +78,8 @@ Note that the buffer name starts with a space."
 			(cons (cons (downcase (match-string 1 args))
 				    (delete "" (split-string
 						(substring args
-							   (match-end 0)))))
+							   (match-end 0))
+						";")))
 			      groups))
 	    (if epg-debug
 		(message "Invalid group configuration: %S" args))))
@@ -91,7 +92,9 @@ Note that the buffer name starts with a space."
 			  config))
 	    (if epg-debug
 		(message "Invalid %S algorithm configuration: %S"
-			 type args)))))))
+			 type args))))
+	 (t
+	  (setq config (cons (cons type args) config))))))
     (if groups
 	(cons (cons 'groups groups) config)
       config)))