mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 11:00:45 -08:00
Code Issues Projects Releases Wiki Activity

(allout-encrypt-string): Recognize epg failure to decrypt gpg2 armored text

Browse source 
using gpg1, and add indication the gpg version *might* be the problem in
the error message.
This commit is contained in:
Ken Manheimer 2011-02-17 17:57:38 -05:00
parent 3a00a36316
commit 2a095cec7a
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -4,6 +4,9 @@
(allout-widgets-icons-dark-subdir): Track relocations of icons (allout-widgets-icons-dark-subdir): Track relocations of icons
* lisp/allout.el: Remove commentary about remove encryption * lisp/allout.el: Remove commentary about remove encryption
passphrase mnemonic support and verification. passphrase mnemonic support and verification.
(allout-encrypt-string): (allout-encrypt-string): Recognize epg
failure to decrypt gpg2 armored text using gpg1, and indicate that
the gpg version *might* be the problem in the error message.
2011-02-17 Deniz Dogan <deniz.a.m.dogan@gmail.com> 2011-02-17 Deniz Dogan <deniz.a.m.dogan@gmail.com>

11
lisp/allout.el
View file

@ -6086,9 +6086,14 @@ signal."
(setq result-text (setq result-text
(if decrypt (if decrypt
(epg-decrypt-string epg-context (condition-case err
(encode-coding-string massaged-text (epg-decrypt-string epg-context
(or encoding 'utf-8))) (encode-coding-string massaged-text
(or encoding 'utf-8)))
(epg-error
(signal 'egp-error
(cons (concat (cadr err) " - gpg version problem?")
(cddr err)))))
(replace-regexp-in-string "\n$" "" (replace-regexp-in-string "\n$" ""
(epg-encrypt-string epg-context (epg-encrypt-string epg-context
(encode-coding-string massaged-text (encode-coding-string massaged-text

2
lisp/dired.el
View file

@ -4029,7 +4029,7 @@ true then the type of the file linked to by FILE is printed instead.
;;;*** ;;;***
;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el" ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el"
;;;;;; "d35468f85920d324895b0c04bb703328") ;;;;;; "a2af6147cf06b53166d9e1a3bb200675")
;;; Generated autoloads from dired-x.el ;;; Generated autoloads from dired-x.el
(autoload 'dired-jump "dired-x" "\ (autoload 'dired-jump "dired-x" "\