From 02fe6d3687e641a0935933a5a22fd3c94d50a6f3 Mon Sep 17 00:00:00 2001
From: ueno <ueno>
Date: Sun, 25 Mar 2007 00:12:03 +0000
Subject: [PATCH] * epa.el (epa-protocol): defcustom -> defvar. (epa-armor):
 Ditto. (epa-textmode): Ditto.

---
 ChangeLog |    6 ++++++
 epa.el    |   33 +++++++++++++++------------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c9d58c1..6e4c09e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-25  Daiki Ueno  <ueno@unixuser.org>
+
+	* epa.el (epa-protocol): defcustom -> defvar.
+	(epa-armor): Ditto.
+	(epa-textmode): Ditto.
+
 2007-03-24  Daiki Ueno  <ueno@unixuser.org>
 
 	* epa.el (epa-select-keys): Simplified; don't select the first
diff --git a/epa.el b/epa.el
index 2e5811e..f6c890c 100644
--- a/epa.el
+++ b/epa.el
@@ -33,22 +33,6 @@
   "The EasyPG Assistant"
   :group 'epg)
 
-(defcustom epa-protocol 'OpenPGP
-  "The default protocol."
-  :type '(choice (const :tag "OpenPGP" OpenPGP)
-		 (const :tag "CMS" CMS))
-  :group 'epa)
-
-(defcustom epa-armor nil
-  "If non-nil, epa commands create ASCII armored output."
-  :type 'boolean
-  :group 'epa)
-
-(defcustom epa-textmode nil
-  "If non-nil, epa commands treat input files as text."
-  :type 'boolean
-  :group 'epa)
-
 (defcustom epa-popup-info-window t
   "If non-nil, status information from epa commands is displayed on
 the separate window."
@@ -168,6 +152,19 @@ the separate window."
     (17 . ?D)
     (20 . ?G)))
 
+(defvar epa-protocol 'OpenPGP
+  "The default protocol.
+The values can be either OpenPGP or CMS.
+You should bind this variable with `let', but do not set it globally.")
+
+(defvar epa-armor nil
+  "If non-nil, epa commands create ASCII armored output.
+You should bind this variable with `let', but do not set it globally.")
+
+(defvar epa-textmode nil
+  "If non-nil, epa commands treat input files as text.
+You should bind this variable with `let', but do not set it globally.")
+
 (defvar epa-keys-buffer nil)
 (defvar epa-key-buffer-alist nil)
 (defvar epa-key nil)
@@ -270,7 +267,7 @@ the separate window."
   (font-lock-set-defaults)
   (make-local-variable 'epa-exit-buffer-function)
   (make-local-variable 'revert-buffer-function)
-  (setq revert-buffer-function 'epa--revert-buffer)
+  (setq revert-buffer-function 'epa--key-list-revert-buffer)
   (run-hooks 'epa-key-list-mode-hook))
 
 (defun epa-key-mode ()
@@ -406,7 +403,7 @@ If ARG is non-nil, mark the current line."
      (list nil)))
   (epa--list-keys name t))
 
-(defun epa--revert-buffer (&optional ignore-auto noconfirm)
+(defun epa--key-list-revert-buffer (&optional ignore-auto noconfirm)
   (apply #'epa--list-keys epa-list-keys-arguments))
 
 (defun epa--marked-keys ()
-- 
1.7.10.4