[Emacs-diffs] trunk r118145: net/gnutls.el: pass correct data to `gnutls-boot'.

[Teodor Zlatanov]

------------------------------------------------------------
revno: 118145
revision-id: address@hidden
parent: address@hidden
committer: Ted Zlatanov <address@hidden>
branch nick: quickfixes
timestamp: Fri 2014-10-17 21:02:30 -0400
message:
  net/gnutls.el: pass correct data to `gnutls-boot'.
  
  * net/gnutls.el (gnutls-negotiate): Don't use cl-mapcan; pass
  correct data to `gnutls-boot'.
  Reported by Toke Høiland-Jørgensen <address@hidden>.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/gnutls.el             gnutls.el-20100926054902-dzayyj6wycit6kzn-5

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-10-18 00:23:03 +0000
+++ b/lisp/ChangeLog    2014-10-18 01:02:30 +0000
@@ -1,3 +1,9 @@
+2014-10-18  Teodor Zlatanov  <address@hidden>
+
+       * net/gnutls.el (gnutls-negotiate): Don't use cl-mapcan; pass
+       correct data to `gnutls-boot' (Bug#18664).
+       Reported by Toke Høiland-Jørgensen <address@hidden>.
+
 2014-10-18  Michal Nazarewicz  <address@hidden>
 
        * whitespace.el (whitespace-style, whitespace-big-indent)

=== modified file 'lisp/net/gnutls.el'
--- a/lisp/net/gnutls.el        2014-07-01 18:48:24 +0000
+++ b/lisp/net/gnutls.el        2014-10-18 01:02:30 +0000
@@ -211,11 +211,13 @@
                              t)
                             ;; if a list, look for hostname matches
                             ((listp gnutls-verify-error)
-                             (cl-mapcan
-                              (lambda (check)
-                                (when (string-match (car check) hostname)
-                                  (copy-sequence (cdr check))))
-                              gnutls-verify-error))
+                             (apply 'append
+                                    (mapcar
+                                     (lambda (check)
+                                       (when (string-match (nth 0 check)
+                                                           hostname)
+                                         (nth 1 check)))
+                                     gnutls-verify-error)))
                             ;; else it's nil
                             (t nil))))
          (min-prime-bits (or min-prime-bits gnutls-min-prime-bits))