projects
/
elisp
/
epg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Makefile.am (info_TEXINFOS): Added epa.texi.
[elisp/epg.git]
/
epg-config.el
diff --git
a/epg-config.el
b/epg-config.el
index
bc9bbf9
..
c5c5a7f
100644
(file)
--- a/
epg-config.el
+++ b/
epg-config.el
@@
-23,6
+23,8
@@
;;; Code:
;;; Code:
+(require 'epg-package-info)
+
(defgroup epg ()
"The EasyPG Library"
:group 'emacs)
(defgroup epg ()
"The EasyPG Library"
:group 'emacs)
@@
-42,8
+44,7
@@
:group 'epg
:type '(choice (const :tag "Default" nil) directory))
: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 nil
"Coding system to use with messages from `epg-gpg-program'."
:group 'epg
:type 'symbol)
"Coding system to use with messages from `epg-gpg-program'."
:group 'epg
:type 'symbol)
@@
-54,8
+55,6
@@
Note that the buffer name starts with a space."
:group 'epg
:type 'boolean)
:group 'epg
:type 'boolean)
-(defconst epg-version-number "0.0.5")
-
(defconst epg-gpg-minimum-version "1.4.3")
;;;###autoload
(defconst epg-gpg-minimum-version "1.4.3")
;;;###autoload
@@
-92,7
+91,9
@@
Note that the buffer name starts with a space."
config))
(if epg-debug
(message "Invalid %S algorithm configuration: %S"
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)))
(if groups
(cons (cons 'groups groups) config)
config)))