From: Daiki Ueno <ueno@gnu.org>
Date: Tue, 18 Aug 2015 03:12:17 +0000 (+0900)
Subject: epg.el: Make gpgconf output parsing future proof
X-Git-Tag: emacs-25.0.90~1366
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2b2eac26c898ef290e29f96cbd1d83ee7ac5b070;p=emacs.git

epg.el: Make gpgconf output parsing future proof

* lisp/epg.el (epg--start): Count the number of fields in "gpgconf
--list-options" output.
---

diff --git a/lisp/epg.el b/lisp/epg.el
index 7e3cec7b2b7..0c8f5c9b0ae 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -611,7 +611,9 @@ callback data (if any)."
 					"--list-options" "gpg-agent")
 			  0)
 		   (goto-char (point-min))
-		   (re-search-forward "^allow-emacs-pinentry:.*:1$" nil t))))
+		   (re-search-forward
+                    "^allow-emacs-pinentry:\\(?:.*:\\)\\{8\\}1"
+                    nil t))))
       (pinentry-start))
     (setq process-environment
 	  (cons (format "INSIDE_EMACS=%s,epg" emacs-version)