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-make-context): New slot "operation".
[elisp/epg.git]
/
pgg-epg.el
diff --git
a/pgg-epg.el
b/pgg-epg.el
index
f126dbd
..
27b6e42
100644
(file)
--- a/
pgg-epg.el
+++ b/
pgg-epg.el
@@
-1,4
+1,4
@@
-;;; pgg-epg.el --- Gnus/PGG backend of EasyPG.
+;;; pgg-epg.el --- Gnus' PGG backend of EasyPG.
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Copyright (C) 2006 Daiki Ueno
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Copyright (C) 2006 Daiki Ueno
@@
-125,15
+125,15
@@
passphrase cache or user."
(erase-buffer))
(condition-case error
(setq plain
(erase-buffer))
(condition-case error
(setq plain
- (decode-coding-string
- (epg-decrypt-string context (buffer-substring start end))
- 'raw-text)
+ (epg-decrypt-string context (buffer-substring start end))
pgg-epg-secret-key-id-list nil)
(error
(while pgg-epg-secret-key-id-list
(pgg-remove-passphrase-from-cache (car pgg-epg-secret-key-id-list))
(setq pgg-epg-secret-key-id-list (cdr pgg-epg-secret-key-id-list)))
(signal (car error) (cdr error))))
pgg-epg-secret-key-id-list nil)
(error
(while pgg-epg-secret-key-id-list
(pgg-remove-passphrase-from-cache (car pgg-epg-secret-key-id-list))
(setq pgg-epg-secret-key-id-list (cdr pgg-epg-secret-key-id-list)))
(signal (car error) (cdr error))))
+ (if pgg-text-mode
+ (setq plain (decode-coding-string plain 'raw-text)))
(save-excursion
(set-buffer (get-buffer-create pgg-output-buffer))
(insert plain))
(save-excursion
(set-buffer (get-buffer-create pgg-output-buffer))
(insert plain))
@@
-162,7
+162,7
@@
passphrase cache or user."
(epg-sign-string context
(buffer-substring start end)
(if cleartext
(epg-sign-string context
(buffer-substring start end)
(if cleartext
- 'clearsign
+ 'clear
'detached))
pgg-epg-secret-key-id-list nil)
(error
'detached))
pgg-epg-secret-key-id-list nil)
(error