2003-11-15 Simon Josefsson <jas@extundo.com>

* pgg-gpg.el (pgg-gpg-lookup-key): Use regexp match instead of
split-string (split-string is different between emacs 21.2 and
21.4).  Reported by ultrasoul@ultrasoul.com (David D. Smith).

diff --git a/ChangeLog b/ChangeLog
index c419972..b6bdef9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-15  Simon Josefsson  <jas@extundo.com>
+
+       * pgg-gpg.el (pgg-gpg-lookup-key): Use regexp match instead of
+       split-string (split-string is different between emacs 21.2 and
+       21.4).  Reported by ultrasoul@ultrasoul.com (David D. Smith).
+
 2004-09-15  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
        * mime-view.el (mime-preview-follow-current-entity): Avoid error

diff --git a/pgg-gpg.el b/pgg-gpg.el
index 886a6dc..43421e6 100644 (file)
--- a/pgg-gpg.el
+++ b/pgg-gpg.el
@@ -138,12 +138,9 @@
     (with-temp-buffer
       (apply #'call-process pgg-gpg-program nil t nil args)
       (goto-char (point-min))
-      (if (re-search-forward "^\\(sec\\|pub\\):"  nil t)
-         (substring
-          (nth 3 (split-string
-                  (buffer-substring (match-end 0)
-                                    (progn (end-of-line)(point)))
-                  ":")) 8)))))
+      (if (re-search-forward "^\\(sec\\|pub\\):[^:]*:[^:]*:[^:]*:\\([^:]*\\)"
+                            nil t)
+         (substring (match-string 2) 8)))))
 
 (luna-define-method pgg-scheme-encrypt-region ((scheme pgg-scheme-gpg)
                                               start end recipients)