[Emacs-diffs] emacs-24 r117676: epg: Adjust to GnuPG 2.1 key listing change

[Daiki Ueno]

------------------------------------------------------------
revno: 117676
revision-id: address@hidden
parent: address@hidden
committer: Daiki Ueno <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-11-07 13:16:26 +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.
  
  Backported from trunk.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/epg.el                    epg.el-20091113204419-o5vbwnq5f7feedwu-8560

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-11-05 18:38:51 +0000
+++ b/lisp/ChangeLog    2014-11-07 04:16:26 +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-10-18  Alan Mackenzie  <address@hidden>
 
        Check that a "macro" found near point-min isn't a ## operator.

=== modified file 'lisp/epg.el'
--- a/lisp/epg.el       2014-01-06 06:25:30 +0000
+++ b/lisp/epg.el       2014-11-07 04:16:26 +0000
@@ -1910,8 +1910,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))))