From 24c376fab8b0785deeb6e1df796624a035090b20 Mon Sep 17 00:00:00 2001 From: ueno Date: Wed, 13 Sep 2006 03:54:36 +0000 Subject: [PATCH] * epg-config.el (epg-passphrase-coding-system): Renamed from epg-locale-coding-system. --- ChangeLog | 5 +++++ epg-config.el | 4 ++-- epg.el | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7edd188..3abbc46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-09-13 Daiki Ueno + + * epg-config.el (epg-passphrase-coding-system): Renamed from + epg-locale-coding-system. + 2006-09-11 Daiki Ueno * epa-file.el (epa-file-decode-and-insert): New function which diff --git a/epg-config.el b/epg-config.el index 3151d5a..8828479 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) diff --git a/epg.el b/epg.el index 1f16e70..06a10ed 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-locale-coding-system + (if epg-passphrase-coding-system (progn (setq encoded-passphrase-with-new-line (encode-coding-string passphrase-with-new-line - epg-locale-coding-system)) + epg-passphrase-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