aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaiki Ueno2015-08-18 12:12:17 +0900
committerDaiki Ueno2015-08-18 12:13:36 +0900
commit2b2eac26c898ef290e29f96cbd1d83ee7ac5b070 (patch)
tree1d9ed8fd852a40e58f6656a3ca347325dbf589e1
parente086e55a664ec27fbca7b3231c4b32cb78a89337 (diff)
downloademacs-2b2eac26c898ef290e29f96cbd1d83ee7ac5b070.tar.gz
emacs-2b2eac26c898ef290e29f96cbd1d83ee7ac5b070.zip
epg.el: Make gpgconf output parsing future proof
* lisp/epg.el (epg--start): Count the number of fields in "gpgconf --list-options" output.
-rw-r--r--lisp/epg.el4
1 files changed, 3 insertions, 1 deletions
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)."
611 "--list-options" "gpg-agent") 611 "--list-options" "gpg-agent")
612 0) 612 0)
613 (goto-char (point-min)) 613 (goto-char (point-min))
614 (re-search-forward "^allow-emacs-pinentry:.*:1$" nil t)))) 614 (re-search-forward
615 "^allow-emacs-pinentry:\\(?:.*:\\)\\{8\\}1"
616 nil t))))
615 (pinentry-start)) 617 (pinentry-start))
616 (setq process-environment 618 (setq process-environment
617 (cons (format "INSIDE_EMACS=%s,epg" emacs-version) 619 (cons (format "INSIDE_EMACS=%s,epg" emacs-version)