From 10a330a36688503b11ce62b75d3bd914037d3535 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 27 Sep 2004 00:09:35 +0000 Subject: [PATCH] 2003-11-15 Simon Josefsson * 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). --- ChangeLog | 6 ++++++ pgg-gpg.el | 9 +++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index c419972..b6bdef9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-11-15 Simon Josefsson + + * 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 * mime-view.el (mime-preview-follow-current-entity): Avoid error diff --git a/pgg-gpg.el b/pgg-gpg.el index 886a6dc..43421e6 100644 --- 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) -- 1.7.10.4