From c5e9ba4f89212d8a5f8f9bceb77ca1dfa8518196 Mon Sep 17 00:00:00 2001 From: ueno Date: Mon, 4 Sep 2006 06:16:18 +0000 Subject: [PATCH] epg-passphrase-coding-system -> epg-locale-coding-system. --- ChangeLog | 2 +- epg-config.el | 7 ++++--- epg.el | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9c8adc..723f44f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ 2006-09-04 Daiki Ueno - * epg-config.el (epg-passphrase-coding-system): New user option. + * epg-config.el (epg-locale-coding-system): New user option. * epg.el (epg--list-keys-1): Respect epg-gpg-home-directory. (epg--clear-string): New function. diff --git a/epg-config.el b/epg-config.el index 3f15d90..b63bfa2 100644 --- a/epg-config.el +++ b/epg-config.el @@ -38,12 +38,13 @@ :type 'string) (defcustom epg-gpg-home-directory nil - "The directory which contains the `gpg' configuration files." + "The directory which contains the configuration files of `epg-gpg-program'." :group 'epg :type '(choice (const :tag "Default" nil) directory)) -(defcustom epg-passphrase-coding-system nil - "The coding-system used to type passphrases." +(defcustom epg-locale-coding-system (if (boundp 'locale-coding-system) + locale-coding-system) + "Coding system to use with messages from `epg-gpg-program'." :group 'epg :type 'symbol) diff --git a/epg.el b/epg.el index 13fd55b..0191a01 100644 --- a/epg.el +++ b/epg.el @@ -951,12 +951,12 @@ This function is for internal use only." (setq passphrase-with-new-line (concat passphrase "\n")) (epg--clear-string passphrase) (setq passphrase nil) - (if epg-passphrase-coding-system + (if epg-locale-coding-system (progn (setq encoded-passphrase-with-new-line (encode-coding-string passphrase-with-new-line - epg-passphrase-coding-system)) + epg-locale-coding-system)) (epg--clear-string passphrase-with-new-line) (setq passphrase-with-new-line nil)) (setq encoded-passphrase-with-new-line -- 1.7.10.4