]> git.eshelyaron.com Git - emacs.git/commitdiff
epg.el: Make gpgconf output parsing future proof
authorDaiki Ueno <ueno@gnu.org>
Tue, 18 Aug 2015 03:12:17 +0000 (12:12 +0900)
committerDaiki Ueno <ueno@gnu.org>
Tue, 18 Aug 2015 03:13:36 +0000 (12:13 +0900)
* lisp/epg.el (epg--start): Count the number of fields in "gpgconf
--list-options" output.

lisp/epg.el

index 7e3cec7b2b7b53ba8dccc60257091ba074da66da..0c8f5c9b0ae3403125866ced03ffef2f54ab662f 100644 (file)
@@ -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)