[Emacs-diffs] trunk r118305: epg: Adjust to GnuPG 2.1 key listing change

[Daiki Ueno]

------------------------------------------------------------
revno: 118305
revision-id: address@hidden
parent: address@hidden
committer: Daiki Ueno <address@hidden>
branch nick: trunk
timestamp: Fri 2014-11-07 11:31:12 +0900
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/epg.el                    epg.el-20091113204419-o5vbwnq5f7feedwu-8560

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-11-06 03:44:52 +0000
+++ b/lisp/ChangeLog    2014-11-07 02:31:12 +0000
@@ -1,3 +1,8 @@
+2014-11-07  Daiki Ueno  <address@hidden>
+
+       * epg.el (epg--list-keys-1): Ignore fields after the 15th field
+       (bug#18979).  Reported by Hideki Saito.
+
 2014-11-06  Daiki Ueno  <address@hidden>
 
        * emacs-lisp/package.el (package--display-verify-error): New function.

=== modified file 'lisp/epg.el'
--- a/lisp/epg.el       2014-11-06 03:40:03 +0000
+++ b/lisp/epg.el       2014-11-07 02:31:12 +0000
@@ -1278,8 +1278,9 @@
              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))))