[Emacs-diffs] /srv/bzr/emacs/trunk r102553: Trivial fixes for epg.el.

[Daiki Ueno]

------------------------------------------------------------
revno: 102553
committer: Daiki Ueno <address@hidden>
branch nick: trunk
timestamp: Fri 2010-12-03 10:52:43 +0900
message:
  Trivial fixes for epg.el.
  
  * epg.el (epg-digest-algorithm-alist): Replace "RMD160" with
  "RIPEMD160" (Bug#7490).  Reported by Daniel Kahn Gillmor.
  (epg-context-set-passphrase-callback): Mention that the callback
  is not called when used with GnuPG 2.x.
modified:
  lisp/ChangeLog
  lisp/epg.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-02 19:34:31 +0000
+++ b/lisp/ChangeLog    2010-12-03 01:52:43 +0000
@@ -1,3 +1,10 @@
+2010-12-03  Daiki Ueno  <address@hidden>
+
+       * epg.el (epg-digest-algorithm-alist): Replace "RMD160" with
+       "RIPEMD160" (Bug#7490).  Reported by Daniel Kahn Gillmor.
+       (epg-context-set-passphrase-callback): Mention that the callback
+       is not called when used with GnuPG 2.x.
+
 2010-12-02  Michael Albinus  <address@hidden>
 
        * net/tramp.el (tramp-local-host-regexp): Add "localhost6".

=== modified file 'lisp/epg.el'
--- a/lisp/epg.el       2010-08-29 20:10:43 +0000
+++ b/lisp/epg.el       2010-12-03 01:52:43 +0000
@@ -67,7 +67,7 @@
 (defconst epg-digest-algorithm-alist
   '((1 . "MD5")
     (2 . "SHA1")
-    (3 . "RMD160")
+    (3 . "RIPEMD160")
     (8 . "SHA256")
     (9 . "SHA384")
     (10 . "SHA512")
@@ -337,7 +337,13 @@
 car is a function and cdr is a callback data.
 
 The function gets three arguments: the context, the key-id in
-question, and the callback data (if any)."
+question, and the callback data (if any).
+
+The callback may not be called if you use GnuPG 2.x, which relies
+on the external program called `gpg-agent' for passphrase query.
+If you really want to intercept passphrase query, consider
+installing GnuPG 1.x _along with_ GnuPG 2.x, which does passphrase
+query by itself and Emacs can intercept them."
   (unless (eq (car-safe context) 'epg-context)
     (signal 'wrong-type-argument (list 'epg-context-p context)))
   (aset (cdr context) 7 (if (consp passphrase-callback)