[Emacs-diffs] /srv/bzr/emacs/trunk r103320: (allout-encrypt-string): Recognize epg failure to decrypt gpg2 armored text

[Ken Manheimer]

------------------------------------------------------------
revno: 103320
committer: Ken Manheimer <address@hidden>
branch nick: trunk
timestamp: Thu 2011-02-17 17:57:38 -0500
message:
  (allout-encrypt-string): Recognize epg failure to decrypt gpg2 armored text
  using gpg1, and add indication the gpg version *might* be the problem in
  the error message.
modified:
  lisp/ChangeLog
  lisp/allout.el
  lisp/dired.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-17 21:47:18 +0000
+++ b/lisp/ChangeLog    2011-02-17 22:57:38 +0000
@@ -4,6 +4,9 @@
        (allout-widgets-icons-dark-subdir): Track relocations of icons
        * lisp/allout.el: Remove commentary about remove encryption
        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  <address@hidden>
 

=== modified file 'lisp/allout.el'
--- a/lisp/allout.el    2011-02-17 21:47:18 +0000
+++ b/lisp/allout.el    2011-02-17 22:57:38 +0000
@@ -6086,9 +6086,14 @@
 
     (setq result-text
           (if decrypt
-              (epg-decrypt-string epg-context
-                                  (encode-coding-string massaged-text
-                                                        (or encoding 'utf-8)))
+              (condition-case err
+                  (epg-decrypt-string epg-context
+                                      (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$" ""
              (epg-encrypt-string epg-context
                                  (encode-coding-string massaged-text

=== modified file 'lisp/dired.el'
--- a/lisp/dired.el     2011-02-14 17:35:21 +0000
+++ b/lisp/dired.el     2011-02-17 22:57:38 +0000
@@ -4029,7 +4029,7 @@
 ;;;***
 
 ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el"
-;;;;;;  "d35468f85920d324895b0c04bb703328")
+;;;;;;  "a2af6147cf06b53166d9e1a3bb200675")
 ;;; Generated autoloads from dired-x.el
 
 (autoload 'dired-jump "dired-x" "\