epg: Adjust to GnuPG 2.1 key listing change

* epg.el (epg--list-keys-1): Ignore fields after the 15th field
(bug#18979).  Reported by Hideki Saito.

Backported from trunk.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b83459503b4f9ebfacb275456c3d8aa63bac79db..c134e589c303e701d5486f3a02bcc4e3fa43f027 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-07  Daiki Ueno  <ueno@gnu.org>
+
+       * epg.el (epg--list-keys-1): Ignore fields after the 15th field
+       (bug#18979).  Reported by Hideki Saito.
+
 2014-10-18  Alan Mackenzie  <acm@muc.de>
 
        Check that a "macro" found near point-min isn't a ## operator.

diff --git a/lisp/epg.el b/lisp/epg.el
index 77181a1a342c5481f6eefd7fb1f0d26272ca2689..4d9bbd2cd6bb8989e38501d6c68d3c8af8df8dda 100644 (file)
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -1910,8 +1910,9 @@ This function is for internal use only."
              string (match-string 0)
              index 0
              field 0)
-       (while (eq index
-                  (string-match "\\([^:]+\\)?:" string index))
+       (while (and (< field (length (car keys)))
+                   (eq index
+                       (string-match "\\([^:]+\\)?:" string index)))
          (setq index (match-end 0))
          (aset (car keys) field (match-string 1 string))
          (setq field (1+ field))))