Synch with Emacs trunk.

2010-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 * dns-mode.el (auto-mode-alist): Add entry for .zone files.

2010-05-07  Christian von Roques  <roques@mti.ag>  (tiny change)
 * mml2015.el (mml2015-epg-find-usable-key): Skip disabled key (Bug#5592).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 517e387..8638151 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * dns-mode.el (auto-mode-alist): Add entry for .zone files.
+
+2010-05-07  Christian von Roques  <roques@mti.ag>  (tiny change)
+
+       * mml2015.el (mml2015-epg-find-usable-key): Skip disabled key
+       (Bug#5592).
+
 2010-05-07  Julien Danjou  <julien@danjou.info>
 
        * gnus-art.el (gnus-mime-pipe-part): Add optional argument `cmd'; pass

diff --git a/lisp/dns-mode.el b/lisp/dns-mode.el
index bb9feda..fa01168 100644 (file)
--- a/lisp/dns-mode.el
+++ b/lisp/dns-mode.el
@@ -151,6 +151,7 @@ Turning on DNS mode runs `dns-mode-hook'."
   (easy-menu-add dns-mode-menu dns-mode-map))
 
 ;;;###autoload (defalias 'zone-mode 'dns-mode)
+;;;###autoload (add-to-list 'auto-mode-alist (purecopy '("\\.zone\\'" . zone-mode)))
 
 ;; Tools.
 

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 6725709..130a3ca 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -1021,6 +1021,7 @@ Whether the passphrase is cached at all is controlled by
       (let ((pointer (epg-key-sub-key-list (car keys))))
        (while pointer
          (if (and (memq usage (epg-sub-key-capability (car pointer)))
+                  (not (memq 'disabled (epg-sub-key-capability (car pointer))))
                   (not (memq (epg-sub-key-validity (car pointer))
                              '(revoked expired))))
              (throw 'found (car keys)))