projects
/
elisp
/
epg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* epg.el (epg-status-GET_HIDDEN): Don't pass KEY-ID to
[elisp/epg.git]
/
epa-file.el
diff --git
a/epa-file.el
b/epa-file.el
index
961897e
..
86af182
100644
(file)
--- a/
epa-file.el
+++ b/
epa-file.el
@@
-39,8
+39,8
@@
(defvar epa-file-passphrase-alist nil)
(defvar epa-file-passphrase-alist nil)
-(defun epa-file-passphrase-callback-function (key-id file)
- (if (eq key-id 'SYM)
+(defun epa-file-passphrase-callback-function (file)
+ (if (eq epg-key-id 'SYM)
(let ((entry (assoc file epa-file-passphrase-alist))
passphrase)
(or (copy-sequence (cdr entry))
(let ((entry (assoc file epa-file-passphrase-alist))
passphrase)
(or (copy-sequence (cdr entry))
@@
-49,10
+49,10
@@
(setq entry (list file)
epa-file-passphrase-alist (cons entry
epa-file-passphrase-alist)))
(setq entry (list file)
epa-file-passphrase-alist (cons entry
epa-file-passphrase-alist)))
- (setq passphrase (epg-passphrase-callback-function key-id nil))
+ (setq passphrase (epg-passphrase-callback-function nil))
(setcdr entry (copy-sequence passphrase))
passphrase)))
(setcdr entry (copy-sequence passphrase))
passphrase)))
- (epg-passphrase-callback-function key-id nil)))
+ (epg-passphrase-callback-function nil)))
(defun epa-file-handler (operation &rest args)
(save-match-data
(defun epa-file-handler (operation &rest args)
(save-match-data
@@
-133,7
+133,7
@@
context
(if (stringp start)
(encode-coding-string start coding-system)
context
(if (stringp start)
(encode-coding-string start coding-system)
- (encode-coding-string (buffer-string start end)
+ (encode-coding-string (buffer-substring start end)
coding-system))
(mapcar (lambda (key)
(epg-sub-key-id (car (epg-key-sub-key-list key))))
coding-system))
(mapcar (lambda (key)
(epg-sub-key-id (car (epg-key-sub-key-list key))))